diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 6f44dc7efb..b204faf73a 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -271,10 +271,10 @@
       user may add the following to their <filename>.cshrc</filename> for this
       purpose:</para>
 
-    <programlisting>alias dcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@dcvs.freebsd.org:/home/dcvs
-alias pcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@pcvs.freebsd.org:/home/pcvs
-alias projcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@projcvs.freebsd.org:/home/projcvs
-alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.org:/home/ncvs</programlisting>
+    <programlisting>alias dcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@dcvs.FreeBSD.org:/home/dcvs
+alias pcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@pcvs.FreeBSD.org:/home/pcvs
+alias projcvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/projcvs
+alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</programlisting>
 
     <para>This way they can do all CVS operations
       locally and use <command><replaceable>X</replaceable>cvs commit</command> for committing
@@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.184 2004-04-04 17:05:14 linimon Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.185 2004-04-04 21:38:32 phantom Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.184 2004-04-04 17:05:14 linimon Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.184 2004-04-04 17:05:14 linimon Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.185 2004-04-04 21:38:32 phantom Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.185 2004-04-04 21:38:32 phantom Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
index 05cf298765..4e32089bee 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
@@ -106,7 +106,7 @@
     </itemizedlist>
 
     <para>The well known way to build and install the world, as
-      described in <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">the
+      described in <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">the
       Handbook</ulink>, by default replaces
       the existing system.  Only the kernel and modules are saved.
       System binaries, headers and a lot of other files are overwritten;
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index da5b2ebed3..bd40d498da 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -873,7 +873,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
           for access. If you are already an <emphasis>official</emphasis>
           mirror, this certainly helps you getting access.
           In any other case make sure your country really needs another mirror.
-          If it already has three or more, ask the <quote>zone administrator</quote> (<email>hostmaster@CC.freebsd.org</email>) or &a.hubs; first.</para>
+          If it already has three or more, ask the <quote>zone administrator</quote> (<email>hostmaster@CC.FreeBSD.org</email>) or &a.hubs; first.</para>
 
 	<para>
 	  Whoever helped you become, an <emphasis>official</emphasis>
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
index f53cf411eb..ae83629ccc 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
@@ -380,8 +380,8 @@
 
 	<listitem>
 	  <para>It is not a real PR, but some random message sent to
-	    <email>bug-followup@freebsd.org</email> or
-	    <email>freebsd-gnats-submit@freebsd.org</email>.</para>
+	    <email>bug-followup@FreeBSD.org</email> or
+	    <email>freebsd-gnats-submit@FreeBSD.org</email>.</para>
 	</listitem>
       </itemizedlist>
 
@@ -409,7 +409,7 @@
 	  database, can periodically check for PRs of this sort and move
 	  interesting bits of the misfiled PR into the audit trail of
 	  the original PR (by posting a proper followup to a bug report
-	  to the address <email>bug-followup@freebsd.org</email>).  Then
+	  to the address <email>bug-followup@FreeBSD.org</email>).  Then
 	  the misfiled PR can be closed with a message similar
 	  to:</para>
 
@@ -481,7 +481,7 @@ This was misfiled because the subject didn't have the format:
 	  will recognize bug reports that are formatted using the
 	  &man.send-pr.1; template.  They cannot parse any sort of email
 	  though.  This is why submissions of bug reports that are sent
-	  to <email>freebsd-gnats-submit@freebsd.org</email> have to
+	  to <email>freebsd-gnats-submit@FreeBSD.org</email> have to
 	  follow the template of <command>send-pr</command>, but email
 	  reports can be sent to &a.bugs;.</para>
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml
index 91c6dc0547..834adffbd6 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml
@@ -92,7 +92,7 @@ BIOS drive C: is disk1
 BIOS 639kB/64512kB available memory
 FreeBSD/i386 bootstrap loader, Revision 0.8
 Console internal video/keyboard
-(jkh@bento.freebsd.org, Mon Nov 20 11:41:23 GMT 2000)
+(jkh@bento.FreeBSD.org, Mon Nov 20 11:41:23 GMT 2000)
 /kernel text=0x1234 data=0x2345 syms=[0x4+0x3456]
 Hit [Enter] to boot immediately, or any other key for command prompt
 Booting [kernel] in 9 seconds..._</screen>
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 2255022f4f..7f353c2112 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -11550,7 +11550,7 @@ raisechar=^^</programlisting>
 
       <qandaentry>
 	<question id="cvsup-round-robin">
-	  <para>Why isn't cvsup.freebsd.org a round robin DNS entry to
+	  <para>Why isn't cvsup.FreeBSD.org a round robin DNS entry to
 	  share the load amongst the various CVSup servers?</para>
 	</question>
 
@@ -11559,7 +11559,7 @@ raisechar=^^</programlisting>
 	    server hourly, this update might happen at any time during
 	    the hour.  This means that some servers have newer code
 	    than others, even though all servers have code that is
