- Use &url.*; and &os;.

- Bump the version number for early adopters in
  readme/article.sgml.

13 files changed, 44 insertions, 44 deletions

diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml
index 6b6f7d3..d4199c5 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -45,7 +45,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
-      <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
diff --git a/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml b/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
index aaaf9ed..2c0989a 100644
--- a/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
@@ -21,8 +21,8 @@
     drivers that already function correctly on other 64-bit platforms
     should work.</para>
 
-  <para>&os;/&arch; is a very young platform on FreeBSD.  While the
-    core FreeBSD kernel and base system components are generally
+  <para>&os;/&arch; is a very young platform on &os;.  While the
+    core &os; kernel and base system components are generally
     fairly robust, there are likely to still be rough edges,
     particularly with third party packages.</para>
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
index ee9e536..639857a 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
@@ -18,7 +18,7 @@
 
   <para arch="ia64">More information on &os;/&arch; is contained on
     the
-    <ulink url="http://www.FreeBSD.org/platforms/ia64/index.html">&os;/&arch; 
+    <ulink url="&url.base;/platforms/ia64/index.html">&os;/&arch; 
     Project</ulink> page.</para>
 
 </sect1>
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index d58bdd7..cd32077 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -22,7 +22,7 @@
     <para>In general, any device for which there is a driver can be
       made to work on sparc64. Some drivers might just work, others
       might require some changes (because this is the first big-endian
-      architecture to be supported by FreeBSD).</para>
+      architecture to be supported by &os;).</para>
 
     <para>The following drivers are known to work:</para>
 
diff --git a/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml b/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
index 68256dd..2f1bce6 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml
@@ -13,6 +13,6 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 </articleinfo>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.sgml b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
index 14c82a3..4d4ed95 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
@@ -16,10 +16,10 @@ from {alpha,i386}/INSTALL.TXT.
   distribution of &os;.  These instructions pay particular emphasis to
   the process of obtaining the &os; &release.current; distribution and
   to beginning the installation procedure.  The <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html"><quote>Installing
-  FreeBSD</quote></ulink>
+  url="&url.books.handbook;/install.html"><quote>Installing
+  &os;</quote></ulink>
   chapter of the <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+  url="&url.books.handbook;/">&os;
   Handbook</ulink> provides more in-depth information about the
   installation program itself, including a guided walkthrough with
   screenshots.</para>
@@ -41,9 +41,9 @@ from {alpha,i386}/INSTALL.TXT.
     of the installer.</para>
 
     <para>Note that on-line versions of the &os; <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink> and <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</ulink> are also
-    available from the <ulink url="http://www.FreeBSD.org/">FreeBSD
+    url="&url.books.faq;/">FAQ</ulink> and <ulink
+    url="&url.books.handbook;/">Handbook</ulink> are also
+    available from the <ulink url="&url.base;/">&os;
     Project Web site</ulink>, if you have an Internet
     connection.</para>
 
@@ -165,7 +165,7 @@ from {alpha,i386}/INSTALL.TXT.
   files from <ulink
   url="&release.url;"></ulink>
   or one of the many mirrors listed at <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
+    url="&url.books.handbook;/mirrors-ftp.html">FTP
     Sites</ulink> section of the Handbook, or on the
     <ulink url="http://mirrorlist.FreeBSD.org/"></ulink> Web pages.
   </para>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
index 75bab9b..fdab474 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/layout.sgml
@@ -95,7 +95,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
 	<para>The Ports Collection may be installed like any other
 	distribution and requires about 190MB unpacked.  More
 	information on the ports collection may be obtained from
-	<ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink> or locally from
+	<ulink url="&url.base;/ports/">http://www.FreeBSD.org/ports/</ulink> or locally from
 	<filename>/usr/share/doc/handbook</filename> if you've installed the <filename>doc</filename>
 	distribution.</para>
       </listitem>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
index b994c62..59d61f9 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml
@@ -53,7 +53,7 @@
             necessary to add <literal>hint.acpi.0.disabled="1"</literal>
             to the file
             <filename>/boot/loader.conf</filename>.  More information about the
-            boot loader can be found in the FreeBSD Handbook.</para>
+            boot loader can be found in the &os; Handbook.</para>
         </answer>
       </qandaentry>
       <qandaentry arch="amd64">
diff --git a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
index 4d3fc96..b721a9c 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
@@ -207,7 +207,7 @@
     <para>Those interested in an upgrade method that allows more
     flexibility and sophistication should take a look at
     <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html">The
+    url="&url.books.handbook;/cutting-edge.html">The
     Cutting Edge</ulink> in the &os; Handbook.  This procedure involves
     rebuilding all of &os; from source code.  It requires reliable
     network connectivity, extra disk space, and time, but has
diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
index 2c19912..8fcb543 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
@@ -386,7 +386,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     <para>&os; disk labels must currently be created by hand, as
       &man.sysinstall.8; is not yet available on &os;/&arch;.  Please
       refer to the <ulink
-      url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+      url="&url.books.handbook;/">&os;
       Handbook</ulink> for more information about labels and special
       partitions.</para>
 
diff --git a/release/doc/en_US.ISO8859-1/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.sgml
index c1b55a9..efc0cfc 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.sgml
+++ b/release/doc/en_US.ISO8859-1/readme/article.sgml
@@ -20,7 +20,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
-      <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -163,8 +163,8 @@
 
       <para>A list of the CDROM and DVD publishers known to the
 	project are listed in the <ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html"><quote>Obtaining
-	FreeBSD</quote></ulink> appendix to the Handbook.</para>
+	url="&url.books.handbook;/mirrors.html"><quote>Obtaining
+	&os;</quote></ulink> appendix to the Handbook.</para>
     </sect2>
 
     <sect2>
@@ -178,7 +178,7 @@
 
       <para>Lists of locations that mirror &os; can be found in the
 	<ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
+	url="&url.books.handbook;/mirrors-ftp.html">FTP
 	Sites</ulink> section of the Handbook, or on the <ulink
 	url="http://mirrorlist.FreeBSD.org/"></ulink> Web pages.
 	Finding a close (in networking terms) mirror from which to
@@ -188,8 +188,8 @@
 	<email>freebsd-admin@FreeBSD.org</email> for more details on
 	becoming an official mirror site.  You can also find useful
         information for mirror sites at the <ulink
-        URL="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/hubs/">Mirroring
-        FreeBSD</ulink> article.</para>
+        URL="&url.articles.hubs;/">Mirroring
+        &os;</ulink> article.</para>
 
       <para>Mirrors generally contain the floppy disk images necessary
 	to begin an installation, as well as the distribution files
@@ -227,13 +227,13 @@
 	preferable to subscribe instead to the &a.announce;.</para>
 
       <para>All of the mailing lists can be freely joined by anyone
-	wishing to do so.  Visit the <ulink url="http://www.FreeBSD.org/mailman/listinfo">
-	FreeBSD Mailman Info Page</ulink>.  This will give you more
+	wishing to do so.  Visit the <ulink url="&url.base;/mailman/listinfo">
+	&os; Mailman Info Page</ulink>.  This will give you more
 	information on joining the various lists, accessing archives,
 	etc.  There are a number of mailing lists targeted at special
 	interest groups not mentioned here; more information can be
 	obtained either from the Mailman pages or the <ulink
-	url="http://www.FreeBSD.org/support.html#mailing-list">mailing
+	url="&url.base;/support.html#mailing-list">mailing
 	lists section</ulink> of the &os; Web site.</para>
 
       <important>
@@ -270,8 +270,8 @@
 	can try to send it to the &a.bugs;.</para>
 
       <para>For more information, <ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/problem-reports/"><quote>Writing
-	FreeBSD Problem Reports</quote></ulink>, available on the &os; Web
+	url="&url.base;/doc/en_US.ISO8859-1/articles/problem-reports/"><quote>Writing
+	&os; Problem Reports</quote></ulink>, available on the &os; Web
 	site, has a number of helpful hints on writing and submitting
 	effective problem reports.</para>
     </sect2>