-	    less than an hour old.  If cvsup.freebsd.org was a round
+	    less than an hour old.  If cvsup.FreeBSD.org was a round
 	    robin DNS entry that simply redirected users to a random
 	    CVSup server, running CVSup twice in a row could download
 	    code older than the code already on the system.</para>
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
index 4ea019c29e..7855608f5a 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
@@ -533,7 +533,7 @@
       
       <listitem>
 	<para><emphasis>The BSD family tree</emphasis>.
-	  <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/src/share/misc/bsd-family-tree"></ulink>
+	  <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/share/misc/bsd-family-tree"></ulink>
 	   or <ulink type="html" url="file://localhost/usr/share/misc/bsd-family-tree"><filename>/usr/share/misc/bsd-family-tree</filename></ulink>
 	   on a modern FreeBSD machine.</para>
       </listitem>
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index 1ab5ae0d80..10764e419d 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2342,8 +2342,8 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 
       <para>For those of you that want to submit a problem right away,
 	please send the following information to
-	<ulink url="mailto:acpi-jp@jp.freebsd.org">
-	acpi-jp@jp.freebsd.org</ulink></para>
+	<ulink url="mailto:acpi-jp@jp.FreeBSD.org">
+	acpi-jp@jp.FreeBSD.org</ulink></para>
 
       <itemizedlist>
 	<listitem>
@@ -2781,14 +2781,14 @@ debug.acpi.level="ACPI_LV_ERROR"</programlisting>
       <itemizedlist>
 	<listitem>
 	  <para>The <acronym>ACPI</acronym> Mailing List
-	    <ulink url="mailto:acpi-jp@jp.freebsd.org">
-	    acpi-jp@jp.freebsd.org</ulink></para>
+	    <ulink url="mailto:acpi-jp@jp.FreeBSD.org">
+	    acpi-jp@jp.FreeBSD.org</ulink></para>
 	</listitem>
 
 	<listitem>
 	  <para>The <acronym>ACPI</acronym> Mailing List Archives
-	    <ulink url="http://home.jp.freebsd.org/mail-list/acpi-jp/">
-	    http://home.jp.freebsd.org/mail-list/acpi-jp/</ulink></para>
+	    <ulink url="http://home.jp.FreeBSD.org/mail-list/acpi-jp/">
+	    http://home.jp.FreeBSD.org/mail-list/acpi-jp/</ulink></para>
 	</listitem>
 
 	<listitem>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
index 3c130ce7b8..c559aa82a1 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
@@ -464,7 +464,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	of FreeBSD is as stable as possible, bugs do occasionally creep into
 	the process.  On very rare occasions those bugs affect the
 	installation process.  As these problems are discovered and fixed, they
-	are noted in the <ulink url="http://www.freebsd.org/releases/&rel.current;R/errata.html">FreeBSD Errata</ulink>, which is found on the FreeBSD web site.  You
+	are noted in the <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">FreeBSD Errata</ulink>, which is found on the FreeBSD web site.  You
 	should check the errata before installing to make sure that there are
 	no late-breaking problems which you should be aware of.</para>
 
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index a3c5a3c839..9e5bd21ca6 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -524,7 +524,7 @@
 	  fetch the current <application>CTM</application> sources
 	  directly from:</para>
 	    
-	<para><ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/ctm/"></ulink></para>
+	<para><ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/ctm/"></ulink></para>
 
 	<para>The <quote>deltas</quote> you feed
 	  <application>CTM</application> can be had two ways, FTP or
@@ -1247,7 +1247,7 @@ doc/zh_*</screen>
 
        <para>and so forth for the other languages (you can find the
        full list by browsing the <ulink
-       url="http://www.freebsd.org/cgi/cvsweb.cgi/">FreeBSD
+       url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">FreeBSD
        CVS repository</ulink>).</para>
 
        <para>With this very useful feature, those users who are on
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
index 892bf7d31d..d5d184ed07 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
@@ -5427,7 +5427,7 @@ Corrected:      2003-09-23 16:42:59 UTC (RELENG_4, 4.9-PRERELEASE)
 For general information regarding FreeBSD Security Advisories,
 including descriptions of the fields above, security branches, and the
 following sections, please visit
-http://www.freebsd.org/security/.
+http://www.FreeBSD.org/security/.
 
 I.   Background<co id="co-backround">
 
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 7bcbb62cf9..de1a96114c 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -4847,7 +4847,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_VERSION}</programlisting>
 
       <para>Here is a list of common dos and don'ts that you encounter during
 	the porting process.  You should check your own port against this list,
-	but you can also check ports in the <ulink url="http://www.freebsd.org/cgi/query-pr-summary.cgi?query">PR database</ulink> that others have
+	but you can also check ports in the <ulink url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">PR database</ulink> that others have
 	submitted.  Submit any comments on ports you check as described in
 	<ulink url="../../articles/contributing/contrib-how.html#CONTRIB-GENERAL">Bug Reports and General
 	  Commentary</ulink>.  Checking ports in the PR database will both make