@@ -308,7 +308,7 @@
 	    <para><filename>EARLY.TXT</filename>: A guide for early
 	      adopters of &os; &release.current;.  Highly recommended
 	      reading for users new to &os; &release.branch; and/or the
-	      5.<replaceable>X</replaceable> series of releases.</para>
+	      6.<replaceable>X</replaceable> series of releases.</para>
 	  </listitem>
 
 	  <listitem>
@@ -371,7 +371,7 @@
 	  other copies are kept updated on the Internet and should be
 	  consulted as the <quote>current errata</quote> for this
 	  release.  These other copies of the errata are located at
-	  <ulink url="http://www.FreeBSD.org/releases/"></ulink> (as
+	  <ulink url="&url.base;/releases/"></ulink> (as
 	  well as any sites which keep up-to-date mirrors of this
 	  location).</para>
       </note>
@@ -402,11 +402,11 @@
 	maintained by the &os; Project,
 	are the &os; Handbook and &os; FAQ (Frequently Asked
 	Questions document).  On-line versions of the <ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</ulink>
+	url="&url.books.handbook;/">Handbook</ulink>
 	and <ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink>
+	url="&url.books.faq;/">FAQ</ulink>
 	are always available from the <ulink
-	url="http://www.FreeBSD.org/docs.html">FreeBSD Documentation
+	url="&url.base;/docs.html">&os; Documentation
 	page</ulink> or its mirrors.  If you install the
 	<filename>doc</filename> distribution set, you can use a Web
 	browser to read the Handbook and FAQ locally.</para>
@@ -422,7 +422,7 @@
 
       <para>A listing of other books and documents about &os; can be
         found in the <ulink
-        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/bibliography.html">bibliography</ulink>
+        url="&url.books.handbook;/bibliography.html">bibliography</ulink>
         of the &os; Handbook.  Because of &os;'s strong &unix; heritage,
         many other articles and books written for &unix; systems are
         applicable as well, some of which are also listed in the
@@ -438,8 +438,8 @@
       countless hours to bring about this &release.type;.  For a
       complete list of &os; developers and contributors, please see
       <ulink
-      url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/"><quote>Contributors
-      to FreeBSD</quote></ulink> on the &os; Web site or any of its
+      url="&url.articles.contributors;/"><quote>Contributors
+      to &os;</quote></ulink> on the &os; Web site or any of its
       mirrors.</para>
 
     <para>Special thanks also go to the many thousands of &os; users
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index b516dc8..561532a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1,7 +1,7 @@
 <articleinfo>
   <title>&os;/&arch; &release.current; Release Notes</title>
 
-  <corpauthor>The FreeBSD Project</corpauthor>
+  <corpauthor>The &os; Project</corpauthor>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -11,7 +11,7 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
   <abstract>
@@ -68,8 +68,8 @@
     information on obtaining this (or other) &release.type;
     distributions of &os; can be found in the <ulink
     url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-    FreeBSD</quote> appendix</ulink> to the <ulink
-    url="&url.books.handbook;/">FreeBSD
+    &os;</quote> appendix</ulink> to the <ulink
+    url="&url.books.handbook;/">&os;
     Handbook</ulink>.</para>
 
 ]]>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index b516dc8..561532a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1,7 +1,7 @@
 <articleinfo>
   <title>&os;/&arch; &release.current; Release Notes</title>
 
-  <corpauthor>The FreeBSD Project</corpauthor>
+  <corpauthor>The &os; Project</corpauthor>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -11,7 +11,7 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
   <abstract>
@@ -68,8 +68,8 @@
     information on obtaining this (or other) &release.type;
     distributions of &os; can be found in the <ulink
     url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-    FreeBSD</quote> appendix</ulink> to the <ulink
-    url="&url.books.handbook;/">FreeBSD
+    &os;</quote> appendix</ulink> to the <ulink
+    url="&url.books.handbook;/">&os;
     Handbook</ulink>.</para>
 
 ]]>