From 5b5e044611f41ca8954bae01ce93de7d7398eb70 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 12 Dec 1999 16:24:48 +0000
Subject: [PATCH] Lots of freebsd -> FreeBSD fixes

PR:		docs/15382
Submitted by:	Alexander Langer <alex@big.endian.de>
---
 en/alpha/alpha.sgml              |   6 +-
 en/applications.sgml             |   6 +-
 en/auditors.sgml                 |  10 +--
 en/availability.sgml             |   8 +--
 en/commercial/includes.sgml      |   4 +-
 en/docproj/doc-set.sgml          |   6 +-
 en/docproj/sgml.sgml             |   8 +--
 en/docproj/submitting.sgml       |   8 +--
 en/docproj/translations.sgml     |  26 +++----
 en/docs.sgml                     |  90 +++++++++++------------
 en/gallery/gallery.sgml          |   6 +-
 en/index.sgml                    | 118 +++++++++++++++----------------
 en/internal/about.sgml           |  22 +++---
 en/internal/developer.sgml       |  10 +--
 en/internal/internal.sgml        |   8 +--
 en/internal/machines.sgml        |   8 +--
 en/internal/mirror.sgml          |   8 +--
 en/internal/photos.sgml          |  18 ++---
 en/internal/statistic.sgml       |  14 ++--
 en/news/includes.sgml            |   4 +-
 en/news/newsflash.sgml           |  96 ++++++++++++-------------
 en/news/press-rel-1.sgml         |   8 +--
 en/news/press-rel-2.sgml         |  16 ++---
 en/news/press-rel-3.sgml         |  10 +--
 en/news/press.sgml               |  22 +++---
 en/news/qnewsletter-1-1.sgml     |   8 +--
 en/news/qnewsletter-1-2.sgml     |  10 +--
 en/news/qnewsletter-1-3.sgml     |   8 +--
 en/news/qnewsletter-1-4.sgml     |  10 +--
 en/news/qnewsletter-1-5.sgml     |  12 ++--
 en/news/qnewsletter-1-6.sgml     |   4 +-
 en/news/qnewsletter-1-7.sgml     |   4 +-
 en/news/qnewsletter.sgml         |  10 +--
 en/news/sou1999.sgml             |  12 ++--
 en/news/webchanges.sgml          |  14 ++--
 en/projects/mozilla.sgml         |  18 ++---
 en/projects/newbies.sgml         |  12 ++--
 en/projects/projects.sgml        |  44 ++++++------
 en/publish.sgml                  |  12 ++--
 en/register.sgml                 |  16 ++---
 en/releases/2.0.5R/announce.sgml |  10 +--
 en/releases/2.0.5R/notes.sgml    |  10 +--
 en/releases/2.0/notes.sgml       |  16 ++---
 en/releases/2.1.5R/announce.sgml |  46 ++++++------
 en/releases/2.1.5R/notes.sgml    |  18 ++---
 en/releases/2.1.6R/announce.sgml |  10 +--
 en/releases/2.1.6R/notes.sgml    |  16 ++---
 en/releases/2.1.6R/security.sgml |   4 +-
 en/releases/2.1.7R/announce.sgml |   8 +--
 en/releases/2.1.7R/notes.sgml    |  18 ++---
 en/releases/2.1R/notes.sgml      |   6 +-
 en/releases/2.2.1R/notes.sgml    |  20 +++---
 en/releases/2.2.2R/errata.sgml   |   8 +--
 en/releases/2.2.2R/notes.sgml    |  22 +++---
 en/releases/2.2.5R/errata.sgml   |  20 +++---
 en/releases/2.2.5R/notes.sgml    |  12 ++--
 en/releases/2.2.6R/errata.sgml   |  22 +++---
 en/releases/2.2.7R/announce.sgml |   6 +-
 en/releases/2.2.7R/errata.sgml   |  14 ++--
 en/releases/2.2.7R/notes.sgml    |  10 +--
 en/releases/2.2.8R/announce.sgml |   6 +-
 en/releases/2.2.8R/errata.sgml   |  14 ++--
 en/releases/2.2.8R/notes.sgml    |  10 +--
 en/releases/2.2R/announce.sgml   |   4 +-
 en/releases/2.2R/notes.sgml      |  18 ++---
 en/releases/3.0R/announce.sgml   |   6 +-
 en/releases/3.0R/errata.sgml     |  12 ++--
 en/releases/3.0R/notes.sgml      |  22 +++---
 en/releases/3.1R/errata.sgml     |  10 +--
 en/releases/3.1R/notes.sgml      |  24 +++----
 en/releases/3.2R/errata.sgml     |  12 ++--
 en/releases/3.2R/notes.sgml      |  12 ++--
 en/releases/3.3R/errata.sgml     |  12 ++--
 en/releases/3.3R/notes.sgml      |  12 ++--
 en/releases/index.sgml           |   8 +--
 en/releases/snapshots.sgml       |  12 ++--
 en/search/search-mid.sgml        |   8 +--
 en/security/advisories.xml       | 104 +++++++++++++--------------
 en/security/security.sgml        | 104 +++++++++++++--------------
 en/send-pr.sgml                  |   6 +-
 en/support.sgml                  | 106 +++++++++++++--------------
 en/tutorials/index.sgml          |  10 +--
 en/usergroups.sgml               | 106 +++++++++++++--------------
 en/where.sgml                    |  24 +++----
 en/y2kbug.sgml                   |  54 +++++++-------
 share/sgml/advisories.xml        | 104 +++++++++++++--------------
 86 files changed, 925 insertions(+), 925 deletions(-)

diff --git a/en/alpha/alpha.sgml b/en/alpha/alpha.sgml
index ec0aa967a3..a417176801 100644
--- a/en/alpha/alpha.sgml
+++ b/en/alpha/alpha.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/alpha/alpha.sgml,v 1.4 1999/09/06 07:02:39 peter Exp $">
 <!ENTITY title "FreeBSD/Alpha Project">
 <!ENTITY email 'freebsd-alpha'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/alpha/alpha.sgml,v 1.4 1999/09/06 07:02:39 peter Exp $ -->
  
 <html>
 &header;
@@ -15,7 +15,7 @@ systems.</p>
 
 <H3>FreeBSD/Alpha Specific Links</H3>
 <UL>
-<li><a href="http://www.freebsd.org/~jb/alpha.html">Status
+<li><a href="http://www.FreeBSD.org/~jb/alpha.html">Status
 of the FreeBSD/Alpha port</a>.
 <li><A href="../handbook/eresources.html#ERESOURCES-MAIL">FreeBSD/Alpha mailing list</a></li>
 </UL>
diff --git a/en/applications.sgml b/en/applications.sgml
index 66d9db99a0..bce6300a5a 100644
--- a/en/applications.sgml
+++ b/en/applications.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/applications.sgml,v 1.15 1999/09/06 07:02:36 peter Exp $">
 <!ENTITY title "About Applications for FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/applications.sgml,v 1.15 1999/09/06 07:02:36 peter Exp $ -->
 
 <html>
     &header;
@@ -99,7 +99,7 @@
 	  Internet relay chat (IRC), home automation, multiuser dungeons,
 	  bulletin board systems, image scanning, and more are all real uses
 	  for FreeBSD today.  If you have an innovative application for
-	  FreeBSD, <a href="http://www.freebsd.org/cgi/gallery.cgi">let us
+	  FreeBSD, <a href="http://www.FreeBSD.org/cgi/gallery.cgi">let us
 	    know</a> so we can add it to our <a
 	    href="&base/gallery/gallery.html">gallery</a>.</li>
       </ul>
diff --git a/en/auditors.sgml b/en/auditors.sgml
index 300ae48bfd..d7dcb35fc8 100644
--- a/en/auditors.sgml
+++ b/en/auditors.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/auditors.sgml,v 1.29 1999/09/06 07:02:36 peter Exp $">
 <!ENTITY title "FreeBSD Source Auditing Project">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/auditors.sgml,v 1.29 1999/09/06 07:02:36 peter Exp $ -->
 
 <html>
     &header;
     
     <h1>General Information</h1>
     
-    <em>Last Updated: $FreeBSD$ </em>
+    <em>Last Updated: $FreeBSD: www/en/auditors.sgml,v 1.29 1999/09/06 07:02:36 peter Exp $ </em>
     
     <h2>Overview</h2>
     
@@ -52,7 +52,7 @@
       across.</p>
 
     <p>Using the
-      <a href="ftp://ftp.freebsd.org/pub/FreeBSD/development/FreeBSD-CVS/CVSROOT/modules">
+      <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS/CVSROOT/modules">
 	modules database</a> as an outline, we will split the source tree into
       more manageable pieces, keeping a sign-up sheet in a prominent place so
       that people can see which modules are covered and which are not.  A
@@ -69,7 +69,7 @@
     <h2>Requirements:</h2>
     
     <p>In order to be an auditor, you should either have commit privileges on
-      <em>freefall.freebsd.org</em> or an arrangement with another
+      <em>freefall.FreeBSD.org</em> or an arrangement with another
       auditor/reviewer who does.  You should also be running or have immediate
       access to <a
 	href="handbook/cutting-edge.html#CURRENT">FreeBSD-current</a> sources
diff --git a/en/availability.sgml b/en/availability.sgml
index 07cb036f0d..117bbecb21 100644
--- a/en/availability.sgml
+++ b/en/availability.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/availability.sgml,v 1.18 1999/09/06 07:02:36 peter Exp $">
 <!ENTITY title "About FreeBSD's availability">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/availability.sgml,v 1.18 1999/09/06 07:02:36 peter Exp $ -->
 
 <html>
     &header;
@@ -39,7 +39,7 @@
 
     <blockquote>
       <p>You can get FreeBSD free via anonymous FTP from <a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD">ftp://ftp.freebsd.org/pub/FreeBSD</a>.
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp://ftp.FreeBSD.org/pub/FreeBSD</a>.
 	You might also want to check a geographically close <a
 	  href="&base/handbook/mirrors.html">mirror site</a>.</p>
 
@@ -73,7 +73,7 @@
 	project.  Information about <a
 	  href="&base/handbook/staff-who.html">who's responsible for what</a>
 	is also available. If you are curious, take a look at some <a
-	  href="http://www.freebsd.org/~jhs/freebsd/people.html">pictures of
+	  href="http://www.FreeBSD.org/~jhs/freebsd/people.html">pictures of
 	  the team members</a>. A more complete listing of contributors is
 	available in the <a
 	  href="&base/handbook/contrib.html">Contributors</a> section of the
diff --git a/en/commercial/includes.sgml b/en/commercial/includes.sgml
index dc4021ca5a..661fa811a7 100644
--- a/en/commercial/includes.sgml
+++ b/en/commercial/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/commercial/includes.sgml,v 1.3 1999/09/06 07:02:41 peter Exp $ -->
 
 <!ENTITY vendorintroduction '
 <p>FreeBSDs power, flexibility, and reliability attracts
@@ -10,7 +10,7 @@ services for FreeBSD.</p>
 <p>For your convenience, we have divided our growing commercial
 listing into several sections. If you are a company which supports 
 a FreeBSD compatible product and wish to be added to this page, please
-send email to <a href="mailto:www@freebsd.org">www@FreeBSD.org</a>
+send email to <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>
 and let us know!  Submissions should be in HTML and of a medium-sized
 paragraph in length.</p>
 '>
diff --git a/en/docproj/doc-set.sgml b/en/docproj/doc-set.sgml
index 9b9bd00cbd..4a5a7b7c3c 100644
--- a/en/docproj/doc-set.sgml
+++ b/en/docproj/doc-set.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/docproj/doc-set.sgml,v 1.5 1999/09/06 07:02:43 peter Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Documentation Set">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/docproj/doc-set.sgml,v 1.5 1999/09/06 07:02:43 peter Exp $ -->
 
 <html>
     &header;
@@ -12,7 +12,7 @@
     <p>FreeBSD's documentation falls into four basic categories;</p>
 
     <ol>
-      <li><p><a href="http://www.freebsd.org/cgi/man.cgi"><b>The manual pages</b></a></p>
+      <li><p><a href="http://www.FreeBSD.org/cgi/man.cgi"><b>The manual pages</b></a></p>
 
 	<p>The Project does not really concern itself with these, since
 	  they are a part of the base system. The exception to this is the
diff --git a/en/docproj/sgml.sgml b/en/docproj/sgml.sgml
index 64e5e9fb13..6ad9c5bcc6 100644
--- a/en/docproj/sgml.sgml
+++ b/en/docproj/sgml.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/docproj/sgml.sgml,v 1.10 1999/09/19 09:09:21 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/docproj/sgml.sgml,v 1.11 1999/09/19 10:20:46 wosch Exp $">
 <!ENTITY title "FreeBSD Documentation Project: SGML">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/docproj/sgml.sgml,v 1.10 1999/09/19 09:09:21 wosch Exp $ -->
+<!-- $FreeBSD: www/en/docproj/sgml.sgml,v 1.11 1999/09/19 10:20:46 wosch Exp $ -->
 
 <html>
     &header;
@@ -175,8 +175,8 @@
 	  in DocBook can be used.</p></dd>
     
       <dt><a
-          href="http://www.freebsd.org/~wosch/papers/webbuild.html"><b>
-          http://www.freebsd.org/~wosch/papers/webbuild.html</b></a></dt>
+          href="http://www.FreeBSD.org/~wosch/papers/webbuild.html"><b>
+          http://www.FreeBSD.org/~wosch/papers/webbuild.html</b></a></dt>
     
       <dd> &webbuild; </dd>
     </dl>
diff --git a/en/docproj/submitting.sgml b/en/docproj/submitting.sgml
index b8630a1de2..53682784dc 100644
--- a/en/docproj/submitting.sgml
+++ b/en/docproj/submitting.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/docproj/submitting.sgml,v 1.4 1999/09/06 07:02:43 peter Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Submitting documentation">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/docproj/submitting.sgml,v 1.4 1999/09/06 07:02:43 peter Exp $ -->
 
 <html>
     &header;
@@ -50,7 +50,7 @@
     <p>which will produce <tt>doc.tar.gz</tt>.</p>
 
     <p>You should then upload <tt/doc.tar.gz/ (obviously, give it a more
-      sensible name, but keep the <tt/.tar.gz/ bit) to <tt/ftp.freebsd.org/,
+      sensible name, but keep the <tt/.tar.gz/ bit) to <tt/ftp.FreeBSD.org/,
       and put it in the directory <tt>/pub/FreeBSD/incoming/</tt>.</p>
 
     <p>You should then let the Documentation Project know about it. The
@@ -78,7 +78,7 @@
       be used to track its progress.</p>
 
     <p>Alternatively, you can use the web interface at <a
-	href="http://www.freebsd.org/send-pr.html">http://www.freebsd.org/send-pr.html</a>.</p>
+	href="http://www.FreeBSD.org/send-pr.html">http://www.FreeBSD.org/send-pr.html</a>.</p>
     
     <h2>I have made some changes to existing documentation, how do I submit
       them?</h2>
diff --git a/en/docproj/translations.sgml b/en/docproj/translations.sgml
index c00b3b6501..866b9bee5e 100644
--- a/en/docproj/translations.sgml
+++ b/en/docproj/translations.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/docproj/translations.sgml,v 1.28 1999/09/06 07:02:43 peter Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Translations">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/docproj/translations.sgml,v 1.28 1999/09/06 07:02:43 peter Exp $ -->
 
 <html>
     &header;
@@ -37,7 +37,7 @@
   <a href="../zh/FAQ/">FAQ</a></dd>
 <dt><i>Documents currently at working</i></dt>
 <dd>
-  <a href="http://www.tw.freebsd.org/handbook-big5.html">Handbook</a></dd>
+  <a href="http://www.tw.FreeBSD.org/handbook-big5.html">Handbook</a></dd>
 </dl>
 
 <a name="estonian"></a>
@@ -73,12 +73,12 @@ http://www.matti.ee/~vallo/</a><br>
 <a name="german"></a>
 <h2>The FreeBSD German Documentation Project</h2>
 
-<b>Web</b>: <a href="http://www.de.freebsd.org/de/uebersetzung.html">http://www.de.freebsd.org/de/uebersetzung.html</a><br> 
-<b>E-Mail</b>: <a href="mailto:de-bsd-translators@de.freebsd.org">de-bsd-translators@de.freebsd.org</a><br>
+<b>Web</b>: <a href="http://www.de.FreeBSD.org/de/uebersetzung.html">http://www.de.FreeBSD.org/de/uebersetzung.html</a><br> 
+<b>E-Mail</b>: <a href="mailto:de-bsd-translators@de.FreeBSD.org">de-bsd-translators@de.FreeBSD.org</a><br>
 
 <dl>
 <dt><i>Documents currently at working</i></dt>
-   <dd><a href="http://www.de.freebsd.org/de/handbook/">Handbook</a></dd>
+   <dd><a href="http://www.de.FreeBSD.org/de/handbook/">Handbook</a></dd>
 </dl>
 
 <a name="italian"></a>
@@ -94,8 +94,8 @@ http://www.matti.ee/~vallo/</a><br>
 
 <a name="japanese"></a>
 <h2>The FreeBSD Japanese Documentation Project</h2>
-<b>Web</b>: <a href="http://www.jp.freebsd.org/doc-jp/">http://www.jp.freebsd.org/doc-jp/</a><br>
-<b>E-Mail</b>: <a href="mailto:doc-jp@jp.freebsd.org">doc-jp@jp.freebsd.org</a><br>
+<b>Web</b>: <a href="http://www.jp.FreeBSD.org/doc-jp/">http://www.jp.FreeBSD.org/doc-jp/</a><br>
+<b>E-Mail</b>: <a href="mailto:doc-jp@jp.FreeBSD.org">doc-jp@jp.FreeBSD.org</a><br>
 
 <dl>
 <dt><i>Documents available</i></dt>
@@ -103,7 +103,7 @@ http://www.matti.ee/~vallo/</a><br>
   <a href="../ja/handbook/">Handbook</a>,
   <a href="../ja/FAQ/">FAQ</a>,
   <a href="../ja/">Web</a>,
-  <a href="http://www.jp.freebsd.org/NewsLetter/Issue2/">
+  <a href="http://www.jp.FreeBSD.org/NewsLetter/Issue2/">
 	FreeBSD NewsLetter Issue #2</a>
 </dd>
 <dt><i>Documents currently at working</i></dt>
@@ -114,8 +114,8 @@ http://www.matti.ee/~vallo/</a><br>
 <a name="korean"></a>    
 <h2>The FreeBSD Korean Documentation Project</h2>
 
-<b>Web</b>: <a href="http://www.kr.freebsd.org/projects/doc-kr/">http://www.kr.freebsd.org/projects/doc-kr/</a><br> 
-<b>E-Mail</b>: <a href="mailto:doc@kr.freebsd.org">doc@kr.freebsd.org</a><br>
+<b>Web</b>: <a href="http://www.kr.FreeBSD.org/projects/doc-kr/">http://www.kr.FreeBSD.org/projects/doc-kr/</a><br> 
+<b>E-Mail</b>: <a href="mailto:doc@kr.FreeBSD.org">doc@kr.FreeBSD.org</a><br>
 
 <dl>
 <dt><i>Documents currently at working</i></dt>
@@ -140,8 +140,8 @@ http://www.matti.ee/~vallo/</a><br>
 <a name="spanish"></a>
 <h2>The FreeBSD Spanish Documentation Project</h2>
 
-<b>Web</b>: <a href="http://www.es.freebsd.org/es/">http://www.es.freebsd.org/es/</a><br>
-<b>E-Mail</b>: <a href="mailto:jesusr@es.freebsd.org">jesusr@es.freebsd.org</a><br>
+<b>Web</b>: <a href="http://www.es.FreeBSD.org/es/">http://www.es.FreeBSD.org/es/</a><br>
+<b>E-Mail</b>: <a href="mailto:jesusr@es.FreeBSD.org">jesusr@es.FreeBSD.org</a><br>
 
 <dl>
 <dt><i>Documents available</i></dt>
diff --git a/en/docs.sgml b/en/docs.sgml
index 5acc942770..b0eba4e006 100644
--- a/en/docs.sgml
+++ b/en/docs.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/docs.sgml,v 1.73 1999/09/06 07:02:36 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/docs.sgml,v 1.74 1999/10/26 09:37:42 wosch Exp $">
 <!ENTITY title "Documentation">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/docs.sgml,v 1.73 1999/09/06 07:02:36 peter Exp $ -->
+<!-- $FreeBSD: www/en/docs.sgml,v 1.74 1999/10/26 09:37:42 wosch Exp $ -->
 
 <html>
     &header;
@@ -156,60 +156,60 @@
 
     <a name="man"></a>
 
-    <h2><a href="http://www.freebsd.org/cgi/man.cgi">Manual Pages</a></h2>
+    <h2><a href="http://www.FreeBSD.org/cgi/man.cgi">Manual Pages</a></h2>
     
     <dl>
       <dt><strong>FreeBSD</strong></dt>
       
       <dd>For release:
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+1.0-RELEASE">1.0</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+1.1-RELEASE">1.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+1.1.5.1-RELEASE">1.1.5.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.0-RELEASE">2.0</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.0.5-RELEASE">2.0.5</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.1.0-RELEASE">2.1.0</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.1.5-RELEASE">2.1.5</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.1.6.1-RELEASE">2.1.6.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.1.7.1-RELEASE">2.1.7.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.1-RELEASE">2.2.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.2-RELEASE">2.2.2</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.5-RELEASE">2.2.5</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.6-RELEASE">2.2.6</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.7-RELEASE">2.2.7</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.8-RELEASE">2.2.8</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+3.0-RELEASE">3.0</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+3.1-RELEASE">3.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+3.2-RELEASE">3.2</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+3.3-RELEASE">3.3</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+1.0-RELEASE">1.0</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+1.1-RELEASE">1.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+1.1.5.1-RELEASE">1.1.5.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.0-RELEASE">2.0</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.0.5-RELEASE">2.0.5</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.1.0-RELEASE">2.1.0</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.1.5-RELEASE">2.1.5</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.1.6.1-RELEASE">2.1.6.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.1.7.1-RELEASE">2.1.7.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.1-RELEASE">2.2.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.2-RELEASE">2.2.2</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.5-RELEASE">2.2.5</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.6-RELEASE">2.2.6</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.7-RELEASE">2.2.7</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+2.2.8-RELEASE">2.2.8</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+3.0-RELEASE">3.0</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+3.1-RELEASE">3.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+3.2-RELEASE">3.2</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+3.3-RELEASE">3.3</a>,
 	<a
-	  href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+4.0-current">4.0-current</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+Ports">Ports</a>.</dd>
+	  href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+4.0-current">4.0-current</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=FreeBSD+Ports">Ports</a>.</dd>
     
       <dt><strong>Other Systems</strong></dt>
       
-      <dd><a href="http://www.freebsd.org/cgi/man.cgi?manpath=v7">Unix Seventh Edition (V7)</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=2.8BSD">2.8BSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=2.9BSD">2.9.1BSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=2.10BSD">2.10BSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=2.11BSD">2.11BSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=4.3BSD+Reno">4.3BSD Reno</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=NET%2F2">NET/2</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=386BSD+0.1">386BSD 0.1</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=4.4BSD+Lite2">4.4BSD Lite2</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=linux">Linux Slackware</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=NetBSD">NetBSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=OpenBSD">OpenBSD</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=plan9">Plan 9</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=sunos4">SunOS 4.x</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=sunos5">SunOS 5.x</a>,
-	<a href="http://www.freebsd.org/cgi/man.cgi?manpath=ultrix">ULTRIX 4.2</a>,
+      <dd><a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=v7">Unix Seventh Edition (V7)</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=2.8BSD">2.8BSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=2.9BSD">2.9.1BSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=2.10BSD">2.10BSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=2.11BSD">2.11BSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=4.3BSD+Reno">4.3BSD Reno</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=NET%2F2">NET/2</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=386BSD+0.1">386BSD 0.1</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=4.4BSD+Lite2">4.4BSD Lite2</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=linux">Linux Slackware</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=NetBSD">NetBSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=OpenBSD">OpenBSD</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=plan9">Plan 9</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=sunos4">SunOS 4.x</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=sunos5">SunOS 5.x</a>,
+	<a href="http://www.FreeBSD.org/cgi/man.cgi?manpath=ultrix">ULTRIX 4.2</a>,
 	and <a
-	  href="http://www.freebsd.org/cgi/man.cgi?manpath=XFree86">XFree86</a>.
+	  href="http://www.FreeBSD.org/cgi/man.cgi?manpath=XFree86">XFree86</a>.
       </dd>
     </dl>
     
     <!--
-  <form action="http://www.freebsd.org/cgi/man.cgi" method="GET">
+  <form action="http://www.FreeBSD.org/cgi/man.cgi" method="GET">
     Manual Page Search for:
   <input type="hidden" name="proto" value="1.0">
   <input type="hidden" name="apropos" value="0">
@@ -219,7 +219,7 @@
     -->
     
     <p>This service is provided courtesy of <a
-	href="http://www.de.freebsd.org/~wosch/">Wolfram Schneider</a>.  There
+	href="http://www.de.FreeBSD.org/~wosch/">Wolfram Schneider</a>.  There
       is <a
 	href="http://late5.e-technik.uni-erlangen.de/cgi-bin/bsddocquery.pl">another
 	script</a> available with the manual pages for FreeBSD 2.0 and XFree86
@@ -229,7 +229,7 @@
 
       <a name="44doc"></a>
       
-    <h2><a href="http://www.freebsd.org/doc/"> 4.4BSD Documents</a></h2>
+    <h2><a href="http://www.FreeBSD.org/doc/"> 4.4BSD Documents</a></h2>
 
     <p>If you like reading BSD manuals online, here is a hypertext version of
       the 4.4BSD documents from <a
@@ -239,7 +239,7 @@
       
       <a name="info"></a>
       
-    <h2><a href="http://www.freebsd.org/info/">Info Documents</a></h2>
+    <h2><a href="http://www.FreeBSD.org/info/">Info Documents</a></h2>
 
     <p>If you like reading FreeBSD Info documents online, here is a hypertext
       version of the Info documents from <a
diff --git a/en/gallery/gallery.sgml b/en/gallery/gallery.sgml
index 7961d7bfb2..11e5d67cec 100644
--- a/en/gallery/gallery.sgml
+++ b/en/gallery/gallery.sgml
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/gallery/gallery.sgml,v 1.46 1999/09/06 07:02:44 peter Exp $">
 <!ENTITY title "The FreeBSD Gallery">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/gallery/gallery.sgml,v 1.46 1999/09/06 07:02:44 peter Exp $ -->
 
 <html>
 &header;
 <P>All over the world, FreeBSD is powering innovative Internet applications and services. This gallery is a showcase of 1571 organizations and individuals who have put FreeBSD to work for them. Browse and find out more about what FreeBSD can do for <STRONG>you</STRONG>!</P><P></P>
-<A NAME="commercial"></A><A NAME="non-profit"></A><A NAME="personal"></A><UL><LI><A HREF="cgallery.html">975 commercial organizations</A></LI><LI><A HREF="npgallery.html">433 non-profit organizations</A></LI><LI><A HREF="pgallery.html">163 personal sites</A></LI></UL><P>To have your site added to these lists, simply fill out <A HREF="http://www.freebsd.org/cgi/gallery.cgi">this form</A>.<P>
+<A NAME="commercial"></A><A NAME="non-profit"></A><A NAME="personal"></A><UL><LI><A HREF="cgallery.html">975 commercial organizations</A></LI><LI><A HREF="npgallery.html">433 non-profit organizations</A></LI><LI><A HREF="pgallery.html">163 personal sites</A></LI></UL><P>To have your site added to these lists, simply fill out <A HREF="http://www.FreeBSD.org/cgi/gallery.cgi">this form</A>.<P>
 <TABLE WIDTH="100%" BORDER="0">
 <TR>
 <TD ALIGN="LEFT"><IMG SRC="../gifs/powerlogo.gif" ALT="" ALIGN="LEFT" BORDER="0"></TD>
diff --git a/en/index.sgml b/en/index.sgml
index 01088d3e1b..fe547571c0 100644
--- a/en/index.sgml
+++ b/en/index.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY title "The FreeBSD Project">
-<!ENTITY date  "$FreeBSD: www/en/index.sgml,v 1.66 1999/10/30 10:01:58 wosch Exp $">
+<!ENTITY date  "$FreeBSD: www/en/index.sgml,v 1.67 1999/11/28 22:32:38 kuriyama Exp $">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 
@@ -25,7 +25,7 @@
 		border="0"></a></td>
 	  
 	  <td align="right" valign="bottom" width="300">
-	    <form action="http://www.freebsd.org/cgi/mirror.cgi" method="GET">
+	    <form action="http://www.FreeBSD.org/cgi/mirror.cgi" method="GET">
 	      
 	      <br>
 	      
@@ -38,66 +38,66 @@
     		      which are not mirrored should be listed in
 		      support.sgml.  -->
 
-		<option value="http://www.au.freebsd.org/">Australia/1</option>
-		<option value="http://www2.au.freebsd.org/">Australia/2</option>
-		<option value="http://www3.au.freebsd.org/">Australia/3</option>
+		<option value="http://www.au.FreeBSD.org/">Australia/1</option>
+		<option value="http://www2.au.FreeBSD.org/">Australia/2</option>
+		<option value="http://www3.au.FreeBSD.org/">Australia/3</option>
                 <option value="http://freebsd.itworks.com.au/">Australia/4</option>
-		<option value="http://www.br.freebsd.org/www.freebsd.org/">Brazil/1</option>
-		<option value="http://www2.br.freebsd.org/www.freebsd.org/">Brazil/2</option>
-		<option value="http://www3.br.freebsd.org/">Brazil/3</option>
-		<option value="http://www.bg.freebsd.org">Bulgaria</option>
-		<option value="http://www.ca.freebsd.org/">Canada/1</option>
-		<option value="http://www2.ca.freebsd.org/">Canada/2</option>
-		<option value="http://www3.ca.freebsd.org">Canada/3</option>
-		<option value="http://www.cn.freebsd.org">China</option>
-		<option value="http://www.cz.freebsd.org">Czech Rep/1</option>
-		<option value="http://www2.cz.freebsd.org">Czech Rep/2</option>
-		<option value="http://www.dk.freebsd.org">Denmark</option>
-		<option value="http://www.ee.freebsd.org/">Estonia</option>
-		<option value="http://www.fi.freebsd.org/">Finland</option>
-		<option value="http://www.fr.freebsd.org/">France</option>
-		<option value="http://www.de.freebsd.org/">Germany/1</option>
-		<option value="http://www1.de.freebsd.org/">Germany/2</option>
-		<option value="http://www2.de.freebsd.org/">Germany/3</option>
-		<option value="http://www.hu.freebsd.org/">Hungary</option>
-		<option value="http://www.is.freebsd.org/">Iceland</option>
-		<option value="http://www.ie.freebsd.org/">Ireland</option>
-		<!-- <option value="http://www.it.freebsd.org/">Italy</option> -->
-		<option value="http://www.jp.freebsd.org/www.freebsd.org/">Japan</option>
-		<option value="http://www.kr.freebsd.org/">Korea</option>
-		<option value="http://www2.kr.freebsd.org/">Korea/2</option>
-		<option value="http://www.lv.freebsd.org/">Latvia</option>
+		<option value="http://www.br.FreeBSD.org/www.FreeBSD.org/">Brazil/1</option>
+		<option value="http://www2.br.FreeBSD.org/www.FreeBSD.org/">Brazil/2</option>
+		<option value="http://www3.br.FreeBSD.org/">Brazil/3</option>
+		<option value="http://www.bg.FreeBSD.org">Bulgaria</option>
+		<option value="http://www.ca.FreeBSD.org/">Canada/1</option>
+		<option value="http://www2.ca.FreeBSD.org/">Canada/2</option>
+		<option value="http://www3.ca.FreeBSD.org">Canada/3</option>
+		<option value="http://www.cn.FreeBSD.org">China</option>
+		<option value="http://www.cz.FreeBSD.org">Czech Rep/1</option>
+		<option value="http://www2.cz.FreeBSD.org">Czech Rep/2</option>
+		<option value="http://www.dk.FreeBSD.org">Denmark</option>
+		<option value="http://www.ee.FreeBSD.org/">Estonia</option>
+		<option value="http://www.fi.FreeBSD.org/">Finland</option>
+		<option value="http://www.fr.FreeBSD.org/">France</option>
+		<option value="http://www.de.FreeBSD.org/">Germany/1</option>
+		<option value="http://www1.de.FreeBSD.org/">Germany/2</option>
+		<option value="http://www2.de.FreeBSD.org/">Germany/3</option>
+		<option value="http://www.hu.FreeBSD.org/">Hungary</option>
+		<option value="http://www.is.FreeBSD.org/">Iceland</option>
+		<option value="http://www.ie.FreeBSD.org/">Ireland</option>
+		<!-- <option value="http://www.it.FreeBSD.org/">Italy</option> -->
+		<option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">Japan</option>
+		<option value="http://www.kr.FreeBSD.org/">Korea</option>
+		<option value="http://www2.kr.FreeBSD.org/">Korea/2</option>
+		<option value="http://www.lv.FreeBSD.org/">Latvia</option>
 		<option value="http://rama.asiapac.net/freebsd/">Malaysia</option>
-		<option value="http://www.nl.freebsd.org/">Netherlands</option>
-		<option value="http://www.nz.freebsd.org/">New Zealand</option>
-		<option value="http://www.no.freebsd.org/">Norway</option>
-		<option value="http://www.pl.freebsd.org/">Poland/1</option>
-		<option value="http://www2.pl.freebsd.org/">Poland/2</option>
-		<option value="http://www.pt.freebsd.org/">Portugal/1</option>
-		<option value="http://www2.pt.freebsd.org/">Portugal/2</option>
-		<option value="http://www3.pt.freebsd.org/">Portugal/3</option>
-		<option value="http://www.ro.freebsd.org/">Romania</option>
-		<option value="http://www.ru.freebsd.org/">Russia/1</option>
-		<option value="http://www2.ru.freebsd.org/">Russia/2</option>
-		<option value="http://www3.ru.freebsd.org/">Russia/3</option>
-		<option value="http://www4.ru.freebsd.org/">Russia/4</option>
+		<option value="http://www.nl.FreeBSD.org/">Netherlands</option>
+		<option value="http://www.nz.FreeBSD.org/">New Zealand</option>
+		<option value="http://www.no.FreeBSD.org/">Norway</option>
+		<option value="http://www.pl.FreeBSD.org/">Poland/1</option>
+		<option value="http://www2.pl.FreeBSD.org/">Poland/2</option>
+		<option value="http://www.pt.FreeBSD.org/">Portugal/1</option>
+		<option value="http://www2.pt.FreeBSD.org/">Portugal/2</option>
+		<option value="http://www3.pt.FreeBSD.org/">Portugal/3</option>
+		<option value="http://www.ro.FreeBSD.org/">Romania</option>
+		<option value="http://www.ru.FreeBSD.org/">Russia/1</option>
+		<option value="http://www2.ru.FreeBSD.org/">Russia/2</option>
+		<option value="http://www3.ru.FreeBSD.org/">Russia/3</option>
+		<option value="http://www4.ru.FreeBSD.org/">Russia/4</option>
 		<option value="http://freebsd.s1web.com/">Singapore</option>
-		<option value="http://www.sk.freebsd.org/">Slovak Republic</option>
-		<option value="http://www.si.freebsd.org/">Slovenia</option>
-		<option value="http://www.es.freebsd.org/">Spain</option>
-		<option value="http://www.za.freebsd.org/">South Africa/1</option>
-		<option value="http://www2.za.freebsd.org/">South Africa/2</option>
-		<option value="http://www.se.freebsd.org/">Sweden</option>
-		<option value="http://www.ch.freebsd.org/">Switzerland</option>
-		<option value="http://www.tw.freebsd.org/www.freebsd.org/data/">Taiwan</option>
-		<option value="http://www.tr.freebsd.org/">Turkey</option>
-		<option value="http://www.ua.freebsd.org/">Ukraine/1</option>
-		<option value="http://www2.ua.freebsd.org/">Ukraine/2</option> 
-		<option value="http://www.uk.freebsd.org/">United Kingdom</option>
-		<option value="http://www.freebsd.org/">USA/California</option>
+		<option value="http://www.sk.FreeBSD.org/">Slovak Republic</option>
+		<option value="http://www.si.FreeBSD.org/">Slovenia</option>
+		<option value="http://www.es.FreeBSD.org/">Spain</option>
+		<option value="http://www.za.FreeBSD.org/">South Africa/1</option>
+		<option value="http://www2.za.FreeBSD.org/">South Africa/2</option>
+		<option value="http://www.se.FreeBSD.org/">Sweden</option>
+		<option value="http://www.ch.FreeBSD.org/">Switzerland</option>
+		<option value="http://www.tw.FreeBSD.org/www.FreeBSD.org/data/">Taiwan</option>
+		<option value="http://www.tr.FreeBSD.org/">Turkey</option>
+		<option value="http://www.ua.FreeBSD.org/">Ukraine/1</option>
+		<option value="http://www2.ua.FreeBSD.org/">Ukraine/2</option> 
+		<option value="http://www.uk.FreeBSD.org/">United Kingdom</option>
+		<option value="http://www.FreeBSD.org/">USA/California</option>
 		<option value="http://freebsd.advansys.net">USA/Indiana</option>
-		<option value="http://www6.freebsd.org/">USA/Oregon</option>
-		<option value="http://www2.freebsd.org/">USA/Texas</option>
+		<option value="http://www6.FreeBSD.org/">USA/Oregon</option>
+		<option value="http://www2.FreeBSD.org/">USA/Texas</option>
 	      </select>
 	      
 	      <input type="submit" value=" Go ">
@@ -262,7 +262,7 @@
 		&nbsp;&nbsp;<a href="internal/">More ...</a><br>
 	    </small></p>
 	    
-	    <form action="http://www.freebsd.org/cgi/search.cgi" method="get">
+	    <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
 	      <small>&nbsp;&nbsp;Search for:<br>
 	      <input type="text" name="words" size="10">
 	      <input type="hidden" name="max" value="25">
diff --git a/en/internal/about.sgml b/en/internal/about.sgml
index f246f096e0..41cd122e5e 100644
--- a/en/internal/about.sgml
+++ b/en/internal/about.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/about.sgml,v 1.29 1999/09/30 16:25:32 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/about.sgml,v 1.30 1999/10/01 13:19:30 wosch Exp $">
 <!ENTITY title "About the FreeBSD WWW Server">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/internal/about.sgml,v 1.29 1999/09/30 16:25:32 wosch Exp $ -->
+<!-- $FreeBSD: www/en/internal/about.sgml,v 1.30 1999/10/01 13:19:30 wosch Exp $ -->
 
 <html>
 &header;
@@ -12,11 +12,11 @@
 <h2>The Machine</h2>
 
     <img src="../gifs/powerlogo.gif" alt="" align="right"> <p>The
-      machine, <tt>www.freebsd.org</tt>, otherwise known as
-      <tt>freefall.freebsd.org</tt>, is 400MHz Pentium Pro machine with
+      machine, <tt>www.FreeBSD.org</tt>, otherwise known as
+      <tt>freefall.FreeBSD.org</tt>, is 400MHz Pentium Pro machine with
       a PCI motherboard, 256 megabytes of RAM and about 4
       gigabytes of disk space. The search engine for the
-      webpages and the mailing lists is <tt>hub.freebsd.org</tt>,
+      webpages and the mailing lists is <tt>hub.FreeBSD.org</tt>,
       a 400 MHz Pentium II with 256MB megabytes RAM and about 10 gigabytes 
       disk space.
 
@@ -45,7 +45,7 @@
     <img src="../gifs/gourchin3.gif" alt=""
       align="right"><p>The
       <a href="http://www.quantified.com/urchin/support/">Urchin</a>
-      web statistics package is used to provide <a href="http://www.freebsd.org/statistic/urchin/">
+      web statistics package is used to provide <a href="http://www.FreeBSD.org/statistic/urchin/">
       these statistics</a> on web server usage.</p>
 
 <h2>The Pages</h2>
@@ -53,10 +53,10 @@
     <img src="../gifs/lynx.gif" alt="" align="right">
     <p>These Web pages have been put together by John Fieber
 	<a
-	href="http://www.freebsd.org/~jfieber/">&lt;jfieber@freebsd.org&gt;</a> 
+	href="http://www.FreeBSD.org/~jfieber/">&lt;jfieber@FreeBSD.org&gt;</a> 
         with input from the FreeBSD community and <b>you</b>.
-	The Webmaster is <a href="http://www.freebsd.org/~wosch/">
-	&lt;wosch@freebsd.org&gt;</a>.
+	The Webmaster is <a href="http://www.FreeBSD.org/~wosch/">
+	&lt;wosch@FreeBSD.org&gt;</a>.
 	The FreeBSD pages are HTML 3.2 compliant and best viewed with 
 	your browser.<p>
 
@@ -68,7 +68,7 @@
     Megan McCormack</A>
     </p>
 
-<h2><a href="http://www.freebsd.org/~wosch/papers/webbuild.html">
+<h2><a href="http://www.FreeBSD.org/~wosch/papers/webbuild.html">
 Building and updating the FreeBSD Web Pages</a></h2>
 
 &webbuild;
@@ -88,7 +88,7 @@ Building and updating the FreeBSD Web Pages</a></h2>
 
 <h2>Mirroring the FreeBSD Web Pages</h2>
     <p>You can (and are encouraged to) <a href="mirror.html">mirror</a>
-       the FreeBSD web pages on www.freebsd.org.</p>
+       the FreeBSD web pages on www.FreeBSD.org.</p>
 
    <p><a href="statistic.html#analog">
       Usage statistics</a> for this server are updated daily.
diff --git a/en/internal/developer.sgml b/en/internal/developer.sgml
index 51bb55aa25..9a72c3d944 100644
--- a/en/internal/developer.sgml
+++ b/en/internal/developer.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/developer.sgml,v 1.4 1999/09/06 07:02:45 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/developer.sgml,v 1.5 1999/09/19 10:20:46 wosch Exp $">
 <!ENTITY title "Resources for FreeBSD Committers">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/internal/developer.sgml,v 1.4 1999/09/06 07:02:45 peter Exp $ -->
+<!-- $FreeBSD: www/en/internal/developer.sgml,v 1.5 1999/09/19 10:20:46 wosch Exp $ -->
 
 <html>
 &header;
@@ -14,7 +14,7 @@
 Almost everything a new committer to the FreeBSD Project needs to know
 (see the Ports Guide and FDP Primer for more info).
 
-<h2><a href="http://www.freebsd.org/~wosch/papers/webbuild.html">
+<h2><a href="http://www.FreeBSD.org/~wosch/papers/webbuild.html">
 Build the FreeBSD Web Pages</a></h2>
 
 &webbuild;
@@ -26,7 +26,7 @@ contributing to the FreeBSD Documentation Project, from the tools and
 software you will be using (both mandatory and recommended) to the
 philosophy behind the Documentation Project.
 
-<h2><a href=" http://www.freebsd.org/~asami/cvsguide.txt">
+<h2><a href=" http://www.FreeBSD.org/~asami/cvsguide.txt">
 A Guide for FreeBSD Ports Committers</a></h2>
 
 A Guide for FreeBSD Ports Committers
@@ -34,7 +34,7 @@ A Guide for FreeBSD Ports Committers
 <h2>FreeBSD Projects</h2>
 <ul>
   <li><a href="../docproj/docproj.html">FreeBSD Documentation Project</a></li>
-  <li><a href="http://www.freebsd.org/~picobsd/">PicoBSD</a></li>
+  <li><a href="http://www.FreeBSD.org/~picobsd/">PicoBSD</a></li>
   <li><a href="../alpha/">FreeBSD/Alpha Project</a></li>
   <li><a href="../projects/">FreeBSD Development Projects</a></li>
 </ul>
diff --git a/en/internal/internal.sgml b/en/internal/internal.sgml
index a71dbc6ab3..2cc03fff8c 100644
--- a/en/internal/internal.sgml
+++ b/en/internal/internal.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/internal/internal.sgml,v 1.10 1999/09/06 07:02:45 peter Exp $">
 <!ENTITY title "FreeBSD Internal">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/internal/internal.sgml,v 1.10 1999/09/06 07:02:45 peter Exp $ -->
 
 <html>
 &header;
@@ -31,8 +31,8 @@ for what.</p>
 
 <h2><a href="photos.html">Photos from Social Events</a></h2>
 
-<h2><a href="http://www.freebsd.org/internal/homepage.html">Personal Homepages</a></h2>
-<p>A list of private home pages hosted on www.freebsd.org.</p>
+<h2><a href="http://www.FreeBSD.org/internal/homepage.html">Personal Homepages</a></h2>
+<p>A list of private home pages hosted on www.FreeBSD.org.</p>
 
 <h2><a href="../projects/projects.html">FreeBSD Projects</a></h2
 <p>In addition to the mainstream development path of FreeBSD, a number of
diff --git a/en/internal/machines.sgml b/en/internal/machines.sgml
index 79c553d0fe..b1fb911397 100644
--- a/en/internal/machines.sgml
+++ b/en/internal/machines.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.12 1999/09/06 07:02:45 peter Exp $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/internal/machines.sgml,v 1.12 1999/09/06 07:02:45 peter Exp $ -->
 
 <html>
 &header;
@@ -134,7 +134,7 @@ direct queries to them first when asking about administrative issues,
 this includes changes to user accounts or filesystem layout.</p>
 
 <p>All new user accounts must be cleared with the admin staff, <a
-href="mailto:admins@freebsd.org">admins@freebsd.org</a>, and are given
+href="mailto:admins@FreeBSD.org">admins@FreeBSD.org</a>, and are given
 only to FreeBSD developers, either in the docs, ports or general
 src hacking category. Accounts may be given to non-project developers 
 if they have a specific need to test something of a truly experimental 
@@ -143,7 +143,7 @@ are not given to the general public for "vanity domain" mail or
 other such uses, so please don't ask.  Thanks.</p>
 
 <p>Jordan Hubbard<br>
-<a href="mailto:jkh@freebsd.org">jkh@freebsd.org</a></p>
+<a href="mailto:jkh@FreeBSD.org">jkh@FreeBSD.org</a></p>
 
 <p></p><A HREF="internal.html">FreeBSD Internal Home</a>
 &footer;
diff --git a/en/internal/mirror.sgml b/en/internal/mirror.sgml
index c6a66906a0..bf17c66563 100644
--- a/en/internal/mirror.sgml
+++ b/en/internal/mirror.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/internal/mirror.sgml,v 1.11 1999/09/06 07:02:45 peter Exp $">
 <!ENTITY title "Mirroring the FreeBSD Web Pages">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/internal/mirror.sgml,v 1.11 1999/09/06 07:02:45 peter Exp $ -->
 
 <html>
 &header;
 
 <p>You can (and are encouraged to) mirror the FreeBSD web pages 
-<tt>www.freebsd.org</tt>. 
+<tt>www.FreeBSD.org</tt>. 
 
 To do this, you need to obtain and install
 a program called <em>cvsup</em> on your web server. 
@@ -47,7 +47,7 @@ The file <tt>supfile-www</tt> contain:
 
 <p>This will mirror the FreeBSD web pages into
 <tt>/usr/FreeBSD-mirror</tt>. You can install this into fred's
-crontab, so that it runs once a day. The pages on www.freebsd.org are
+crontab, so that it runs once a day. The pages on www.FreeBSD.org are
 updated daily at about 4:30am California time.</p>
 
 <H2>More Information on CVSup</H2>
diff --git a/en/internal/photos.sgml b/en/internal/photos.sgml
index 03cead051b..f1e0c74b51 100644
--- a/en/internal/photos.sgml
+++ b/en/internal/photos.sgml
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/internal/photos.sgml,v 1.8 1999/09/06 07:02:45 peter Exp $">
 <!ENTITY title "Photo Gallery">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/internal/photos.sgml,v 1.8 1999/09/06 07:02:45 peter Exp $ -->
 
 <html>
 &header;
 
-<h2><a href="http://www.freebsd.org/~nik/Oxford/index.html">Oxford (UK) FreeBSD meeting, November 1998</a></h2>
+<h2><a href="http://www.FreeBSD.org/~nik/Oxford/index.html">Oxford (UK) FreeBSD meeting, November 1998</a></h2>
 
-<p>Photos and text by <a href="mailto:nik@freebsd.org">Nik</a>. Organised 
+<p>Photos and text by <a href="mailto:nik@FreeBSD.org">Nik</a>. Organised 
 by Paul Richards.</p>
 
 <h2>Dutch FreeBSD meeting, October 1998</h2>
-Photos by <a href="http://www.freebsd.org/~jkh/holland/">Jordan</a> and
+Photos by <a href="http://www.FreeBSD.org/~jkh/holland/">Jordan</a> and
 <a href="http://www.tcja.nl/hackersparty/">Wilko</a>
 
-<h2><a href="http://www.de.freebsd.org/de/gif/hamburg-1998-06-20/index.html">
+<h2><a href="http://www.de.FreeBSD.org/de/gif/hamburg-1998-06-20/index.html">
 BSD Social Event Hamburg, June 1998</a></h2>
 
 <p>
@@ -35,7 +35,7 @@ conference, Sydney, September 1998</a></h2>
 Richard Stallman, Peter Wemm, Mark White, Andrew McRae, Greg Rose, many
 unidentified.
 
-<h2><a href="http://www.freebsd.org/~grog/usenix.html">
+<h2><a href="http://www.FreeBSD.org/~grog/usenix.html">
 Summer 1998 USENIX, New Orleans</a></h2>
 
 <p>
@@ -45,7 +45,7 @@ Rizzo, Mark Murray, Mike Smith, Monique van Rooij, Ollivier Robert,
 Philippe Regnauld, Poul-Henning Kamp, Sharon, Steve Mann
 </p>
 
-<h2><a href="http://www.de.freebsd.org/de/gif/aachen-19950902/">
+<h2><a href="http://www.de.FreeBSD.org/de/gif/aachen-19950902/">
 FreeBSD Social Event Aachen, 1995</a></h2>
 
 <p>
@@ -56,7 +56,7 @@ Esser, Ulf Kieber, Wilko Bulte
 </p>
 
 
-<h2><a href="http://www.freebsd.org/~jhs/freebsd/people.html">
+<h2><a href="http://www.FreeBSD.org/~jhs/freebsd/people.html">
 FreeBSD People</a></h2>
 <p>
 Aled Morris, Andrey Chernov, Christoph Kukulies, Gary Jennejohn, Gary
diff --git a/en/internal/statistic.sgml b/en/internal/statistic.sgml
index 8224a96e89..3c2353389b 100644
--- a/en/internal/statistic.sgml
+++ b/en/internal/statistic.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/statistic.sgml,v 1.7 1999/09/06 07:02:45 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/statistic.sgml,v 1.8 1999/10/19 07:52:45 wosch Exp $">
 <!ENTITY title "FreeBSD Statistics">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/internal/statistic.sgml,v 1.7 1999/09/06 07:02:45 peter Exp $ -->
+<!-- $FreeBSD: www/en/internal/statistic.sgml,v 1.8 1999/10/19 07:52:45 wosch Exp $ -->
 
 <html>
 &header;
@@ -15,7 +15,7 @@
 <h4>Analog</h4>
 
    <p>The Web <a
-      href="http://www.freebsd.org/statistic/freefall.html">usage
+      href="http://www.FreeBSD.org/statistic/freefall.html">usage
       statistics</a> for this server are updated daily with the
       analog(1) tool.
 
@@ -27,7 +27,7 @@
       align="right" HEIGHT="30" WIDTH="89" BORDER="0"><p>The <a
       href="http://www.quantified.com/urchin/support/">Urchin</a> web
       statistics package is used to provide <a
-      href="http://www.freebsd.org/statistic/urchin/"> these
+      href="http://www.FreeBSD.org/statistic/urchin/"> these
       statistics</a> on web server usage.</p>
 
 
@@ -35,8 +35,8 @@
 <h2>FreeBSD Release Usage Statistic</h2>
 
     <p>A snapshot of the current FreeBSD release usage is available at
-    <a href="http://www.freebsd.org/statistic/release_usage/images/">
-    http://www.freebsd.org/statistic/release_usage/images/</a>.
+    <a href="http://www.FreeBSD.org/statistic/release_usage/images/">
+    http://www.FreeBSD.org/statistic/release_usage/images/</a>.
     </p>
 
 <!-- from ../projects/projects.sgml -->
@@ -51,7 +51,7 @@
        this makes it all the more difficult to persuade hardware and
        software vendors to take it seriously.
 
-<h2>FTP traffic at ftp.freebsd.org</h2>
+<h2>FTP traffic at ftp.FreeBSD.org</h2>
 
 We set a new traffic record for 
 <a href="http://www.emsphone.com/stats/cdrom.html">
diff --git a/en/news/includes.sgml b/en/news/includes.sgml
index c36fd4af75..0684c03592 100644
--- a/en/news/includes.sgml
+++ b/en/news/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/includes.sgml,v 1.5 1999/09/06 07:02:46 peter Exp $ -->
 
 <!ENTITY newshome '<A HREF="news.html">News Home</A>'>
 
@@ -23,7 +23,7 @@
 <HR>
 This is an (at least) monthly Newsletter, published only by E-mail.  
 Archived copies can be found at:
-<A HREF="qnewsletter.html">http://www.freebsd.org/news/qnewsletter.html</A>
+<A HREF="qnewsletter.html">http://www.FreeBSD.org/news/qnewsletter.html</A>
 
 <p>
 If you have anything you would like to see in the next edition,
diff --git a/en/news/newsflash.sgml b/en/news/newsflash.sgml
index ef948626ed..a996e96c85 100644
--- a/en/news/newsflash.sgml
+++ b/en/news/newsflash.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/news/newsflash.sgml,v 1.135 1999/09/22 08:15:28 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/newsflash.sgml,v 1.136 1999/10/29 05:52:42 jkh Exp $">
 <!ENTITY title "FreeBSD News flash!">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/en/news/newsflash.sgml,v 1.135 1999/09/22 08:15:28 wosch Exp $ -->
+<!-- $FreeBSD: www/en/news/newsflash.sgml,v 1.136 1999/10/29 05:52:42 jkh Exp $ -->
 
 <html>
 &header;
@@ -104,7 +104,7 @@ Information</a></strong> page.</p>
 
 <!--
 	<li><b>16-Mar-1999</b>The 
-	<a href="http://www.freebsd.org/projects/#fbsdboard">FreeBSD 
+	<a href="http://www.FreeBSD.org/projects/#fbsdboard">FreeBSD 
 	WebBoard</a> has been opened.  It is a place where members of the 
 	FreeBSD community can help one another out.</li>
 	-->
@@ -257,8 +257,8 @@ Information</a></strong> page.</p>
         FreeBSD -CURRENT branch (the future 3.0-RELEASE) has switched to
 	ELF from a.out format. People involved did a great job: transition
 	went smooth. Check 
-	<A HREF="http://www.freebsd.org/search/search.html"> 
-	freebsd-current@freebsd.org</A> mail archive for more information
+	<A HREF="http://www.FreeBSD.org/search/search.html"> 
+	freebsd-current@FreeBSD.org</A> mail archive for more information
 	on the transition to ELF.
         </P></LI>  
 
@@ -285,7 +285,7 @@ Information</a></strong> page.</p>
         See the <a href="&base/releases/index.html">Release
         Information</a> page for details.  Also be sure to
         check the
-        <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.7-RELEASE/ERRATA.TXT">
+        <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.7-RELEASE/ERRATA.TXT">
         release errata</a> after installation for any late-breaking issues
         with 2.2.7 that you should know about.
 	</li>
@@ -297,15 +297,15 @@ Information</a></strong> page.</p>
 	documentation projects</a> for more information.</li>
 
 	<li><p><b>13-Jul-98</b>
-	<a href="mailto:jkh@freebsd.org">Jordan Hubbard</a> writes an
+	<a href="mailto:jkh@FreeBSD.org">Jordan Hubbard</a> writes an
 	<a href="http://editorials.freshmeat.net/jordan980713/">editorial</a>
 	on the past and future of the Unix community.</li>
 
         <li><p><b>9-Jul-98</b>
-        A <a href="http://www.es.freebsd.org/es/FAQ/FAQ.html">Spanish 
+        A <a href="http://www.es.FreeBSD.org/es/FAQ/FAQ.html">Spanish 
         translation</a> of the <a 
         href="../FAQ/FAQ.html">FAQ</a> has been completed
-        by the <a href="http://www.es.freebsd.org/es/">Spanish Documentation
+        by the <a href="http://www.es.FreeBSD.org/es/">Spanish Documentation
         Project</a>. More information can be found at the 
         <a 
         href="../docproj/translations.html">translations
@@ -317,7 +317,7 @@ Information</a></strong> page.</p>
     <ul>
 	<li><p><b>24-Jun-98</b>
 	The FreeBSD Project is sponsoring an
-	<a href="http://www.freebsd.org/~xcontest/">FreeBSD Desktop Theme
+	<a href="http://www.FreeBSD.org/~xcontest/">FreeBSD Desktop Theme
 	Contest</a>.  Participants will design their own X11 configurations,
 	and winners will have theirs distributed with future releases of
 	FreeBSD.</p></li>
@@ -334,23 +334,23 @@ Information</a></strong> page.</p>
 
         <LI><P><B>23-May-98</b>
         The second issue of the FreeBSD Newsletter is now available in 
-        <a href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf">
+        <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">
         Adobe PDF format</a> (also by 
-        <A href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf">
+        <A href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">
         FTP</A>). A
-        <a href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/README.TXT">
+        <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/README.TXT">
         help file</a> is available to assist you in selecting and using
         a PDF viewer. 
 	Article submissions, advertisements, and letters 
         to the editor should be sent to 
-        <a href="mailto:newsletter@freebsd.org">newsletter@freebsd.org</a>. 
+        <a href="mailto:newsletter@FreeBSD.org">newsletter@FreeBSD.org</a>. 
         </p>
         </li>
 
 	<li><p><b>1-May-98</b>
 	The FreeBSD Project set up
 	<a name="anoncvs" href="../handbook/synching.html#ANONCVS">Anonymous CVS</a>
-	for the <a href="http://www.freebsd.org/cgi/cvsweb.cgi">FreeBSD CVS tree</a>. 
+	for the <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">FreeBSD CVS tree</a>. 
 	Among other things, it allows users of 	FreeBSD to perform, 
 	with no special privileges, read-only CVS operations
 	against one of the FreeBSD project's official anoncvs servers. 
@@ -381,7 +381,7 @@ Information</a></strong> page.</p>
         See the <a href="&base/releases/index.html">Release
         Information</a> page for details.  Also be sure to
         check the
-        <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.6-RELEASE/ERRATA.TXT">
+        <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.6-RELEASE/ERRATA.TXT">
         release errata</a> after installation for any late-breaking issues
         with 2.2.6 that you should know about.
 	</li>
@@ -402,7 +402,7 @@ Information</a></strong> page.</p>
 	both 3.0-current and 2.2-stable branches now.  This is available
 	in source form via the <a href="../handbook/synching.html#CVSUP">CVSup</a> utility
 	or in binary release snapshots from
-	<a href="ftp://current.freebsd.org/pub/FreeBSD">current.FreeBSD.org</a>
+	<a href="ftp://current.FreeBSD.org/pub/FreeBSD">current.FreeBSD.org</a>
 	</p></li>
 
     </ul>
@@ -414,7 +414,7 @@ Information</a></strong> page.</p>
 	<a href="../handbook/synching.html#CVSUP">CVSup</a> utility is now available.
 	To use it, simply login or su to root and run:
 	<tt><b>pkg_add</b>
-	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</tt>
+	ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</tt>
 	</p></li>
 
 	<li><p><b>2-Dec-97</b>
@@ -422,7 +422,7 @@ Information</a></strong> page.</p>
 	branches and can either be incorporated by using the
         <a href="../handbook/synching.html#CVSUP">CVSup</a> utility, as described below
 	for the LAND attack fix, or by applying
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.5-RELEASE/updates/f00f.diff.2.2">these patches</a>.</p></li>
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.5-RELEASE/updates/f00f.diff.2.2">these patches</a>.</p></li>
 
 	<li><p><b>1-Dec-97</b>
 	The "LAND attack" bug in TCP/IP has now been fixed in all relevant
@@ -445,7 +445,7 @@ Information</a></strong> page.</p>
 	<em>Pentium bug</em> -- We are aware of the "F00F" Pentium halting bug and are 
         working with Intel on a fix. When we have a fix ready for public
         consumption it will be announced here, on the mailing list
-        announce@freebsd.org and to the Usenet newsgroup
+        announce@FreeBSD.org and to the Usenet newsgroup
         <a href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>.
         Your patience is appreciated.</p></li>
 
@@ -463,7 +463,7 @@ Information</a></strong> page.</p>
         See the <a href="&base/releases/index.html">Release
         Information</a> page for details.  Also be sure to
         check the
-        <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.5-RELEASE/ERRATA.TXT">
+        <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.5-RELEASE/ERRATA.TXT">
         release errata</a> after installation for any late-breaking issues
         with 2.2.5 that you should know about.
 	</li>
@@ -508,16 +508,16 @@ Information</a></strong> page.</p>
 	</li>
 	<LI><P><B>17-Jul-97</b>
 	The first issue of the FreeBSD Newsletter is now available in 
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue1.pdf">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue1.pdf">
 	Adobe PDF format</a> (also by 
-	<A href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue1.pdf">
+	<A href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue1.pdf">
 	FTP</A>). A
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/README.TXT">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/README.TXT">
 	help file</a> is available to assist you in selecting and using
 	a PDF viewer. 
 	Article submissions, advertisements, and letters 
 	to the editor should be sent to 
-        <a href="mailto:newsletter@freebsd.org">newsletter@freebsd.org</a>. 
+        <a href="mailto:newsletter@FreeBSD.org">newsletter@FreeBSD.org</a>. 
 	</p>
         </li>
     </ul>
@@ -526,7 +526,7 @@ Information</a></strong> page.</p>
     <h2>June 1997</h2>
     <ul>
 	<li><p><b>17-Jun-97</b>
-	FreeBSD <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.2-RELEASE/">
+	FreeBSD <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.2-RELEASE/">
         2.2.2-RELEASE</a> CD-ROM discs are now in stock; subscription 
 	customers should receive them shortly.</p>
 	</li>
@@ -535,18 +535,18 @@ Information</a></strong> page.</p>
     <h2>May 1997</h2>
     <ul>
 	<li><p><b>16-May-97</b>
-	FreeBSD <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.2-RELEASE/">
+	FreeBSD <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.2-RELEASE/">
 	2.2.2-RELEASE</a> has been released.  The 
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.2-RELEASE/RELNOTES.TXT">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.2-RELEASE/RELNOTES.TXT">
 	Release Notes</a> and
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD2.2.2-RELEASE/ERRATA.TXT">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD2.2.2-RELEASE/ERRATA.TXT">
 	Errata List</a> can provide more information. </p>
 	</li>
 
 	<li><p><b>12-May-97</b>
 	A 3.0-Current SNAP-of-the-day server has been established at
-	<a href="ftp://current.freebsd.org/pub/FreeBSD/">
-	ftp://current.freebsd.org/pub/FreeBSD/</a>.  A 3.0-SNAPshot
+	<a href="ftp://current.FreeBSD.org/pub/FreeBSD/">
+	ftp://current.FreeBSD.org/pub/FreeBSD/</a>.  A 3.0-SNAPshot
 	will be generated daily, and old SNAPshots will be kept for
 	a minimum of one week.</p>
 	</li>
@@ -558,14 +558,14 @@ Information</a></strong> page.</p>
 	<li><p><b>28-Apr-97</b>
 	The 3.0-current src tree now contains support for building Symmetric 
 	MultiProcessor kernels.  For details go to the 
-	<a href="http://www.freebsd.org/~fsmp/SMP/SMP.html">SMP</a> page.
+	<a href="http://www.FreeBSD.org/~fsmp/SMP/SMP.html">SMP</a> page.
 	</p></li>
 
 	<li><p><b>22-Apr-97</b>
 	A RELENG_2.2 snap-of-the-day server has been established at
-	<a href="ftp://releng22.freebsd.org/pub/FreeBSD/">
-	ftp://releng22.freebsd.org/pub/FreeBSD</a>.  The
-	<a href="ftp://releng22.freebsd.org/pub/FreeBSD/README.TXT">
+	<a href="ftp://releng22.FreeBSD.org/pub/FreeBSD/">
+	ftp://releng22.FreeBSD.org/pub/FreeBSD</a>.  The
+	<a href="ftp://releng22.FreeBSD.org/pub/FreeBSD/README.TXT">
 	README.TXT</a> has more information.
 	</p></li>
 
@@ -589,17 +589,17 @@ Information</a></strong> page.</p>
 	is available.</p></li>
 	
 	<li><p><b>25-Mar-97</b>
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.1-RELEASE/">FreeBSD
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.1-RELEASE/">FreeBSD
 	2.2.1-RELEASE</a> is now available, replacing 2.2-RELEASE.  Read the
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.1-RELEASE/README.TXT">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.1-RELEASE/README.TXT">
 	README.TXT</a> file or the
 	<a href="&base/releases/2.2.1R/notes.html">Release Notes</a>    
 	for more information.</p></li>
 
 	<li><p><b>16-Mar-97</b>
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2-RELEASE/">FreeBSD
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-RELEASE/">FreeBSD
 	2.2-RELEASE</a> is now available.  Read the 
-	<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2-RELEASE/README.TXT">
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-RELEASE/README.TXT">
 	README.TXT</a> file or the
 	<a href="&base/releases/2.2R/notes.html">Release Notes</a> 
 	for more information.</p></li>
@@ -628,7 +628,7 @@ Information</a></strong> page.</p>
 	  As an additional precaution, FreeBSD 2.1.6 is no longer
 	  available from the FTP distribution sites. You can 
 	  read more about the problem and solution from the
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">
 	  FreeBSD-SA-97:01.setlocale</A> security announcement.
 	  </P></LI>
 
@@ -640,7 +640,7 @@ Information</a></strong> page.</p>
      A snap-of-the-day server has been set up for the most current 
      <A HREF="../releases/snapshots.html">snapshot</a>
      release of FreeBSD 2.2.  Read the 
-     <A HREF="ftp://22gamma.freebsd.org/pub/FreeBSD/README.TXT">README.TXT</A>
+     <A HREF="ftp://22gamma.FreeBSD.org/pub/FreeBSD/README.TXT">README.TXT</A>
      file for more information.
 	  </P></LI>
 
@@ -649,10 +649,10 @@ Information</a></strong> page.</p>
     <H2>January 1997</H2>
     <UL>
       <LI><P><B>25-Jan-1997</B>
-      FreeBSD <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/3.0-970124-SNAP/">
+      FreeBSD <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/3.0-970124-SNAP/">
       3.0-970124-SNAP</A> has been released.
       Please see the 
-      <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/3.0-970124-SNAP/RELNOTES.TXT">
+      <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/3.0-970124-SNAP/RELNOTES.TXT">
       Release Notes</A> for more information.
       </P></LI>
     </UL>
@@ -660,9 +660,9 @@ Information</a></strong> page.</p>
     <H2>December 1996</H2>
     <UL>
       <LI><P><B>24-Dec-1996</B>
-      FreeBSD <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/2.2-BETA">2.2-BETA</A>
+      FreeBSD <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-BETA">2.2-BETA</A>
       has been released. Please see the
-      <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/2.2-BETA/RELNOTES.TXT">
+      <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-BETA/RELNOTES.TXT">
       Release Notes</A> for more information.
       </P></LI>
 
@@ -679,9 +679,9 @@ Information</a></strong> page.</p>
 
 <![ IGNORE [
       <li><p><b>15-Nov-1996</b>
-      FreeBSD <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.1.6-RELEASE">
+      FreeBSD <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.6-RELEASE">
       2.1.6-RELEASE</a> is out.  Please see the <a
-      href="ftp://ftp.freebsd.org/pub/FreeBSD/2.1.6-RELEASE/RELNOTES.TXT">
+      href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.6-RELEASE/RELNOTES.TXT">
       release notes</a> for more information.
 		</P></li>
 ]]>
@@ -694,7 +694,7 @@ Information</a></strong> page.</p>
 		</P></li>
 
       <li><p><b>4-Nov-1996</b>
-      The FreeBSD <a href="http://www.freebsd.org/cgi/cvsweb.cgi">CVS</a>
+      The FreeBSD <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS</a>
       development tree has branched again.  <a href="../releases/">See here</a>
       for more information.
     </P></li>
diff --git a/en/news/press-rel-1.sgml b/en/news/press-rel-1.sgml
index 6c60b3ea6e..465cc62ceb 100644
--- a/en/news/press-rel-1.sgml
+++ b/en/news/press-rel-1.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1999-09-06 07:02:46 $">
+<!ENTITY date "$Date: 1999-12-12 16:24:21 $">
 <!ENTITY title "FreeBSD Press Release: April 22, 1999">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/press-rel-1.sgml,v 1.2 1999/09/06 07:02:46 peter Exp $ -->
 
 <html>
 &header;
@@ -49,8 +49,8 @@ of such Internet powerhouse applications as Yahoo! and U.S. West
 because it is unencumbered by commercial license restrictions and can be
 copied and modified freely.</p>
 
-<p>For more information on FreeBSD, visit <a href="http://www.freebsd.org/">
-http://www.freebsd.org/</a> and <a href="http://www.cdrom.com/">
+<p>For more information on FreeBSD, visit <a href="http://www.FreeBSD.org/">
+http://www.FreeBSD.org/</a> and <a href="http://www.cdrom.com/">
 http://www.cdrom.com/</a>.  For more information about Manex Visual
 Effects, please visit <a href="http://www.mvfx.com/">http://www.mvfx.com/
 </a>.</p>
diff --git a/en/news/press-rel-2.sgml b/en/news/press-rel-2.sgml
index 9a82520ccf..c15c84713e 100644
--- a/en/news/press-rel-2.sgml
+++ b/en/news/press-rel-2.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1999-09-06 07:02:46 $">
+<!ENTITY date "$Date: 1999-12-12 16:24:21 $">
 <!ENTITY title "FreeBSD Press Release: April 29, 1999">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/press-rel-2.sgml,v 1.2 1999/09/06 07:02:46 peter Exp $ -->
 
 <html>
 &header;
@@ -35,8 +35,8 @@ living example of an evolving document built with SGML tools. The Handbook
 is available on the Internet at:
 </p>
 <ul>
-<li><a href="http://www.freebsd.org/handbook/">http://www.freebsd.org/handbook/</a></li>
-<li><a href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/">ftp://ftp.freebsd.org/pub/FreeBSD/doc/</a></li>
+<li><a href="http://www.FreeBSD.org/handbook/">http://www.FreeBSD.org/handbook/</a></li>
+<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></li>
 </ul>
 
 <p>The FreeBSD Documentation Project is also making available the
@@ -46,8 +46,8 @@ Much of the information in the primer is appropriate to all SGML/XML
 users, and is freely available.  The primer, which is constantly being
 updated by the Documentation Project team, can be found at:</p>
 <ul>
-<li><a href="http://www.freebsd.org/tutorials/primer/">
-http://www.freebsd.org/tutorials/primer/</a></li>
+<li><a href="http://www.FreeBSD.org/tutorials/primer/">
+http://www.FreeBSD.org/tutorials/primer/</a></li>
 </ul>
 
 <h3>Features of the Document Project SGML/XML System include:</h3>
@@ -73,7 +73,7 @@ FreeBSD ports system.</li>
 LinuxDoc DTD to the DocBook DTD, and has been providing feedback to
 the DocBook maintainers regarding new features and possible
 implementations for the past year.  For more information about the
-FreeBSD Documentation Project, please contact the freebsd-doc@freebsd.org
+FreeBSD Documentation Project, please contact the freebsd-doc@FreeBSD.org
 mailing list.</p>
 
 <p>The FreeBSD operating system is available on the Internet from the
@@ -81,7 +81,7 @@ master FreeBSD website and from various mirror systems around the
 world, and it can also be obtained on convenient CDROMs from Walnut
 Creek CDROM. Information on all of these options is available through:</p>
 <ul>
-<li><a href="http://www.freebsd.org/">http://www.freebsd.org/</a></li>
+<li><a href="http://www.FreeBSD.org/">http://www.FreeBSD.org/</a></li>
 <li><a href="http://www.cdrom.com/">http://www.cdrom.com/</a></li>
 </ul>
 
diff --git a/en/news/press-rel-3.sgml b/en/news/press-rel-3.sgml
index dadff3e659..c8b53ecdf1 100644
--- a/en/news/press-rel-3.sgml
+++ b/en/news/press-rel-3.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1999-09-06 07:02:46 $">
+<!ENTITY date "$Date: 1999-12-12 16:24:21 $">
 <!ENTITY title "FreeBSD Press Release: June 7, 1999">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/press-rel-3.sgml,v 1.2 1999/09/06 07:02:46 peter Exp $ -->
 
 <html>
 &header;
@@ -72,9 +72,9 @@ hassles endemic to proprietary operating systems and applications.</p>
 The FreeBSD Project<br>
 Concord, California<br>
 925-682-7859<br>
-<a href="mailto:freebsd-questions@freebsd.org">
-freebsd-questions@freebsd.org</a><br>
-<a href="http://Www.freebsd.org">http://www.freebsd.org</a><br>
+<a href="mailto:freebsd-questions@FreeBSD.org">
+freebsd-questions@FreeBSD.org</a><br>
+<a href="http://www.FreeBSD.org">http://www.FreeBSD.org</a><br>
 </p>
 
 <p>
diff --git a/en/news/press.sgml b/en/news/press.sgml
index 72d6989f7e..2c993b4ebe 100644
--- a/en/news/press.sgml
+++ b/en/news/press.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/news/press.sgml,v 1.120 1999/11/22 08:40:50 jkoshy Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/press.sgml,v 1.121 1999/12/08 09:55:55 jkoshy Exp $">
 <!ENTITY title "FreeBSD in the Press">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/en/news/press.sgml,v 1.120 1999/11/22 08:40:50 jkoshy Exp $ -->
+<!-- $FreeBSD: www/en/news/press.sgml,v 1.121 1999/12/08 09:55:55 jkoshy Exp $ -->
 
 <html>
 &header;
@@ -47,7 +47,7 @@ If you miss an entry please send the URL to
     by Andrew Leonard<br>
     Discusses <a href="http://www.redhat.com/">RedHat</a>'s acquisition of 
     <a href="http://www.cygnus.com/">Cygnus</a>, quotes 
-    <a href="mailto:jkh@freebsd.org">Jordan Hubbard</a> at length, and 
+    <a href="mailto:jkh@FreeBSD.org">Jordan Hubbard</a> at length, and 
     mentions FreeBSD.
     </p></li>
 
@@ -296,7 +296,7 @@ If you miss an entry please send the URL to
     Embed Together: The Case For BSD In Network Appliances</a><br>
     by Kevin Rose and Charles Davidson<br>
     Underlines the advantages of BSD for the embedded device market.
-    Mentions <a href="http://www.freebsd.org/~picobsd/">picoBSD</a>.
+    Mentions <a href="http://www.FreeBSD.org/~picobsd/">picoBSD</a>.
     </p></li>
 
     </ul>
@@ -455,9 +455,9 @@ If you miss an entry please send the URL to
     and Windows NT.
     </p></li>
 
-    <li><p><b><a href="http://advocacy.freebsd.org/">FreeBSD Advocacy</a>
+    <li><p><b><a href="http://advocacy.FreeBSD.org/">FreeBSD Advocacy</a>
     29 April 1999</b><br>
-    <a href="http://advocacy.freebsd.org/stories/pr_xml.html">
+    <a href="http://advocacy.FreeBSD.org/stories/pr_xml.html">
     XML: Complete XML Development System Integrated with FreeBSD</a><br>
     by Jordan Hubbard<br>
     Included with FreeBSD 3.1 is a complete, integrated SGML/XML 
@@ -474,9 +474,9 @@ If you miss an entry please send the URL to
     Inktomi's carrier-class network cache platform.
     </p></li>
 
-    <li><p><b><a href="http://advocacy.freebsd.org/">FreeBSD Advocacy</a>
+    <li><p><b><a href="http://advocacy.FreeBSD.org/">FreeBSD Advocacy</a>
     22 April 1999</b><br>
-    <a href="http://advocacy.freebsd.org/stories/pr_matrix.html">
+    <a href="http://advocacy.FreeBSD.org/stories/pr_matrix.html">
     The Matrix: FreeBSD Used to Generate Special Effects</a><br>
     by Jordan Hubbard<br>
     Dual-Processor FreeBSD systems were used to generate a large 
@@ -654,7 +654,7 @@ If you miss an entry please send the URL to
     Nature Web Matters: Internet tomography</a><br>
     by K.C. Claffy, Tracie Monk &amp; Daniel McRobb, UCSD/CAIDA, USA.<br>
     The article describes a network management tool built on FreeBSD
-    that has even used network connections to www.freebsd.org for
+    that has even used network connections to www.FreeBSD.org for
     performing network research.
     </p></li>
 
@@ -783,9 +783,9 @@ If you miss an entry please send the URL to
     select and poll</a><br>
     by Sean Eric Fagan<br>
     On how to use FreeBSD's
-    <tt><a href="http://www.freebsd.org/cgi/man.cgi?select">select(2)</a></tt>
+    <tt><a href="http://www.FreeBSD.org/cgi/man.cgi?select">select(2)</a></tt>
     and
-    <tt><a href="http://www.freebsd.org/cgi/man.cgi?poll">poll(2)</a></tt>
+    <tt><a href="http://www.FreeBSD.org/cgi/man.cgi?poll">poll(2)</a></tt>
     system calls.
     </p></li>
 
diff --git a/en/news/qnewsletter-1-1.sgml b/en/news/qnewsletter-1-1.sgml
index dfd37402c6..617d55c968 100644
--- a/en/news/qnewsletter-1-1.sgml
+++ b/en/news/qnewsletter-1-1.sgml
@@ -10,7 +10,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-1.sgml,v 1.9 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -26,7 +26,7 @@
   June 15-19, New Orleans, Louisiana</li>
 
 <li><b>Download the Published FreeBSD News Letter Volume #2</b>:
-  <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf">ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf</A></li>
+  <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf</A></li>
 
 <li><b>Web Masters</b>:<br>
   Check out this article on balancing Webserver traffic:
@@ -40,7 +40,7 @@
 <li><b>Alpha Porting Project</b>:<br>
  There seems to be quite a bit of recent activity on this project.
  Developers are being actively sought.  
- Join the alpha@freebsd.org mailing list. 
+ Join the alpha@FreeBSD.org mailing list. 
  PALCode and other Alpha Documentation can be found at:
  <a href="ftp://ftp.digital.com/pub/Digital/info/semiconductor/literature/dsc-library.html">ftp://ftp.digital.com/pub/Digital/info/semiconductor/literature/dsc-library.html</a></li>
 
@@ -52,7 +52,7 @@
 
 <li><b>Graphics/Design</b>:<br>
   Check out the 'Blender' package from Neo-Geo
-    <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.6-RELEASE/commerce/3D/Blender/">ftp://ftp.freebsd.org/pub/FreeBSD/2.2.6-RELEASE/commerce/3D/Blender/</A></li>
+    <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.6-RELEASE/commerce/3D/Blender/">ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.6-RELEASE/commerce/3D/Blender/</A></li>
 
 <li><b>System Administration</b>:<br>
   A Web Based FreeBSD System Administration Tool is available.
diff --git a/en/news/qnewsletter-1-2.sgml b/en/news/qnewsletter-1-2.sgml
index 445e7e10ab..bb705df422 100644
--- a/en/news/qnewsletter-1-2.sgml
+++ b/en/news/qnewsletter-1-2.sgml
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-2.sgml,v 1.6 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -22,14 +22,14 @@
 <li><b>General News:</b>
   Attention CVSup users and mirror site administrators.  If you have not
   already done so, you need to upgrade to release 15.4 of CVSup.
-  CVSup is available from <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/">ftp://ftp.freebsd.org/pub/FreeBSD/developmen/CVSup/</A></li>
+  CVSup is available from <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/">ftp://ftp.FreeBSD.org/pub/FreeBSD/developmen/CVSup/</A></li>
 
 <li><b>Download the Published FreeBSD News Letter Volume #2</b>:
-  <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf">ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf</A></li>
+  <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf</A></li>
 
 <li><b>IP Bandwith:</b>
   ipltd - IP traffic bandwidth shaping/limiting daemon.
-  You can find it in <A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/incoming/ipltd_v2.01.tgz">ftp://ftp.freebsd.org/pub/FreeBSD/incoming/ipltd_v2.01.tgz</A></li>
+  You can find it in <A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/ipltd_v2.01.tgz">ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/ipltd_v2.01.tgz</A></li>
 
 <li><b>Freebsd-Advocacy:</b>
   Check your local University Bookstore, most have patron
@@ -58,7 +58,7 @@ Token Management Extensions in the FreeBSD Kernel
     <A HREF="http://www.watson.org/fbsd-hardening/tokens/">http://www.watson.org/fbsd-hardening/tokens/</A></li>   
 
 <li><b>FreeBSD Desktop Contest!</b>
-  <A HREF="http://www.freebsd.org/~xcontest/">http://www.freebsd.org/~xcontest</A>  Win Fabulous Prizes!</li>
+  <A HREF="http://www.FreeBSD.org/~xcontest/">http://www.FreeBSD.org/~xcontest</A>  Win Fabulous Prizes!</li>
 
 <li><b>Coda distributed file system version 4.6.0 now available</b>
   Coda is an advanced experimental distributed file system with features
diff --git a/en/news/qnewsletter-1-3.sgml b/en/news/qnewsletter-1-3.sgml
index 3c35d969eb..be494350e2 100644
--- a/en/news/qnewsletter-1-3.sgml
+++ b/en/news/qnewsletter-1-3.sgml
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-3.sgml,v 1.7 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -46,7 +46,7 @@ Announcing CVSup 15.4.2 (This is new since last announcement).
 <p></p></li>
 
 <li><b>FreeBSD Desktop Contest!</b>
-  <A HREF="http://www.freebsd.org/~xcontest/">http://www.freebsd.org/~xcontest</A>  Win Fabulous Prizes!
+  <A HREF="http://www.FreeBSD.org/~xcontest/">http://www.FreeBSD.org/~xcontest</A>  Win Fabulous Prizes!
 <p></p></li>
 
 <li><b>Commercial FreeBSD Products:</b>
@@ -65,7 +65,7 @@ Announcing CVSup 15.4.2 (This is new since last announcement).
   <p>
 
   Manual de instalacion de FreeBSD
-  <A HREF="http://www.es.freebsd.org/es/docs/instalacion/index.htm">http://www.es.freebsd.org/es/docs/instalacion/index.htm</A>
+  <A HREF="http://www.es.FreeBSD.org/es/docs/instalacion/index.htm">http://www.es.FreeBSD.org/es/docs/instalacion/index.htm</A>
 <p></p></li>
 
 <li><b>FreeBSD Sparc Porting Project:</b>
@@ -76,7 +76,7 @@ Announcing CVSup 15.4.2 (This is new since last announcement).
 <p></p></li>
 
 <li><b>FreeBSD Alpha Porting Project:</b>
-  <A HREF="../alpha/alpha.html">http://www.freebsd.org/alpha/alpha.html</A>
+  <A HREF="../alpha/alpha.html">http://www.FreeBSD.org/alpha/alpha.html</A>
 <p></p></li>
 
 <li><b>FreeBSD Software RAID:</b>
diff --git a/en/news/qnewsletter-1-4.sgml b/en/news/qnewsletter-1-4.sgml
index 10e30ef083..0894bc8f43 100644
--- a/en/news/qnewsletter-1-4.sgml
+++ b/en/news/qnewsletter-1-4.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/news/qnewsletter-1-4.sgml,v 1.7 1999/09/06 07:02:47 peter Exp $">
 <!ENTITY volume "1">
 <!ENTITY issue "4">
 <!ENTITY month "Aug">
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-4.sgml,v 1.7 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -38,9 +38,9 @@
 
 <li><b>PicoBSD</b>:
    PicoBSD 0.4 is out!
-     <A HREF="http://www.freebsd.org/~picobsd/">http://www.freebsd.org/~picobsd/</A>
+     <A HREF="http://www.FreeBSD.org/~picobsd/">http://www.FreeBSD.org/~picobsd/</A>
     For download:
-     <A HREF="http://www.freebsd.org/~picobsd/picobsd/">http://www.freebsd.org/~picobsd/picobsd/</A>
+     <A HREF="http://www.FreeBSD.org/~picobsd/picobsd/">http://www.FreeBSD.org/~picobsd/picobsd/</A>
 <p></p></li>
 
 
@@ -58,7 +58,7 @@
 <li><b>Daemon News: The BSD Ezine</b>
   The BSD camps are building an online magazine.  Sign up to write a column,
   or a single article.
-    <A HREF="http://ezine.freebsd.org/">http://ezine.freebsd.org</A>  
+    <A HREF="http://ezine.FreeBSD.org/">http://ezine.FreeBSD.org</A>  
   Our first Issue prints Sept 1st!!!! Check it out at:
     <A HREF="http://www.daemonnews.org/">http://www.daemonnews.org</A>
 <p></p></li>
diff --git a/en/news/qnewsletter-1-5.sgml b/en/news/qnewsletter-1-5.sgml
index ffadd08dab..05e767feca 100644
--- a/en/news/qnewsletter-1-5.sgml
+++ b/en/news/qnewsletter-1-5.sgml
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-5.sgml,v 1.5 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -38,7 +38,7 @@
   
 <li><b>New FreeBSD JDK release</b>: 
   Download information is available at: 
-    <A HREF="http://www.freebsd.org/java/">http://www.freebsd.org/java</A>
+    <A HREF="http://www.FreeBSD.org/java/">http://www.FreeBSD.org/java</A>
        <p></p></li>
 
 <li><b>Uniform Driver Interface</b>:
@@ -50,14 +50,14 @@
    <p></p></li>
 
 <li><b>RealTek 8139 Ethernet driver</b>: Testers Wanted.
-  <A HREF="http://www.freebsd.org/~wpaul/RealTek/3.0/">http://www.freebsd.org/~wpaul/RealTek/3.0</A>       source for FreeBSD 3.0
-  <A HREF="http://www.freebsd.org/~wpaul/RealTek/2.2/">http://www.freebsd.org/~wpaul/RealTek/2.2</A>       source for FreeBSD 2.2.x 
+  <A HREF="http://www.FreeBSD.org/~wpaul/RealTek/3.0/">http://www.FreeBSD.org/~wpaul/RealTek/3.0</A>       source for FreeBSD 3.0
+  <A HREF="http://www.FreeBSD.org/~wpaul/RealTek/2.2/">http://www.FreeBSD.org/~wpaul/RealTek/2.2</A>       source for FreeBSD 2.2.x 
     Reply to: wpaul@skynet.ctr.columbia.edu.
    <p></p></li>
 
 <li><b>ThunderLAN Ethernet driver</b> (popular in Compaq machines) : Testers Wanted.
-  <A HREF="http://www.freebsd.org/~wpaul/ThunderLAN/3.0/">http://www.freebsd.org/~wpaul/ThunderLAN/3.0</A>    source for FreeBSD 3.0
-  <A HREF="http://www.freebsd.org/~wpaul/ThunderLAN/2.2/">http://www.freebsd.org/~wpaul/ThunderLAN/2.2</A>    source for FreeBSD 2.2.x
+  <A HREF="http://www.FreeBSD.org/~wpaul/ThunderLAN/3.0/">http://www.FreeBSD.org/~wpaul/ThunderLAN/3.0</A>    source for FreeBSD 3.0
+  <A HREF="http://www.FreeBSD.org/~wpaul/ThunderLAN/2.2/">http://www.FreeBSD.org/~wpaul/ThunderLAN/2.2</A>    source for FreeBSD 2.2.x
     Reply to: wpaul@skynet.ctr.columbia.edu.
    <p></p></li>
 
diff --git a/en/news/qnewsletter-1-6.sgml b/en/news/qnewsletter-1-6.sgml
index 5dfa2d33c8..fd819c2136 100644
--- a/en/news/qnewsletter-1-6.sgml
+++ b/en/news/qnewsletter-1-6.sgml
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-6.sgml,v 1.4 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -25,7 +25,7 @@
  The current stable release is 2.2.7-RELEASE, with FreeBSD 2.2.8 due
     for release November 30.  <p></p></li>
 
-<li><b>FreeBSD in the News</b>: 24-Oct-98 ftp.freebsd.org (aka
+<li><b>FreeBSD in the News</b>: 24-Oct-98 ftp.FreeBSD.org (aka
   ftp.cdrom.com), a P6/200 with 1GB of RAM and half a TB of RAID-5
   storage, served up 724GB of data--a new one day record. See the
   previous record at: <A
diff --git a/en/news/qnewsletter-1-7.sgml b/en/news/qnewsletter-1-7.sgml
index 7b3859bb72..8400beae7b 100644
--- a/en/news/qnewsletter-1-7.sgml
+++ b/en/news/qnewsletter-1-7.sgml
@@ -11,7 +11,7 @@
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/qnewsletter-1-7.sgml,v 1.3 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
 &header;
@@ -48,7 +48,7 @@
     <p></p></li>
 
 <li><b>FreeBSD JDK 1.1.7</b> Released
-  <A HREF="http://www.freebsd.org/java/">http://www.freebsd.org/java/</A>
+  <A HREF="http://www.FreeBSD.org/java/">http://www.FreeBSD.org/java/</A>
     <p></p></li>
 
 <li>Dont forget to read the lastest issue of the <b>Daemon News</b>.
diff --git a/en/news/qnewsletter.sgml b/en/news/qnewsletter.sgml
index 108a8c2343..a1a9636479 100644
--- a/en/news/qnewsletter.sgml
+++ b/en/news/qnewsletter.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/news/qnewsletter.sgml,v 1.14 1999/09/22 08:17:34 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/qnewsletter.sgml,v 1.15 1999/09/26 00:32:44 wosch Exp $">
 <!ENTITY title "FreeBSD Really-Quick(TM) NewsLetter">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/en/news/qnewsletter.sgml,v 1.14 1999/09/22 08:17:34 wosch Exp $ -->
+<!-- $FreeBSD: www/en/news/qnewsletter.sgml,v 1.15 1999/09/26 00:32:44 wosch Exp $ -->
 
 <html>
 &header;
@@ -18,9 +18,9 @@ FreeBSD Really-Quick(TM) NewsLetter. Things Happening in FreeBSD.
 <a name="1999"></a>
 <h2>1999</h2>
 <ul>
-  <li><b>Sep</b> <a href="http://docs.freebsd.org/cgi/mid.cgi?Pine.BSF.4.10.9909212219200.9410-100000">September 1999</a></li>
-  <li><b>Jun</b> <a href="http://docs.freebsd.org/cgi/mid.cgi?Pine.BSF.4.10.9907021037450.5808-100000">May - June</a></li>
-  <li><b>Apr</b> <a href="http://docs.freebsd.org/cgi/mid.cgi?Pine.BSF.4.10.9904180324030.24935-100000">March - April</a></li>
+  <li><b>Sep</b> <a href="http://docs.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.10.9909212219200.9410-100000">September 1999</a></li>
+  <li><b>Jun</b> <a href="http://docs.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.10.9907021037450.5808-100000">May - June</a></li>
+  <li><b>Apr</b> <a href="http://docs.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.10.9904180324030.24935-100000">March - April</a></li>
   <li><b>Feb</b> <a href="qnewsletter-2-2.html">Volume #2 Issue #2</a></li>
   <li><b>Jan</b> <a href="qnewsletter-2-1.html">Volume #2 Issue #1</a></li>
 </ul>
diff --git a/en/news/sou1999.sgml b/en/news/sou1999.sgml
index 039233ee21..1f9f78ffe9 100644
--- a/en/news/sou1999.sgml
+++ b/en/news/sou1999.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/news/sou1999.sgml,v 1.2 1999/09/06 07:02:47 peter Exp $">
 <!ENTITY title "FreeBSD State of the Union, 1999">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/news/sou1999.sgml,v 1.2 1999/09/06 07:02:47 peter Exp $ -->
 
 <html>
     &header;
@@ -46,7 +46,7 @@
       implosion, but it would be foolish to continue to rely on a single CD
       product to provide the kinds of subsidies that have been steadily
       oiling the project's gears (we more than doubled the size of the
-      freebsd.org computing cluster, for example, and significantly enlarged
+      FreeBSD.org computing cluster, for example, and significantly enlarged
       our developer equipment grant program in 1998, all things which cost
       $$$).  It's fairly obvious that Walnut Creek CDROM will need to
       increase the number of products it offers if it wishes to remain an
@@ -255,7 +255,7 @@
       AlphaBIOS machine.  1999 may also see the early release of a SPARC
       port, though it's still far too early to say anything more definite
       than that.  Join the <a
-	href="mailto:sparc@freebsd.org">sparc@freebsd.org</a> mailing list if
+	href="mailto:sparc@FreeBSD.org">sparc@FreeBSD.org</a> mailing list if
       you want to follow these efforts.</p>
 
     <p>IPv6 and IPSec were also hotly debated topics in 1998, FreeBSD's
@@ -295,7 +295,7 @@
       FreeBSD as just another shrink-wrap solution from Software,
       Inc. and start treating project members like personal employees.
       Those looking for actual FreeBSD employees should send mail to
-      <a href="mailto:jobs@freebsd.org">jobs@freebsd.org</a> and indicate how
+      <a href="mailto:jobs@FreeBSD.org">jobs@FreeBSD.org</a> and indicate how
       much money they're willing to pay, otherwise don't do it.</p>
     
     <p>I don't mean to come across so harshly here that people don't even
@@ -349,7 +349,7 @@
     <p>The Linux folks do things like that all the time, apparently, whereas
       only a very few die-hard FreeBSD users currently do it now, so why not
       help these people out?  Join the <a
-	href="mailto:advocacy@freebsd.org">advocacy@freebsd.org</a> mailing
+	href="mailto:advocacy@FreeBSD.org">advocacy@FreeBSD.org</a> mailing
       list and discuss your plans there so that others with more enthusiasm
       than ideas can also learn from and perhaps help you with yours.  Write
       short articles for the new advocacy sites like <a
diff --git a/en/news/webchanges.sgml b/en/news/webchanges.sgml
index 84d41d7716..287f7f027e 100644
--- a/en/news/webchanges.sgml
+++ b/en/news/webchanges.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/news/webchanges.sgml,v 1.53 1999/09/06 07:02:47 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/webchanges.sgml,v 1.54 1999/10/31 19:30:35 wosch Exp $">
 <!ENTITY title "Changes at the FreeBSD Web Server">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/en/news/webchanges.sgml,v 1.53 1999/09/06 07:02:47 peter Exp $ -->
+<!-- $FreeBSD: www/en/news/webchanges.sgml,v 1.54 1999/10/31 19:30:35 wosch Exp $ -->
 
 <html>
 &header;
@@ -342,7 +342,7 @@ This page lists user visible changes at the FreeBSD Web Server.
   Add TechWeb article on thin servers.<br>
 
    <a href="../internal/statistic.html">/internal/statistic.html</a> 
-   New record for ftp.freebsd.org FTP traffic.<br>
+   New record for ftp.FreeBSD.org FTP traffic.<br>
   <p></p></li>
 
   <LI><B>25-May-1999</B><BR>
@@ -433,7 +433,7 @@ This page lists user visible changes at the FreeBSD Web Server.
 
   <LI><B>4-May-1999</B><BR>
   <A HREF="press.html">/news/press.html</A> Added: 
-  Press release about ftp.freebsd.org upgrade.<br>
+  Press release about ftp.FreeBSD.org upgrade.<br>
   <p></p></li>
 
   <LI><B>2-May-1999</B><BR>
@@ -809,7 +809,7 @@ This page lists user visible changes at the FreeBSD Web Server.
  <p></p></li>
 
  <li><b>28-Dec-1998</B><br> 
- <a href="http://www.freebsd.org/mail/">http://www.freebsd.org/mail/</a>
+ <a href="http://www.FreeBSD.org/mail/">http://www.FreeBSD.org/mail/</a>
  A new mail index for the FreeBSD mailing lists.<br>
 
  <a href="../news/newsflash.html">/news/newsflash.html</a>
@@ -850,7 +850,7 @@ This page lists user visible changes at the FreeBSD Web Server.
  <p></p></li>
 
  <li><b>18-Dec-1998</B><br> <a
- href="http://www.freebsd.org/cgi/ports.cgi">/cgi/ports.cgi</a>
+ href="http://www.FreeBSD.org/cgi/ports.cgi">/cgi/ports.cgi</a>
  Move the links 'Sources' and 'Package' after 'Description'.<br>
 
  <a href="../news/press.html">/news/press.html</a>
@@ -939,7 +939,7 @@ This page lists user visible changes at the FreeBSD Web Server.
  Update info about Y2K fix in groff.<br>
 
  <a href="../internal/statistic.html">/internal/statistic.html</a> 
- New record for ftp.freebsd.org FTP traffic.<br>
+ New record for ftp.FreeBSD.org FTP traffic.<br>
 
  <a href="../news/press.html">/news/press.html</a> 
  Added: NET News.com November 16, 1998 Ellison plans hardware, bashes
diff --git a/en/projects/mozilla.sgml b/en/projects/mozilla.sgml
index 9fa2fbd268..405c8321a7 100644
--- a/en/projects/mozilla.sgml
+++ b/en/projects/mozilla.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/projects/mozilla.sgml,v 1.9 1999/09/06 07:02:49 peter Exp $">
 <!ENTITY title 'FreeBSD Mozilla Group'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/projects/mozilla.sgml,v 1.9 1999/09/06 07:02:49 peter Exp $ -->
 
 <html>
 &header;
@@ -25,10 +25,10 @@
 
     <dl>
     <!--
-      <dt><a href="http://www.freebsd.org/cgi/cvsweb.cgi?cvsroot=mozilla">WEB Interface</a></dt>
+      <dt><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi?cvsroot=mozilla">WEB Interface</a></dt>
 
       <dd>CVSweb provides a web-based interface for viewing the <a
-        href="http://www.freebsd.org/cgi/cvsweb.cgi">CVS repository</a>,
+        href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS repository</a>,
         being able to select and compare specific revisions of the various
         files within it.</dd>
 	-->
@@ -39,8 +39,8 @@
       repository, either for the CVS bits themselves (for those wishing to
       keep a local repository) or for a "checked out" version, suitable for
       directly building or editing.  Fetch the CVSup binaries from
-      <a href="ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/">
-      ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/</a> and use a supfile
+      <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/">
+      ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/</a> and use a supfile
       which looks something like this:
       <pre>
 *default prefix=/usr/src/mozilla base=/usr/src/mozilla host=mozilla.FreeBSD.org release=cvs delete compress use-rel-suffix tag=.
@@ -55,18 +55,18 @@ cvs-mozilla
       Mozilla repository using the standard <tt>cvs(1)</tt> commands.
       Simply set your <em>CVSROOT</em> environment variable to point to:
       <pre>
-      anoncvs@mozilla.freebsd.org:/mozilla
+      anoncvs@mozilla.FreeBSD.org:/mozilla
       </pre>
       <p>And you can then use <tt>cvs(1)</tt> for doing read-only operations
       on the Mozilla CVS repository.</dd>
 
-      <dt><a href="mailto:freebsd-mozilla@freebsd.org">freebsd-mozilla</a></dt>
+      <dt><a href="mailto:freebsd-mozilla@FreeBSD.org">freebsd-mozilla</a></dt>
 
       <dd>The FreeBSD-mozilla mailing list is provided for developers and
       users of the FreeBSD mozilla port to discuss issues relating to building,
       using and managing the mozilla sources and any FreeBSD-specific changes
       to them.  To subscribe, send mail to <a
-      href="mailto:majordomo@freebsd.org">majordomo@freebsd.org</a> and
+      href="mailto:majordomo@FreeBSD.org">majordomo@FreeBSD.org</a> and
       say <em>subscribe freebsd-mozilla</em> in the body of your message.</dd>
 
     </dl>
diff --git a/en/projects/newbies.sgml b/en/projects/newbies.sgml
index 92c2bddfc6..fecce5c249 100644
--- a/en/projects/newbies.sgml
+++ b/en/projects/newbies.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.10 1999/09/06 07:02:49 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.11 1999/09/23 08:53:49 wosch Exp $">
 <!ENTITY title 'Resources for newbies'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/projects/newbies.sgml,v 1.10 1999/09/06 07:02:49 peter Exp $ -->
+<!-- $FreeBSD: www/en/projects/newbies.sgml,v 1.11 1999/09/23 08:53:49 wosch Exp $ -->
 
 <html>
     &header;
@@ -12,7 +12,7 @@
     <p>The following resources are some of those which FreeBSD
       newbies have found most helpful when learning to use FreeBSD.
       Please send corrections and additions to
-      <a href="mailto:freebsd-newbies@freebsd.org">FreeBSD-Newbies@FreeBSD.org</a>.</p>
+      <a href="mailto:freebsd-newbies@FreeBSD.org">FreeBSD-Newbies@FreeBSD.org</a>.</p>
 
     <ul>
       <li><a href="#web-site">Using the FreeBSD web site</a></li>
@@ -99,7 +99,7 @@
       
       <li><p>Join the FreeBSD-Questions mailing list to see the questions you
 	  were too afraid to ask, and their answers. Subscribe by sending mail
-	  to <a href="mailto:majordomo@freebsd.org">majordomo@freebsd.org</a>
+	  to <a href="mailto:majordomo@FreeBSD.org">majordomo@FreeBSD.org</a>
 	  with "subscribe freebsd-questions" on its own in the message body
 	  (the subject doesn't matter). You can look up old questions and
 	  answers via the <a href="../search/search.html#mailinglists">search</a>
@@ -223,7 +223,7 @@
      share, either computer related or not, or just want to meet new
      newbies and make them feel welcome. There's always people around
      who help others simply because they like to. Write to
-     <a href="mailto:freebsd-newbies@freebsd.org">FreeBSD Newbies</a>
+     <a href="mailto:freebsd-newbies@FreeBSD.org">FreeBSD Newbies</a>
      for more information.</p>
 
     <p>Friends who run FreeBSD are a great resource. No book can replace
@@ -246,7 +246,7 @@
       <a href="http://www.welearn.com.au/freebsd/newbies/">FreeBSD-Newbies</a>
       mailing list for non-technical discussions about matters of interest
       to newbies. Another mailing list,
-      <a href="mailto:questions@freebsd.org">FreeBSD-Questions</a>,
+      <a href="mailto:questions@FreeBSD.org">FreeBSD-Questions</a>,
       answers our questions about using FreeBSD.</p>
     
       &footer;
diff --git a/en/projects/projects.sgml b/en/projects/projects.sgml
index 9a85dc3c9d..5af349b4da 100644
--- a/en/projects/projects.sgml
+++ b/en/projects/projects.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/projects.sgml,v 1.78 1999/11/22 19:19:19 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/projects.sgml,v 1.79 1999/12/09 21:39:39 wosch Exp $">
 <!ENTITY title "FreeBSD Development Projects">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
@@ -50,7 +50,7 @@ description (3-10 lines) to
       <li><a name="retail" href="http://www.bafug.org/Retail.html">Retail Outlets for FreeBSD</a>
 	is a list of worldwide retailers where FreeBSD can be purchased.</li>
 
-      <li><a name="securityhowto" href="http://www.freebsd.org/~jkb/howto.html">
+      <li><a name="securityhowto" href="http://www.FreeBSD.org/~jkb/howto.html">
 	FreeBSD Security How-To</a>
 	FreeBSD is a very secure operating system. Since source code
 	is freely available, the OS is constantly going through the
@@ -96,7 +96,7 @@ description (3-10 lines) to
 	and discusses how the two operating systems can cooperate,
 	e.g. by sharing swap space.</li>
 
-    <li><a href="http://www.freebsd.org/~rpratt/227/index.html">
+    <li><a href="http://www.FreeBSD.org/~rpratt/227/index.html">
 	Install Preview for FreeBSD 2.2.7</a>
 	This is a guide illustrating the FreeBSD install program for 
 	those new to unix and/or FreeBSD.</li>
@@ -215,7 +215,7 @@ description (3-10 lines) to
 <a name="applications"></a>
 <h3>Applications</h3>
     <ul>
-      <li><a name="java" href="http://www.freebsd.org/java/">Java on FreeBSD</a>
+      <li><a name="java" href="http://www.FreeBSD.org/java/">Java on FreeBSD</a>
 	This contains information on where to obtain the latest JDK for
 	FreeBSD, how to install and run it, and a list of java software that
 	you may find interesting.  Please note that the JDK is unsupported on
@@ -226,7 +226,7 @@ description (3-10 lines) to
 	the FreeBSD world by providing centralized resources such as a CVS
 	repository, a mailing list, and other tools for development.</li>
 
-      <li><a name="multimedia" href="http://www.freebsd.org/~faulkner/multimedia/mm.html">MultiMedia</a>
+      <li><a name="multimedia" href="http://www.FreeBSD.org/~faulkner/multimedia/mm.html">MultiMedia</a>
 	A resource of links to information and software pertaining to the world
 	of multimedia in the UNIX world.</li>
 
@@ -236,7 +236,7 @@ description (3-10 lines) to
 	A list of current ports is available along with a search mechanism
 	to see if a specific application exists in the Ports Collection.</li>
 
-      <li><a href="http://www.freebsd.org/~fenner/portsurvey/">FreeBSD Ports distfiles survey</a>
+      <li><a href="http://www.FreeBSD.org/~fenner/portsurvey/">FreeBSD Ports distfiles survey</a>
 	is a list which checks the Ports Collection for unfetchable distfiles
 	and provides a summary for each port.</li>
     </ul>
@@ -264,10 +264,10 @@ description (3-10 lines) to
 	operation, good security model, server replication and persistent
 	client side caching.
 
-      <li><a name="devfs" href="http://www.freebsd.org/~julian/">DEVFS</a></li>
-      <li><a href="http://www.freebsd.org/~terry/">Mode locking</a></li>
-      <li><a href="http://www.freebsd.org/~terry/">Make the namei interface reflexive</a></li>
-      <li><a href="http://www.freebsd.org/~terry/">NFS client and server locking</a></li>
+      <li><a name="devfs" href="http://www.FreeBSD.org/~julian/">DEVFS</a></li>
+      <li><a href="http://www.FreeBSD.org/~terry/">Mode locking</a></li>
+      <li><a href="http://www.FreeBSD.org/~terry/">Make the namei interface reflexive</a></li>
+      <li><a href="http://www.FreeBSD.org/~terry/">NFS client and server locking</a></li>
       <li><a href="http://iclub.nsu.ru/~semen/ntfs/">NTFS Driver for FreeBSD</a>
 	This driver allows Windows NTFS partitions to be mounted by FreeBSD.
 	Currently NTFS partitions can only be accessed in read-only mode, but
@@ -278,7 +278,7 @@ description (3-10 lines) to
 	use reliable memory.  Reliable memory enables dramatic
 	improvements in reliability and performance.</li>
 
-       <li><a name="softupdate" href="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/sys/contrib/softupdates/README"> Soft Updates:</a>
+       <li><a name="softupdate" href="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/sys/contrib/softupdates/README"> Soft Updates:</a>
 	A Solution to the Metadata Update Problem in File Systems</li>
 
       <li><a name="tcfs" href="http://tcfs.dia.unisa.it/">TCFS</a>
@@ -355,14 +355,14 @@ description (3-10 lines) to
       <li><a name="DHCP" href="http://home.san.rr.com/freebsd/dhcp.html">DHCP configuration</a>
 	How to set up DHCP on FreeBSD systems for use with cable modems, etc.</li>
 
-      <li><a href="http://www.freebsd.org/~jraynard/source/">Handling more than 32 signals</a></li>
-      <li><a href="http://www.freebsd.org/~terry/">Working LDAP for FreeBSD</a></li>
+      <li><a href="http://www.FreeBSD.org/~jraynard/source/">Handling more than 32 signals</a></li>
+      <li><a href="http://www.FreeBSD.org/~terry/">Working LDAP for FreeBSD</a></li>
 
-      <li><a name="SMP" href="http://www.freebsd.org/~fsmp/SMP/SMP.html">Symmetric MultiProcessor Support</a>
+      <li><a name="SMP" href="http://www.FreeBSD.org/~fsmp/SMP/SMP.html">Symmetric MultiProcessor Support</a>
 	Documentation and other information about taking advantage of multiple
 	processors under FreeBSD.</li>
-      <li><a href="http://www.freebsd.org/~terry/">A validation suite for testing for kernel memory leaks</a></li>
-      <li><a name="spy" href="http://www.freebsd.org/~abial/spy/">SPY</a>
+      <li><a href="http://www.FreeBSD.org/~terry/">A validation suite for testing for kernel memory leaks</a></li>
+      <li><a name="spy" href="http://www.FreeBSD.org/~abial/spy/">SPY</a>
       allows you to monitor and/or selectively block syscalls on your
       system. It could be used either as a safety monitoring device, policy
       enforcement, or debugging tool.
@@ -381,7 +381,7 @@ hardware. This is a list of drivers currently under
 development that could stand to gain from time or resources
 you may have to offer.
 
-      <li><a name="deviceframework" href="http://www.freebsd.org/~dfr/devices.html">
+      <li><a name="deviceframework" href="http://www.FreeBSD.org/~dfr/devices.html">
 	A New Device Framework for FreeBSD</a></li>
 
       <li><a name="atm" href="http://www.ccrc.wustl.edu/pub/chuck/tech/bsdatm/bsdatm.html"> BSD ATM: implementation of ATM internetworking under 4.4BSD</a>:
@@ -401,7 +401,7 @@ you may have to offer.
 	How to create a NTP stratum 1 server with state of the art
 	performance.</li>
 
-      <li><a name="homeauto" href="http://www.freebsd.org/~fsmp/HomeAuto/HomeAuto.html">Home Automation</a>
+      <li><a name="homeauto" href="http://www.FreeBSD.org/~fsmp/HomeAuto/HomeAuto.html">Home Automation</a>
 	with FreeBSD such as appliance controllers, infra-red controllers,
 	automated telephone systems, and more.</li>
 
@@ -414,7 +414,7 @@ you may have to offer.
 	telephony, ISDN4BSD can answer incoming phone calls like an answering
 	machine.</li>
 
-      <li><a name="cam" href="http://www.freebsd.org/~gibbs/">CAM: New SCSI layer for FreeBSD</a>
+      <li><a name="cam" href="http://www.FreeBSD.org/~gibbs/">CAM: New SCSI layer for FreeBSD</a>
 	Details about what the new CAM SCSI layer is, and how it works.</li>
 
       <li><a name="tokenring" href="http://www.jurai.net/~winter/tr/tr.html">The FreeBSD Token-Ring Project</a>
@@ -444,7 +444,7 @@ you may have to offer.
 	mailing list information, the hardware used, and other Alpha
 	projects.</li>
 
-      <li><a name="sparc" href="http://www.freebsd.org/~obrien/freebsd-sparc/">Porting FreeBSD to Sparc systems</a>
+      <li><a name="sparc" href="http://www.FreeBSD.org/~obrien/freebsd-sparc/">Porting FreeBSD to Sparc systems</a>
 	Contains information on the FreeBSD Sparc port including a FAQ,
 	some early boot code, information on Sparc processors and motherboards,
 	and other Sparc projects.</li>
@@ -470,7 +470,7 @@ you may have to offer.
 	programs, such as boot loaders or OS-level servers atop a
 	microkernel.</li>
 
-      <li><a name="picobsd" href="http://www.freebsd.org/~picobsd/">Small and embedded FreeBSD (PicoBSD)</a>
+      <li><a name="picobsd" href="http://www.FreeBSD.org/~picobsd/">Small and embedded FreeBSD (PicoBSD)</a>
 	PicoBSD is a one floppy version of FreeBSD which in its different
 	variations allows you to have secure dial-up access, small diskless
 	router, or even a dial-in server.  All of this on only one standard
@@ -510,7 +510,7 @@ you may have to offer.
 	FreeBSD.  It also contains some improvements and bug fixes for the
 	APM BIOS driver.</li>
 
-      <li><a href="http://www.freebsd.org/~jraynard/source/">Replacement of gnu awk with bwk's "one true awk"</a></li>
+      <li><a href="http://www.FreeBSD.org/~jraynard/source/">Replacement of gnu awk with bwk's "one true awk"</a></li>
 
       <li><A name="freebsdxr" HREF="http://lxr.linux.no/freebsd/source">FreeBSD cross reference</A>.
 	A hypertext cross referenced presentation of the FreeBSD kernel
diff --git a/en/publish.sgml b/en/publish.sgml
index 19a789873b..b06525cd3b 100644
--- a/en/publish.sgml
+++ b/en/publish.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/publish.sgml,v 1.30 1999/09/06 07:17:35 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/publish.sgml,v 1.31 1999/10/19 20:19:37 motoyuki Exp $">
 <!ENTITY title "FreeBSD Related Publications">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/publish.sgml,v 1.30 1999/09/06 07:17:35 peter Exp $ -->
+<!-- $FreeBSD: www/en/publish.sgml,v 1.31 1999/10/19 20:19:37 motoyuki Exp $ -->
 
 <html>
     &header;
@@ -27,7 +27,7 @@
     
     Here you'll find the covers of many FreeBSD related publications.  If you
     know of any additional FreeBSD publications/CDROMs let us know, at <a
-      href="mailto:www@freebsd.org">www@freebsd.org</a>, so that they may be
+      href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>, so that they may be
     added to this site.
 
     <p>The <a href="&base;/handbook/">FreeBSD Handbook</a> contains a
@@ -434,7 +434,7 @@
 	<td>This is <a href="http://www.freebsdmall.com/newsletter1/">issue
 	    #1</a> of the FreeBSD Newsletter, published and distributed free
 	  of charge by <a href="http://www.cdrom.com/">Walnut Creek CDROM</a>.
-	  You can <a href="http://www.freebsd.org/register.html">register</a>
+	  You can <a href="http://www.FreeBSD.org/register.html">register</a>
 	  to receive it.  Submit articles/make comments by sending email to
 	  <a href="mailto:newsletter@FreeBSD.ORG">newsletter@FreeBSD.ORG</a>.
 	</td>
@@ -447,7 +447,7 @@
 	<td>This is <a href="http://www.freebsdmall.com/newsletter2/">issue
 	    #2</a> of the FreeBSD Newsletter, published and distributed free
 	  of charge by <a href="http://www.cdrom.com/">Walnut Creek CDROM</a>.
-	  You can <a href="http://www.freebsd.org/register.html">register</a>
+	  You can <a href="http://www.FreeBSD.org/register.html">register</a>
 	  to receive it.  Submit articles/make comments by sending email to
 	  <a href="mailto:newsletter@FreeBSD.ORG">newsletter@FreeBSD.ORG</a>.
 	</td>
@@ -456,7 +456,7 @@
 
     <address><a href="./mailto.html">questions@FreeBSD.ORG</a><br>
       Copyright &copy; 1995-1997 FreeBSD Inc. All rights reserved.<br>
-      $FreeBSD: www/en/publish.sgml,v 1.30 1999/09/06 07:17:35 peter Exp $</address>
+      $FreeBSD: www/en/publish.sgml,v 1.31 1999/10/19 20:19:37 motoyuki Exp $</address>
   </body>
 </html>
 
diff --git a/en/register.sgml b/en/register.sgml
index 3d7fe6fb3b..8f8f50d884 100644
--- a/en/register.sgml
+++ b/en/register.sgml
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/register.sgml,v 1.14 1999/09/06 07:02:37 peter Exp $">
 <!ENTITY title "Register">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/register.sgml,v 1.14 1999/09/06 07:02:37 peter Exp $ -->
 
 <html>
     &header;
 
     <center><font size="4">Register to receive the FreeBSD Newsletter and
-	subscribe to announce@freebsd.org mailing list.</font></center>
+	subscribe to announce@FreeBSD.org mailing list.</font></center>
     
-    <form action="http://www.freebsd.org/cgi/reg.cgi" method="post">
-      <input type="hidden" name="recipient" value="register@freebsd.org"><br>
+    <form action="http://www.FreeBSD.org/cgi/reg.cgi" method="post">
+      <input type="hidden" name="recipient" value="register@FreeBSD.org"><br>
       <input type="hidden" name="version" value="Web-Registration">
 
       <center>
@@ -77,7 +77,7 @@
 
 	  <tr>
 	    <td colspan="4">Subscribe listed email address to the
-	      announce@freebsd.org mailing list?
+	      announce@FreeBSD.org mailing list?
 
 	      <input type="checkbox" name="announce" value="yes"></td>
 	  </tr>
@@ -101,9 +101,9 @@
     </form>
     
     <p>Preview a copy of the newsletter in <a
-	href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/issue2.pdf">Adobe
+	href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">Adobe
 	PDF format</a>.  A <a
-	href="ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/README.TXT">help
+	href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/README.TXT">help
 	file</a> is available to assist you in selecting and using a PDF
       viewer.
       
diff --git a/en/releases/2.0.5R/announce.sgml b/en/releases/2.0.5R/announce.sgml
index 816a498f2f..9d7e9a96be 100644
--- a/en/releases/2.0.5R/announce.sgml
+++ b/en/releases/2.0.5R/announce.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.0.5R/announce.sgml,v 1.4 1999/09/06 07:02:51 peter Exp $">
 <!ENTITY title "FreeBSD 2.0.5 RELEASE Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.0.5R/announce.sgml,v 1.4 1999/09/06 07:02:51 peter Exp $ -->
 
 <html>
 &header;
@@ -52,7 +52,7 @@
     <p>The usual locations:
 
     <ul>
-      <li><a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.0.5-RELEASE">ftp://ftp.freebsd.org/pub/FreeBSD/2.0.5-RELEASE</a>
+      <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.0.5-RELEASE">ftp://ftp.FreeBSD.org/pub/FreeBSD/2.0.5-RELEASE</a>
       <li><a href="ftp://freefall.cdrom.com/pub/FreeBSD/2.0.5-RELEASE">ftp://freefall.cdrom.com/pub/FreeBSD/2.0.5-RELEASE</a>
     </ul>
 
@@ -63,7 +63,7 @@
       for ordering information.
 
     <p>Any feedback should be sent to <a
-      href="mailto:hackers@freebsd.org">hackers@freebsd.org</a>.
+      href="mailto:hackers@FreeBSD.org">hackers@FreeBSD.org</a>.
       I will be leaving the country shortly (about 3 hours :) and
       will try to read my email as often as possible, but for
       quicker replies please send to the mailing list.
@@ -84,7 +84,7 @@
       have gone poking and found a couple of bugs on the
       original boot.flp image. There is now a
       <tt>/pub/FreeBSD/2.0.5-RELEASE/UPDATES</tt> directory on <a
-      href="ftp://ftp.freebsd.org/pub/FreeBSD/2.0.5-RELEASE/UPDATES">ftp.cdrom.com</a>
+      href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.0.5-RELEASE/UPDATES">ftp.cdrom.com</a>
       and <a
       href="ftp://freefall.cdrom.com/pub/FreeBSD/2.0.5-RELEASE/UPDATES">freefall.cdrom.com</a>
       with a version of boot.flp which will fix the following
diff --git a/en/releases/2.0.5R/notes.sgml b/en/releases/2.0.5R/notes.sgml
index 03dd8766b6..8b70f6254e 100644
--- a/en/releases/2.0.5R/notes.sgml
+++ b/en/releases/2.0.5R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.0.5R/notes.sgml,v 1.5 1999/09/06 07:02:51 peter Exp $">
 <!ENTITY title "FreeBSD 2.0.5 ALPHA Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.0.5R/notes.sgml,v 1.5 1999/09/06 07:02:51 peter Exp $ -->
 
 <html>
 &header;
@@ -164,7 +164,7 @@ still functioning disks from mounting.  Hard wiring allows static
 allocation of unit numbers (and hence device names) to scsi devices
 based on SCSI ID and bus.  SCSI configuration occurs in the kernel
 config file.  Samples of the configuration syntax can be found in the
-<a href="http://www.freebsd.org/cgi/man.cgi?scsi(4)">scsi(4)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?scsi(4)">scsi(4)</a>>
 man page or the LINT kernel config file.
 
 Owner:                  Peter Dufault (dufault@hda.com)
@@ -590,7 +590,7 @@ You may obtain FreeBSD in a variety of ways:
 1. FTP/Mail
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the nearest site
@@ -599,7 +599,7 @@ to you netwise.
 If you do not have access to the internet and electronic mail is your
 only recourse, then you may still fetch the files by sending mail to
 `ftpmail@decwrl.dec.com' - putting the keyword "help" in your message
-to get more information on how to fetch files from ftp.freebsd.org.
+to get more information on how to fetch files from ftp.FreeBSD.org.
 Note: This approach will end up sending many *tens of megabytes*
 through the mail, and should only be employed as an absolute LAST
 resort!
diff --git a/en/releases/2.0/notes.sgml b/en/releases/2.0/notes.sgml
index 2a453c4eef..05a9e4ad87 100644
--- a/en/releases/2.0/notes.sgml
+++ b/en/releases/2.0/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.0/notes.sgml,v 1.5 1999/09/06 07:02:51 peter Exp $">
 <!ENTITY title "FreeBSD 2.0 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.0/notes.sgml,v 1.5 1999/09/06 07:02:51 peter Exp $ -->
 
 <html>
 &header;
@@ -123,11 +123,11 @@ Most filesystems are now dynamically loadable on demand, with the
 exception of the UFS family (FFS, LFS, and MFS).  With the exception
 of NFS, all such filesystems can be unloaded when all references are
 unmounted.  To support this functionality, the 
-<a href="http://www.freebsd.org/cgi/man.cgi?getvfsbyname(3)">
+<a href="http://www.FreeBSD.org/cgi/man.cgi?getvfsbyname(3)">
 getvfsbyname(3)</a>
 
 family of functions has been added to the C library and the 
-<a href="http://www.freebsd.org/cgi/man.cgi?lsvfs(1)">lsvfs(1)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?lsvfs(1)">lsvfs(1)</a>
 
 command provides the same information at the shell level.  Be aware of
 the following current restrictions:
@@ -156,7 +156,7 @@ Some of the features new in 2.0 are:
 The second item explains the absence of skey.access in the installed /etc.
 To enable S/Key support, create a file skey.access in /etc and fill it
 according to your needs. See also skey.
-<a href="http://www.freebsd.org/cgi/man.cgi?access(5)">access(5)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?access(5)">access(5)</a>
 and the example in
 /usr/share/examples/etc/skey.access.
 
@@ -235,10 +235,10 @@ Device configuration database
 The kernel now keeps better track of which device drivers are active and
 where the devices are attached; this information is made available to
 user programs via the new 
-<a href="http://www.freebsd.org/cgi/man.cgi?sysctl(3)">sysctl(3)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?sysctl(3)">sysctl(3)</a>
 management interface.  Current
 applications include 
-<a href="http://www.freebsd.org/cgi/man.cgi?lsdev(8)">lsdev(8)</a>,
+<a href="http://www.FreeBSD.org/cgi/man.cgi?lsdev(8)">lsdev(8)</a>,
 which lists the currently configured
 devices.  In the future, we expect to use this code to automatically
 generate a configuration file for you at installation time.
@@ -256,7 +256,7 @@ by reading and writing /dev/kmem.  Many programs have been rewritten to
 use this interface, although many old-style programs still remain.  Some
 variables which were never accessible before are now available through
 the 
-<a href="http://www.freebsd.org/cgi/man.cgi?sysctl(1)">sysctl(1)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?sysctl(1)">sysctl(1)</a>
 program.  In addition to the standard 4.4BSD MIB variables,
 we have added support for YP/NIS domains (kern.domainname), controlling
 the update daemon (kern.update), retrieving the OS release date
diff --git a/en/releases/2.1.5R/announce.sgml b/en/releases/2.1.5R/announce.sgml
index a2937ca9ed..1d6ec6eb08 100644
--- a/en/releases/2.1.5R/announce.sgml
+++ b/en/releases/2.1.5R/announce.sgml
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.5R/announce.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.5 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
 &header;
 
-<p>FreeBSD <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.1.5-RELEASE">
-2.1.5-RELEASE</a> is now available on ftp.freebsd.org and various
+<p>FreeBSD <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.5-RELEASE">
+2.1.5-RELEASE</a> is now available on ftp.FreeBSD.org and various
 FTP mirror sites throughout the world.  It can also be ordered on
 <a href="http://www.cdrom.com/titles/freebsd.html">CD</a> from
 from <a href="http://www.cdrom.com/">Walnut Creek CDROM</a>.</p>
@@ -34,11 +34,11 @@ differently in the future.</p>
 
 <p>The official sources for FreeBSD are available via anonymous FTP from:
 
-	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.freebsd.org</a>.
+	<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</a>.
 
 Or via the WEB at:
 
-	<a href="http://www.freebsd.org/releases/index.html">www.freebsd.org</a>.
+	<a href="http://www.FreeBSD.org/releases/index.html">www.FreeBSD.org</a>.
 
 And on CD-ROM from Walnut Creek CDROM:
 
@@ -59,7 +59,7 @@ following mirror sites. If you choose to obtain FreeBSD via anonymous
 FTP, please try to use a site near you:</p>
 
 <h2>Australia</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@au.freebsd.org">hostmaster@au.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@au.FreeBSD.org">hostmaster@au.FreeBSD.org</a>.
 <ul>
      <li><a href="ftp://ftp.au.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.au.FreeBSD.ORG/pub/FreeBSD</a></li>
      <li><a href="ftp://ftp2.au.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.au.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -68,7 +68,7 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Brazil</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@br.freebsd.org">hostmaster@br.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@br.FreeBSD.org">hostmaster@br.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.br.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.br.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -80,7 +80,7 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Canada</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@ca.freebsd.org">hostmaster@ca.freebsd.org</a>
+        <p>In case of problems, please contact <a href="mailto:hostmaster@ca.FreeBSD.org">hostmaster@ca.FreeBSD.org</a>
 <ul>
 	<li><a href="ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD</a></li>
 </ul>
@@ -93,14 +93,14 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Estonia</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@ee.freebsd.org">hostmaster@ee.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@ee.FreeBSD.org">hostmaster@ee.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.ee.freebsd.ORG/pub/FreeBSD">ftp://ftp.ee.freebsd.ORG/pub/FreeBSD</a></li>
 </ul>
 
 
 <h2>Finland</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@fi.freebsd.org">hostmaster@fi.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@fi.FreeBSD.org">hostmaster@fi.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.fi.freebsd.ORG/pub/FreeBSD">ftp://ftp.fi.freebsd.ORG/pub/FreeBSD</a></li>
 </ul>
@@ -113,7 +113,7 @@ FTP, please try to use a site near you:</p>
 
 
 <h2>Germany</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@de.freebsd.org">hostmaster@de.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@de.FreeBSD.org">hostmaster@de.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.de.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.de.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.de.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.de.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -131,7 +131,7 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Ireland</h2>
-        <p>In case of problems, please contact <a href="mailto:hostmaster@ie.freebsd.org">hostmaster@ie.freebsd.org</a>.
+        <p>In case of problems, please contact <a href="mailto:hostmaster@ie.FreeBSD.org">hostmaster@ie.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.ie.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.ie.FreeBSD.ORG/pub/FreeBSD</a></li>
 </ul>
@@ -148,7 +148,7 @@ FTP, please try to use a site near you:</p>
 
 
 <h2>Japan</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@jp.freebsd.org">hostmaster@jp.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@jp.FreeBSD.org">hostmaster@jp.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.jp.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.jp.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.jp.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.jp.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -159,14 +159,14 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Korea</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@kr.freebsd.org">hostmaster@kr.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@kr.FreeBSD.org">hostmaster@kr.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.kr.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.kr.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.kr.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.kr.FreeBSD.ORG/pub/FreeBSD</a></li>
 </ul>
 
 <h2>Netherlands</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@nl.freebsd.org">hostmaster@nl.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@nl.FreeBSD.org">hostmaster@nl.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.nl.freebsd.ORG/pub/FreeBSD">ftp://ftp.nl.freebsd.ORG/pub/FreeBSD</a></li>
 </ul>
@@ -186,14 +186,14 @@ FTP, please try to use a site near you:</p>
 
 
 <h2>Russia</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@ru.freebsd.org">hostmaster@ru.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@ru.FreeBSD.org">hostmaster@ru.FreeBSD.org</a>.
 <ul>
-	<li><a href="ftp://ftp.ru.freebsd.org/pub/FreeBSD">ftp://ftp.ru.freebsd.org/pub/FreeBSD</a></li>
-	<li><a href="ftp://ftp2.ru.freebsd.org/pub/FreeBSD">ftp://ftp2.ru.freebsd.org/pub/FreeBSD</a></li>
+	<li><a href="ftp://ftp.ru.FreeBSD.org/pub/FreeBSD">ftp://ftp.ru.FreeBSD.org/pub/FreeBSD</a></li>
+	<li><a href="ftp://ftp2.ru.FreeBSD.org/pub/FreeBSD">ftp://ftp2.ru.FreeBSD.org/pub/FreeBSD</a></li>
 </ul>
 
 <h2>South Africa</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@za.freebsd.org">hostmaster@za.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@za.FreeBSD.org">hostmaster@za.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.za.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.za.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -201,13 +201,13 @@ FTP, please try to use a site near you:</p>
 </ul>
 
 <h2>Sweden</h2>
-	<p>In case of problems, please contact the <a href="mailto:hostmaster@se.freebsd.org">hostmaster@se.freebsd.org</a>.
+	<p>In case of problems, please contact the <a href="mailto:hostmaster@se.FreeBSD.org">hostmaster@se.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.se.freebsd.ORG/pub/FreeBSD">ftp://ftp.se.freebsd.ORG/pub/FreeBSD</a></li>
 </ul>
 
 <h2>Taiwan</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@tw.freebsd.org">hostmaster@tw.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@tw.FreeBSD.org">hostmaster@tw.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.tw.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.tw.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.tw.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.tw.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -222,7 +222,7 @@ FTP, please try to use a site near you:</p>
 
 
 <h2>USA</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@freebsd.org">hostmaster@freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@FreeBSD.org">hostmaster@FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.FreeBSD.ORG/pub/FreeBSD">ftp://ftp.FreeBSD.ORG/pub/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.FreeBSD.ORG/pub/FreeBSD">ftp://ftp2.FreeBSD.ORG/pub/FreeBSD</a></li>
@@ -234,7 +234,7 @@ FTP, please try to use a site near you:</p>
 
 
 <h2>UK</h2>
-	<p>In case of problems, please contact <a href="mailto:hostmaster@uk.freebsd.org">hostmaster@uk.freebsd.org</a>.
+	<p>In case of problems, please contact <a href="mailto:hostmaster@uk.FreeBSD.org">hostmaster@uk.FreeBSD.org</a>.
 <ul>
 	<li><a href="ftp://ftp.uk.FreeBSD.ORG/packages/unix/FreeBSD">ftp://ftp.uk.FreeBSD.ORG/packages/unix/FreeBSD</a></li>
 	<li><a href="ftp://ftp2.uk.FreeBSD.ORG/pub/walnut.creek/FreeBSD">ftp://ftp2.uk.FreeBSD.ORG/pub/walnut.creek/FreeBSD</a></li>
diff --git a/en/releases/2.1.5R/notes.sgml b/en/releases/2.1.5R/notes.sgml
index 747a07f902..c3dd5760c4 100644
--- a/en/releases/2.1.5R/notes.sgml
+++ b/en/releases/2.1.5R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.5R/notes.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.5 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.1.5R/notes.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $ -->
 
 <html>
 &header;
@@ -18,7 +18,7 @@
 FreeBSD 2.1.5R is the follow-on release to 2.1R and focuses primarily
 on fixing bugs, closing security holes and conservative enhancements.
 For more information on bleeding-edge development, please see
-http://www.freebsd.org/handbook/current.html.
+http://www.FreeBSD.org/handbook/current.html.
 
 
 1. What's New since 2.1.0-RELEASE?
@@ -50,7 +50,7 @@ Support for the Connectix Quickcam (parallel port camera).
 
 Worm driver - it is now possible to burn CDROMs using the Plasmon or
 HP 4080i CDR drives (see
-<a href="http://www.freebsd.org/cgi/man.cgi?wormcontrol(1)">
+<a href="http://www.FreeBSD.org/cgi/man.cgi?wormcontrol(1)">
 wormcontrol(1)</a>).  NOTE: If your drive
 probes as a CD rather than a WORM, some additional patches may be
 required from -current to get it working for you.  We decided not to
@@ -64,7 +64,7 @@ Various VM system enhancements and more than a few bugs fixed.
 
 A concatenated disk driver for simple types of RAID applications.
 See the man page for 
-<a href="http://www.freebsd.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
 for more information.
 
 Real PCI bus probing (before ISA) and support for various PCI bridges.
@@ -149,14 +149,14 @@ capable browser by saying:
       &lt;browser&gt; file:/usr/share/doc/FAQ/freebsd-faq.html
 
 You can also visit the master (and most frequently updated) copies at
-http://www.freebsd.org.
+http://www.FreeBSD.org.
 
 The export version of FreeBSD does not contain DES code which would
 inhibit its being exported outside the United States.  There is an
 add-on package to the core distribution which contains the programs
 and libraries that normally use DES.  A freely exportable (from
 outside the U.S.)  distribution of DES for our non-U.S. users also
-exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
+exists at ftp://ftp.internat.FreeBSD.org/pub/FreeBSD.
 
 If password security for FreeBSD is all you need and you have no
 requirement for copying encrypted passwords from different hosts
@@ -317,12 +317,12 @@ You may obtain FreeBSD in a variety of ways:
 4.1. FTP/Mail
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
 networking terms) to you.  Additional mirror sites are always welcome!
-Contact admin@freebsd.org for more details if you'd like to become an
+Contact admin@FreeBSD.org for more details if you'd like to become an
 official mirror site.
 
 If you do not have access to the internet and electronic mail is your
diff --git a/en/releases/2.1.6R/announce.sgml b/en/releases/2.1.6R/announce.sgml
index 1e5c171998..01a3371a4c 100644
--- a/en/releases/2.1.6R/announce.sgml
+++ b/en/releases/2.1.6R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.6R/announce.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -15,22 +15,22 @@ announcement</A> regarding FreeBSD 2.1.6</p>
 <blockquote>
 
 <![ IGNORE [
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.1.6-RELEASE">ftp://ftp.freebsd.org/pub/FreeBSD/2.1.6-RELEASE</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.6-RELEASE">ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.6-RELEASE</a>
 ]]>
 
-<a href="security.html">ftp://ftp.freebsd.org/pub/FreeBSD/2.1.6-RELEASE</a>
+<a href="security.html">ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.6-RELEASE</a>
 
 </blockquote>
 
 <p>And shortly from its various mirror sites, a list of which may be
-obtained from:  <a href="&base/handbook/mirrors.html">http://www.freebsd.org/handbook/mirrors.html</a></p>
+obtained from:  <a href="&base/handbook/mirrors.html">http://www.FreeBSD.org/handbook/mirrors.html</a></p>
 
 <p>This release will also be available on CDROM from <a
 href="http://www.cdrom.com/">Walnut Creek CDROM</a>, hopefully
 shipping within the next 4-6 weeks.</p>
 
 <p>Those puzzled by the near-simultaneous release of 2.1.6 and 2.2 need
-also look no further than http://www.freebsd.org/branch.html for the
+also look no further than http://www.FreeBSD.org/branch.html for the
 reasons behind this release schedule.  CDROM subscription customers
 should also see this page for information on Walnut Creek CDROM's
 plans for these releases.</p>
diff --git a/en/releases/2.1.6R/notes.sgml b/en/releases/2.1.6R/notes.sgml
index c30676fddf..074425b197 100644
--- a/en/releases/2.1.6R/notes.sgml
+++ b/en/releases/2.1.6R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.6R/notes.sgml,v 1.4 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.1.6R/notes.sgml,v 1.4 1999/09/06 07:02:52 peter Exp $ -->
 
 <html>
 &header;
@@ -20,7 +20,7 @@ on fixing bugs, closing security holes and making the system easier to
 install than 2.1.5.
 
 For more information on our bleeding-edge development, please see
-http://www.freebsd.org/handbook/current.html.
+http://www.FreeBSD.org/handbook/current.html.
 
 
 1. What's New since 2.1.0-RELEASE?
@@ -58,7 +58,7 @@ Various VM system enhancements and more than a few bugs fixed.
 
 A concatenated disk driver for simple types of RAID applications.
 See the man page for 
-<a href="http://www.freebsd.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
 for more information.
 
 Real PCI bus probing (before ISA) and support for various PCI bridges.
@@ -144,7 +144,7 @@ capable browser by saying:
       &lt;browser> file:/usr/share/doc/FAQ/freebsd-faq.html
 
 You can also visit the master (and most frequently updated) copies at
-http://www.freebsd.org.
+http://www.FreeBSD.org.
 
 The core of FreeBSD does not contain DES code which would inhibit its
 being exported outside the United States.  There is an add-on package
@@ -152,7 +152,7 @@ to the core distribution, for use only in the United States, that
 contains the programs that normally use DES.  The auxiliary packages
 provided separately can be used by anyone.  A freely (from outside the
 U.S.) exportable distribution of DES for our non-U.S. users also
-exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
+exists at ftp://ftp.internat.FreeBSD.org/pub/FreeBSD.
 
 If password security for FreeBSD is all you need and you have no
 requirement for copying encrypted passwords from different hosts
@@ -316,12 +316,12 @@ You may obtain FreeBSD in a variety of ways:
 4.1. FTP/Mail
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
 networking terms) to you.  Additional mirror sites are always welcome!
-Contact admin@freebsd.org for more details if you'd like to become an
+Contact admin@FreeBSD.org for more details if you'd like to become an
 official mirror site.
 
 If you do not have access to the internet and electronic mail is your
diff --git a/en/releases/2.1.6R/security.sgml b/en/releases/2.1.6R/security.sgml
index 1c8b2f57bd..ee3458cc62 100644
--- a/en/releases/2.1.6R/security.sgml
+++ b/en/releases/2.1.6R/security.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.6R/security.sgml,v 1.3 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Security Update">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -18,7 +18,7 @@
 	  </P> 
 
 	  <P>You can read more about the problem and solution from the
-<A HREF="ftp://freebsd.org/pub/CERT/advisories/FreeBSD-SA-97:01.setlocale">
+<A HREF="ftp://FreeBSD.org/pub/CERT/advisories/FreeBSD-SA-97:01.setlocale">
 	  FreeBSD-SA-97:01.setlocale</A> security announcement.
 	  </P>
 
diff --git a/en/releases/2.1.7R/announce.sgml b/en/releases/2.1.7R/announce.sgml
index 34eae7d705..ac8c8a8dc6 100644
--- a/en/releases/2.1.7R/announce.sgml
+++ b/en/releases/2.1.7R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.7R/announce.sgml,v 1.6 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.7 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -11,12 +11,12 @@
 
 <blockquote>
 
-ftp://ftp.freebsd.org/pub/FreeBSD/2.1.7-RELEASE
+ftp://ftp.FreeBSD.org/pub/FreeBSD/2.1.7-RELEASE
 
 </blockquote>
 
 <p>And shortly from its various mirror sites, a list of which may be
-obtained from:  <a href="&base/handbook/mirrors.html">http://www.freebsd.org/handbook/mirrors.html</a></p>
+obtained from:  <a href="&base/handbook/mirrors.html">http://www.FreeBSD.org/handbook/mirrors.html</a></p>
 
 <p>This is a security release to FreeBSD 2.1.6, fixing at least several
 security holes and addressing a number of outstanding problem reports
@@ -35,7 +35,7 @@ replacement can be shipped.  Walnut Creek CDROM customers will also
 receive a letter explaining these details.
 
 <p>Those puzzled by the near-simultaneous release of 2.1.7 and 2.2
-should also look at http://www.freebsd.org/branch.html for
+should also look at http://www.FreeBSD.org/branch.html for
 the reasons behind this release schedule.  CDROM subscription
 customers should see this page for information on Walnut Creek CDROM's
 plans for these releases.</p>
diff --git a/en/releases/2.1.7R/notes.sgml b/en/releases/2.1.7R/notes.sgml
index 8586c4c5fb..907a16db21 100644
--- a/en/releases/2.1.7R/notes.sgml
+++ b/en/releases/2.1.7R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.7R/notes.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $">
 <!ENTITY title "FreeBSD 2.1.7 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.1.7R/notes.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $ -->
 
 <html>
 &header;
@@ -17,10 +17,10 @@
 ------------------------
 FreeBSD 2.1.7R is the follow-on release to 2.1.6R and focuses primarily
 on fixing bugs and closing security holes, the most notable being the
-setlocale() bug (see ftp://freefall.freebsd.org/pub/CERT) in 2.1.6R.
+setlocale() bug (see ftp://freefall.FreeBSD.org/pub/CERT) in 2.1.6R.
 
 For more information on our bleeding-edge development, please see
-http://www.freebsd.org/handbook/current.html.
+http://www.FreeBSD.org/handbook/current.html.
 
 0. What's New since 2.1.6-RELEASE?
 ----------------------------------
@@ -68,7 +68,7 @@ Various VM system enhancements and more than a few bugs fixed.
 
 A concatenated disk driver for simple types of RAID applications.
 See the man page for 
-<a href="http://www.freebsd.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?ccd(4)">ccd(4)</a>>
 for more information.
 
 Real PCI bus probing (before ISA) and support for various PCI bridges.
@@ -153,7 +153,7 @@ capable browser by saying:
       &lt;browser&gt; file:/usr/share/doc/FAQ/freebsd-faq.html
 
 You can also visit the master (and most frequently updated) copies at
-http://www.freebsd.org.
+http://www.FreeBSD.org.
 
 The core of FreeBSD does not contain DES code which would inhibit its
 being exported outside the United States.  There is an add-on package
@@ -161,7 +161,7 @@ to the core distribution, for use only in the United States, that
 contains the programs that normally use DES.  The auxiliary packages
 provided separately can be used by anyone.  A freely (from outside the
 U.S.) exportable distribution of DES for our non-U.S. users also
-exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
+exists at ftp://ftp.internat.FreeBSD.org/pub/FreeBSD.
 
 If password security for FreeBSD is all you need and you have no
 requirement for copying encrypted passwords from different hosts
@@ -325,12 +325,12 @@ You may obtain FreeBSD in a variety of ways:
 4.1. FTP/Mail
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
 networking terms) to you.  Additional mirror sites are always welcome!
-Contact admin@freebsd.org for more details if you'd like to become an
+Contact admin@FreeBSD.org for more details if you'd like to become an
 official mirror site.
 
 If you do not have access to the internet and electronic mail is your
diff --git a/en/releases/2.1R/notes.sgml b/en/releases/2.1R/notes.sgml
index 9ec1173383..fd510688c9 100644
--- a/en/releases/2.1R/notes.sgml
+++ b/en/releases/2.1R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1R/notes.sgml,v 1.3 1999/09/06 07:02:53 peter Exp $">
 <!ENTITY title "FreeBSD 2.1 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -67,7 +67,7 @@ capable browser by saying:
       &lt;browser&gt; file:/usr/share/doc/FAQ/freebsd-faq.html
 
 You can also visit the master (and most frequently updated) copies at
-http://www.freebsd.org.
+http://www.FreeBSD.org.
 
 The core of FreeBSD does not contain DES code which would inhibit its
 being exported outside the United States.  There is an add-on package
@@ -75,7 +75,7 @@ to the core distribution, for use only in the United States, that
 contains the programs that normally use DES.  The auxiliary packages
 provided separately can be used by anyone.  A freely (from outside the
 U.S.) exportable distribution of DES for our non-U.S. users also
-exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
+exists at ftp://ftp.internat.FreeBSD.org/pub/FreeBSD.
 
 If password security for FreeBSD is all you need and you have no
 requirement for copying encrypted passwords from different hosts
diff --git a/en/releases/2.2.1R/notes.sgml b/en/releases/2.2.1R/notes.sgml
index 67a4093844..8c634537d8 100644
--- a/en/releases/2.2.1R/notes.sgml
+++ b/en/releases/2.2.1R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.1R/notes.sgml,v 1.4 1999/09/06 07:02:53 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.1 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.1R/notes.sgml,v 1.4 1999/09/06 07:02:53 peter Exp $ -->
 
 <html>
 &header;
@@ -33,7 +33,7 @@ release following it.
 For even more up-to-date releases along the RELENG_2_2 branch (which
 is now proceeding onwards toward release 2.2.5), please install from:
 
-        ftp://releng22.freebsd.org/pub/FreeBSD/
+        ftp://releng22.FreeBSD.org/pub/FreeBSD/
 
 This is a snapshot made of RELENG_2_2 on a daily basis (and containing
 all the latest 2.2 fixes as of that date).
@@ -71,7 +71,7 @@ in 2.2.
 The number of EISA slots to probe is now a fully supported option,
 including the ability to save the value from a UserConfig session
 with 
-<a href="http://www.freebsd.org/cgi/man.cgi?dset(8)">dset(8)</a>>.
+<a href="http://www.FreeBSD.org/cgi/man.cgi?dset(8)">dset(8)</a>>.
 This helps owners of HP NetServer LC machines to
 install the system on their hardware.
 
@@ -108,7 +108,7 @@ driver, eliminating many of the previously existing problems with
 their mutual interaction.
 
 Syscons now supports cut & paste in textmode using the 
-<a href="http://www.freebsd.org/cgi/man.cgi?moused(8)">moused(8)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?moused(8)">moused(8)</a>>
 utility.
 
 2.2 is the first release that includes full CD-R support for the
@@ -186,10 +186,10 @@ from the old -D Makefile kludges, towards a system of "opt_foo.h"
 kernel include files, allowing Makefile dependencies to work again.
 We expect the old hack that blows the entire compile directory away
 on each run of 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>>
 to go away anytime soon.  Unless you're changing
 weird options, you might now consider using the -n option to 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>>,
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>>,
 or setting the env variable NO_CONFIG_CLOBBER, if CPU time is costly for
 you.  See also the comments in the handbook about how it works.
 
@@ -388,7 +388,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -444,7 +444,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -503,7 +503,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
diff --git a/en/releases/2.2.2R/errata.sgml b/en/releases/2.2.2R/errata.sgml
index 166f78558c..03c32742c4 100644
--- a/en/releases/2.2.2R/errata.sgml
+++ b/en/releases/2.2.2R/errata.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.2R/errata.sgml,v 1.5 1999/09/06 07:02:53 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.2 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.2R/errata.sgml,v 1.5 1999/09/06 07:02:53 peter Exp $ -->
 
 <html>
 &header;
@@ -17,8 +17,8 @@ Last minute errata:
 Fix:  If you have the source distribution installed, simply
       cp /usr/src/etc/login.conf /etc
       otherwise, get it from the FreeBSD FTP site using this URL:
-      ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/etc/login.conf
-      instead.  Simply cd to /etc and then run <a href="http://www.freebsd.org/cgi/man.cgi?fetch(1)">fetch(1)</a> with the provided URL.
+      ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/etc/login.conf
+      instead.  Simply cd to /etc and then run <a href="http://www.FreeBSD.org/cgi/man.cgi?fetch(1)">fetch(1)</a> with the provided URL.
 
 <strong>
 o sysconfig scrambles rc.conf if run again.</strong>
diff --git a/en/releases/2.2.2R/notes.sgml b/en/releases/2.2.2R/notes.sgml
index 4de155f375..f55decc986 100644
--- a/en/releases/2.2.2R/notes.sgml
+++ b/en/releases/2.2.2R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.2R/notes.sgml,v 1.4 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.2 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.2R/notes.sgml,v 1.4 1999/09/06 07:02:54 peter Exp $ -->
 
 <html>
 &header;
@@ -22,7 +22,7 @@ o For installation instructions, see the INSTALL.TXT and HARDWARE.TXT
 For the most up-to-date releases along the RELENG_2_2 branch (which
 is now proceeding onwards toward release 2.2.5), please install from:
 
-        ftp://releng22.freebsd.org/pub/FreeBSD/
+        ftp://releng22.FreeBSD.org/pub/FreeBSD/
 
 
 0. What's new since 2.2.1
@@ -35,7 +35,7 @@ NFSv3 is now the default, with fall-back to NFSv2 occuring as necessary.
 An lchown() system call has been added for changing the ownership of symlinks.
 
 Login classes added for setting default user limits (see login.
-<a href="http://www.freebsd.org/cgi/man.cgi?conf(5)">conf(5)</a>).
+<a href="http://www.FreeBSD.org/cgi/man.cgi?conf(5)">conf(5)</a>).
 
 ftpd now supports virtual FTP hosting.
 
@@ -86,7 +86,7 @@ in 2.2.
 The number of EISA slots to probe is now a fully supported option,
 including the ability to save the value from a UserConfig session
 with 
-<a href="http://www.freebsd.org/cgi/man.cgi?dset(8)">dset(8)</a>>.
+<a href="http://www.FreeBSD.org/cgi/man.cgi?dset(8)">dset(8)</a>>.
 This helps owners of HP NetServer LC machines to
 install the system on their hardware.
 
@@ -123,7 +123,7 @@ driver, eliminating many of the previously existing problems with
 their mutual interaction.
 
 Syscons now supports cut & paste in textmode using the 
-<a href="http://www.freebsd.org/cgi/man.cgi?moused(8)">moused(8)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?moused(8)">moused(8)</a>>
 utility.
 
 2.2 is the first release that includes full CD-R support for the
@@ -201,10 +201,10 @@ from the old -D Makefile kludges, towards a system of "opt_foo.h"
 kernel include files, allowing Makefile dependencies to work again.
 We expect the old hack that blows the entire compile directory away
 on each run of 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>>
 to go away anytime soon.  Unless you're changing
 weird options, you might now consider using the -n option to 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>>,
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>>,
 or setting the env variable NO_CONFIG_CLOBBER, if CPU time is costly for
 you.  See also the comments in the handbook about how it works.
 
@@ -403,7 +403,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -459,7 +459,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -518,7 +518,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
diff --git a/en/releases/2.2.5R/errata.sgml b/en/releases/2.2.5R/errata.sgml
index 0759ca25ae..2b656eba9c 100644
--- a/en/releases/2.2.5R/errata.sgml
+++ b/en/releases/2.2.5R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.5R/errata.sgml,v 1.9 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.5R/errata.sgml,v 1.9 1999/09/06 07:02:54 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.5-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.5-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 2.2.5 and should always
 be considered the definitive place to look <strong>first</strong> before reporting
 a problem with this release.  This file will also be periodically
@@ -18,20 +18,20 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For 2.2.5 security advisories, see:
 
-	<a href="ftp://freebsd.org/pub/CERT/">ftp://freebsd.org/pub/CERT/</a>
+	<a href="ftp://FreeBSD.org/pub/CERT/">ftp://FreeBSD.org/pub/CERT/</a>
 
 For the latest information (note the URL carefully - this is NOT
-ftp.freebsd.org).
+ftp.FreeBSD.org).
 
 ---- Security Advisories:
 
 Current active security advisories for 2.2.5:	One
 
-o <a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/patches/SA-97:05/">FreeBSD-SA-97:05</a> (available from <a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT</a>).
+o <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-97:05/">FreeBSD-SA-97:05</a> (available from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT</a>).
 
   You may also simply remove /dev/io as a quick work-around if you're
   not running an X server or some other specialized utility which
@@ -42,7 +42,7 @@ o <a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/patches/SA-97:05/">FreeBSD-SA-
 
 Fix:  If you plan to run appletalk, you should apply the following patch:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/atalk.diff.2.2.gz">ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/atalk.diff.2.2.gz</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/atalk.diff.2.2.gz">ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/atalk.diff.2.2.gz</a>
 
 <strong>
 o The line printer spooler lpd will, when sending jobs to remote
@@ -60,7 +60,7 @@ o Intel "F00F bug" enables users to hang machines with Pentium processors
 Fix:  Update to the 2.2-stable version of the kernel or apply the patch
       found in: 
  
-      <a href="ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/f00f.diff.2.2.gz">ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/f00f.diff.2.2.gz</a>
+      <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/f00f.diff.2.2.gz">ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/f00f.diff.2.2.gz</a>
 
 <strong>
 o A bug in the ipfw code exists where using the "reset tcp" firewall command
@@ -68,7 +68,7 @@ o A bug in the ipfw code exists where using the "reset tcp" firewall command
   locations.</strong>
 
 Fix:	Update to the 2.2-stable version of the kernel or apply the
-        patch found in <a href="ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/ipfw.diff.gz">ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.5-RELEASE/ipfw.diff.gz</a>
+        patch found in <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/ipfw.diff.gz">ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.5-RELEASE/ipfw.diff.gz</a>
 
 <strong>
 o A bug in XF86Setup causes it to fail to create a symbolic link from
diff --git a/en/releases/2.2.5R/notes.sgml b/en/releases/2.2.5R/notes.sgml
index 1e5ab1517d..0df2412a53 100644
--- a/en/releases/2.2.5R/notes.sgml
+++ b/en/releases/2.2.5R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.5R/notes.sgml,v 1.5 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -25,12 +25,12 @@ o For installation instructions, see the INSTALL.TXT and HARDWARE.TXT
 For the most up-to-date releases along the RELENG_2_2 branch (which
 is now proceeding onwards toward release 2.2.6), please install from:
 
-        ftp://releng22.freebsd.org/pub/FreeBSD/
+        ftp://releng22.FreeBSD.org/pub/FreeBSD/
 
 Or for the latest 3.0-current (HEAD branch) snapshot releases,
 please install from:
 
-        ftp://current.freebsd.org/pub/FreeBSD
+        ftp://current.FreeBSD.org/pub/FreeBSD
 
 
 1. What's new since 2.2.2
@@ -294,7 +294,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -350,7 +350,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -409,7 +409,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
diff --git a/en/releases/2.2.6R/errata.sgml b/en/releases/2.2.6R/errata.sgml
index 3bd48afe6c..e7b1193a5f 100644
--- a/en/releases/2.2.6R/errata.sgml
+++ b/en/releases/2.2.6R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.6R/errata.sgml,v 1.10 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.6 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.6R/errata.sgml,v 1.10 1999/09/06 07:02:54 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.6-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.6-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 2.2.6 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For 2.2.6 security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -30,7 +30,7 @@ For the latest information.
 
 Current active security advisories for 2.2.6:   4
 
-See <a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/</a>FreeBSD-SA-98:0[2-5].*
+See <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/</a>FreeBSD-SA-98:0[2-5].*
 for full information.
 
 ---- System Update Information:
@@ -80,7 +80,7 @@ Fix:  There are three possible fixes:
 1. The easiest fix is to simply install the des distribution with 
    /stand/sysinstall, remembering to pick a site that will allow you
    to export it if you're outside the United States and Canada
-   (<a href="ftp://ftp.freebsd.org/pub/FreeBSD/">ftp.freebsd.org</a> and <a href="ftp://ftp.internat.freebsd.org">ftp.internat.freebsd.org</a> both fall into this
+   (<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</a> and <a href="ftp://ftp.internat.FreeBSD.org">ftp.internat.FreeBSD.org</a> both fall into this
    category).
   
 2. Purely as a work-around, and what you may need to do if ppp 
@@ -105,14 +105,14 @@ o The xterm program in XFree86 3.3.2 doesn't remove utmp entries on
 
 Fix:  Fetch the updated xterm binary at:
 
-  <a href="ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.6-RELEASE/xterm">ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.6-RELEASE/xterm</a>
+  <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.6-RELEASE/xterm">ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.6-RELEASE/xterm</a>
 
 Or get the *latest* ports collection on your machine (see
-http://www.freebsd.org/ports) and use the port in x11/XFree86 to
+http://www.FreeBSD.org/ports) and use the port in x11/XFree86 to
 build an xterm with this patch already applied (as of 98/04/06).
 The patch itself can also be obtained from the port itself:
 
-  <a href="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/x11/XFree86/patches/patch-ag">ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/x11/XFree86/patches/patch-ag</a>
+  <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/ports/x11/XFree86/patches/patch-ag">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/ports/x11/XFree86/patches/patch-ag</a>
 
 <strong>
 o The older Matsushita (Panasonic), Sony CDU-31 and Mitsumi (non-IDE) 
@@ -120,7 +120,7 @@ o The older Matsushita (Panasonic), Sony CDU-31 and Mitsumi (non-IDE)
 
 Fix: Fetch an updated boot floppy from the updates/ directory, e.g.:
 
-  <a href="ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.6-RELEASE/boot.flp">ftp://ftp.freebsd.org/pub/FreeBSD/updates/2.2.6-RELEASE/boot.flp</a>
+  <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.6-RELEASE/boot.flp">ftp://ftp.FreeBSD.org/pub/FreeBSD/updates/2.2.6-RELEASE/boot.flp</a>
 
 And use it to install 2.2.6 instead.  This problem is fixed in 2.2-stable 
 and will not be a problem with the next FreeBSD release.
diff --git a/en/releases/2.2.7R/announce.sgml b/en/releases/2.2.7R/announce.sgml
index 2aa37edf97..26c2a7e0fd 100644
--- a/en/releases/2.2.7R/announce.sgml
+++ b/en/releases/2.2.7R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.7R/announce.sgml,v 1.7 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -20,7 +20,7 @@ fixed (see the <A HREF="notes.html">release notes</A> for more
 information).</P>
 
 <p>FreeBSD 2.2.7-RELEASE is available on <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and
 various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
 throughout the world.  It can also be ordered on CD from
 <A HREF="http://www.cdrom.com/">Walnut Creek CDROM</A>, from where it
@@ -82,7 +82,7 @@ never even heard of :).</p>
 mirror(s) first by going to:</p>
 
 <blockquote>
-<p>ftp://ftp.&lt;yourdomain>.freebsd.org/pub/FreeBSD</p>
+<p>ftp://ftp.&lt;yourdomain>.FreeBSD.org/pub/FreeBSD</p>
 </blockquote>
 
 Any additional mirror sites will be labeled ftp2, ftp3 and so on.
diff --git a/en/releases/2.2.7R/errata.sgml b/en/releases/2.2.7R/errata.sgml
index 70f0735ec8..3abc3c7596 100644
--- a/en/releases/2.2.7R/errata.sgml
+++ b/en/releases/2.2.7R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.7R/errata.sgml,v 1.8 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.7R/errata.sgml,v 1.8 1999/09/06 07:02:55 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/2.2.7-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2.7-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 2.2.7 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For 2.2.7 security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -57,9 +57,9 @@ o rshd was broken during -Wall cleanup, as noted in PR#7500</strong>
 Fix: This was fixed in the 2.2-stable branch as of 1998/07/24 04:32:21
      in revision 1.9.2.9 of /usr/src/libexec/rshd/rshd.c.  Obtain the
      fixed version via CVSup (see instructions in handbook or simply 
-     ``pkg_add ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/cvsupit.tgz''
+     ``pkg_add ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz''
      and follow the instructions) or get it from FTP at:
-     <a href="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-stable/src/libexec/rshd/rshd.c">ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-stable/src/libexec/rshd/rshd.c</a>
+     <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/src/libexec/rshd/rshd.c">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/src/libexec/rshd/rshd.c</a>
 
 </pre>
 
diff --git a/en/releases/2.2.7R/notes.sgml b/en/releases/2.2.7R/notes.sgml
index 1595d261fa..b055b7b8ab 100644
--- a/en/releases/2.2.7R/notes.sgml
+++ b/en/releases/2.2.7R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.7R/notes.sgml,v 1.4 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -304,7 +304,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -361,7 +361,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -415,7 +415,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
  
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
  
 or, if you've loaded the doc distribution:
  
@@ -423,7 +423,7 @@ or, if you've loaded the doc distribution:
  
 Special mention to:
  
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
  
         Everyone at Montana State University for their initial support.
  
diff --git a/en/releases/2.2.8R/announce.sgml b/en/releases/2.2.8R/announce.sgml
index 5b1d5e2d0a..85c1980c00 100644
--- a/en/releases/2.2.8R/announce.sgml
+++ b/en/releases/2.2.8R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.8R/announce.sgml,v 1.3 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -20,7 +20,7 @@ fixed and the <A HREF="notes.html">release notes</A> should be consulted
 for more information.</P>
 
 <p>FreeBSD 2.2.8-RELEASE is available on <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and
 various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
 throughout the world.  It can also be ordered on CD from
 <A HREF="http://www.cdrom.com/">Walnut Creek CDROM</A>, from where it
@@ -74,7 +74,7 @@ never even heard of :).</p>
 mirror(s) first by going to:</p>
 
 <blockquote>
-<p>ftp://ftp.&lt;yourdomain>.freebsd.org/pub/FreeBSD</p>
+<p>ftp://ftp.&lt;yourdomain>.FreeBSD.org/pub/FreeBSD</p>
 </blockquote>
 
 Any additional mirror sites will be labeled ftp2, ftp3 and so on.
diff --git a/en/releases/2.2.8R/errata.sgml b/en/releases/2.2.8R/errata.sgml
index cb6e1b0a28..58f01a6c21 100644
--- a/en/releases/2.2.8R/errata.sgml
+++ b/en/releases/2.2.8R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.8R/errata.sgml,v 1.10 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2.8R/errata.sgml,v 1.10 1999/09/06 07:02:55 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/2.2.8-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/2.2.8-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 2.2.8 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For 2.2.8 security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -47,7 +47,7 @@ Fix: sysctl(8) has actually moved to /sbin/sysctl.  Simply create
 Fix: This was a build failure which affected only the FAQ and has since
      been fixed.  If you are already cvsup/CTM'ing the doc-all tag then
      you can simply remake and install the FAQ from sources, otherwise
-     grab ftp://ftp.freebsd.org/pub/FreeBSD/doc/FAQ.tar.gz and unpack
+     grab ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/FAQ.tar.gz and unpack
      as follows:  tar --unlink -xvzf FAQ.tar.gz -C /usr/share/doc
      to get an english FAQ.
 
@@ -58,7 +58,7 @@ Fix: If passed a string longer than the maximum allowed for a user name,
      initial characters in the string up to the maximum length allowed for a
      user name.  To correct this behaviour, libc needs to be patched and
      recompiled.  The appropriate patch can be obtained from:
-     http://www.freebsd.org/cgi/cvsweb.cgi/src/lib/libc/gen/getpwent.c.diff?r1=1.35.2.2&amp;r2=1.35.2.3
+     http://www.FreeBSD.org/cgi/cvsweb.cgi/src/lib/libc/gen/getpwent.c.diff?r1=1.35.2.2&amp;r2=1.35.2.3
 
 </pre>
 
diff --git a/en/releases/2.2.8R/notes.sgml b/en/releases/2.2.8R/notes.sgml
index 98719b916a..79b0a17869 100644
--- a/en/releases/2.2.8R/notes.sgml
+++ b/en/releases/2.2.8R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.8R/notes.sgml,v 1.4 1999/09/06 07:02:55 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -267,7 +267,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -316,7 +316,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -370,7 +370,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
  
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
  
 or, if you've loaded the doc distribution:
  
@@ -378,7 +378,7 @@ or, if you've loaded the doc distribution:
  
 Special mention to:
  
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
  
         Everyone at Montana State University for their initial support.
  
diff --git a/en/releases/2.2R/announce.sgml b/en/releases/2.2R/announce.sgml
index bef1d48d93..5a81278127 100644
--- a/en/releases/2.2R/announce.sgml
+++ b/en/releases/2.2R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2R/announce.sgml,v 1.4 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 2.2 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -12,7 +12,7 @@ long-awaited first release of our 2.2 branch technology following
 lengthy ALPHA, BETA and GAMMA testing cycles.</P>
 
 <P>FreeBSD 2.2-RELEASE is now available on 
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and 
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and 
 various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
 throughout the world.  It can also be ordered on CD from 
 <A HREF="http://www.cdrom.com/">Walnut Creek CDROM</A>, from 
diff --git a/en/releases/2.2R/notes.sgml b/en/releases/2.2R/notes.sgml
index 1d0b7b819a..647014ab3c 100644
--- a/en/releases/2.2R/notes.sgml
+++ b/en/releases/2.2R/notes.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2R/notes.sgml,v 1.5 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 2.2 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/2.2R/notes.sgml,v 1.5 1999/09/06 07:02:56 peter Exp $ -->
 
 <html>
 &header;
@@ -43,7 +43,7 @@ in 2.2.
 The number of EISA slots to probe is now a fully supported option,
 including the ability to save the value from a UserConfig session
 with 
-<a href="http://www.freebsd.org/cgi/man.cgi?dset(8)">dset(8)</a>.  
+<a href="http://www.FreeBSD.org/cgi/man.cgi?dset(8)">dset(8)</a>.  
 This helps owners of HP NetServer LC machines to
 install the system on their hardware.
 
@@ -77,7 +77,7 @@ driver, eliminating many of the previously existing problems with
 their mutual interaction.
 
 Syscons now supports cut & paste in textmode using the 
-<a href="http://www.freebsd.org/cgi/man.cgi?moused(8)">moused(8)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?moused(8)">moused(8)</a>
 utility.
 
 2.2 is the first release that includes full CD-R support for the
@@ -155,10 +155,10 @@ from the old -D Makefile kludges, towards a system of "opt_foo.h"
 kernel include files, allowing Makefile dependencies to work again.
 We expect the old hack that blows the entire compile directory away
 on each run of 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>
 to go away anytime soon.  Unless you're changing
 weird options, you might now consider using the -n option to 
-<a href="http://www.freebsd.org/cgi/man.cgi?config(8)">config(8)</a>,
+<a href="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config(8)</a>,
 or setting the env variable NO_CONFIG_CLOBBER, if CPU time is costly for
 you.  See also the comments in the handbook about how it works.
 
@@ -357,7 +357,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -413,7 +413,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -472,7 +472,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
diff --git a/en/releases/3.0R/announce.sgml b/en/releases/3.0R/announce.sgml
index 972ef45d89..8a384584b4 100644
--- a/en/releases/3.0R/announce.sgml
+++ b/en/releases/3.0R/announce.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.0R/announce.sgml,v 1.4 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.0 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -22,7 +22,7 @@ skilled).  See the <A HREF="notes.html">release notes</A> for more
 information.</P>
 
 <p>FreeBSD 3.0-RELEASE is available on <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and
 various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
 throughout the world.  It can also be ordered on CD from
 <A HREF="http://www.cdrom.com/">Walnut Creek CDROM</A>, from where it
@@ -84,7 +84,7 @@ never even heard of :).</p>
 mirror(s) first by going to:</p>
 
 <blockquote>
-<p>ftp://ftp.&lt;yourdomain>.freebsd.org/pub/FreeBSD</p>
+<p>ftp://ftp.&lt;yourdomain>.FreeBSD.org/pub/FreeBSD</p>
 </blockquote>
 
 Any additional mirror sites will be labeled ftp2, ftp3 and so on.
diff --git a/en/releases/3.0R/errata.sgml b/en/releases/3.0R/errata.sgml
index 2ed04ff733..b547058c0a 100644
--- a/en/releases/3.0R/errata.sgml
+++ b/en/releases/3.0R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.0R/errata.sgml,v 1.7 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.0 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/3.0R/errata.sgml,v 1.7 1999/09/06 07:02:56 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/3.0-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/3.0-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 3.0 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For 3.0 security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -34,7 +34,7 @@ o SA-98:08: IP fragmentation denial of service
 
 Fix: Update to 3.0-current or apply patch supplied with advisory 98:08 in:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc</a>
 
 ---- System Update Information:
 
diff --git a/en/releases/3.0R/notes.sgml b/en/releases/3.0R/notes.sgml
index ae0bf4fc4b..2f19e1694b 100644
--- a/en/releases/3.0R/notes.sgml
+++ b/en/releases/3.0R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.0R/notes.sgml,v 1.6 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.0 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -16,7 +16,7 @@ not be updated yet and should be reported if and when seen.
 Naturally, any installation failures or crashes should also be
 reported ASAP by sending mail to freebsd-bugs@FreeBSD.org or using the
 send-pr command (those preferring a WEB based interface can also see
-<A href="http://www.freebsd.org/send-pr.html">this page</A>).
+<A href="http://www.FreeBSD.org/send-pr.html">this page</A>).
 
 For information about FreeBSD and the layout of the 3.0-RELEASE
 directory (especially if you're installing from floppies!), see
@@ -27,7 +27,7 @@ This is also hardly the last release on the 3.0-current (HEAD) branch
 and daily snapshot releases will continue as normal following this
 release.  Please install them from:
 
-	<A href="ftp://current.freebsd.org/pub/FreeBSD">ftp://current.freebsd.org/pub/FreeBSD</A>
+	<A href="ftp://current.FreeBSD.org/pub/FreeBSD">ftp://current.FreeBSD.org/pub/FreeBSD</A>
 
 If you wish to get the latest post-3.0-RELEASE technology.
 
@@ -656,7 +656,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -753,7 +753,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -812,7 +812,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
@@ -821,17 +821,17 @@ or, if you've loaded the doc distribution:
 
 Special mention to:
 
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
 
-        <a href="mailto:jseger@freebsd.org">Justin M. Seger</a> for almost
+        <a href="mailto:jseger@FreeBSD.org">Justin M. Seger</a> for almost
         single-handedly converting the ports collection to ELF.
 
-        <a href="mailto:dfr@freebsd.org">Doug Rabson</a> and
-        <a href="mailto:jb@freebsd.org">John Birrell</a>
+        <a href="mailto:dfr@FreeBSD.org">Doug Rabson</a> and
+        <a href="mailto:jb@FreeBSD.org">John Birrell</a>
         for making FreeBSD/alpha happen and to the NetBSD project for
         substantial indirect aid.
 
-        <a href="mailto:peter@freebsd.org">Peter Wemm</a> for the new kernel
+        <a href="mailto:peter@FreeBSD.org">Peter Wemm</a> for the new kernel
         module system (with substantial aid from Doug Rabson).
 
         And to the many thousands of FreeBSD users and testers all over the
diff --git a/en/releases/3.1R/errata.sgml b/en/releases/3.1R/errata.sgml
index 1101324cdb..c70329a10b 100644
--- a/en/releases/3.1R/errata.sgml
+++ b/en/releases/3.1R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.1R/errata.sgml,v 1.6 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.1 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/3.1R/errata.sgml,v 1.6 1999/09/06 07:02:56 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/3.1-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.1-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 3.1 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For all FreeBSD security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
diff --git a/en/releases/3.1R/notes.sgml b/en/releases/3.1R/notes.sgml
index 4d841b79dc..c9affd3643 100644
--- a/en/releases/3.1R/notes.sgml
+++ b/en/releases/3.1R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.1R/notes.sgml,v 1.3 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.1 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -19,7 +19,7 @@ system.  Please see relevant details below.
 
 Any installation failures or crashes should be reported by using the
 send-pr command (those preferring a WEB based interface can also see
-<A href="http://www.freebsd.org/send-pr.html">this page</A>).
+<A href="http://www.FreeBSD.org/send-pr.html">this page</A>).
 
 For information about FreeBSD and the layout of the 3.1-RELEASE
 directory (especially if you're installing from floppies!), see
@@ -96,7 +96,7 @@ the nlpt driver will be renamed to lpt.
 
 1.2. SECURITY FIXES
 -------------------
-See ftp://ftp.freebsd.org/pub/FreeBSD/CERT/ for details:
+See ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/ for details:
   CERT Advisory CA-98-13-tcp-denial-of-service closed.
   FreeBSD-SA-98:08 (IP fragmentation denial of service) closed.
 
@@ -420,7 +420,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -510,7 +510,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -569,7 +569,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
@@ -578,19 +578,19 @@ or, if you've loaded the doc distribution:
 
 Special mention to:
 
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
 
-        <a href="mailto:steve@freebsd.org">Steve Price</a> for his work
+        <a href="mailto:steve@FreeBSD.org">Steve Price</a> for his work
         in building and organizing the packages and, as always,
-        <a href="mailto:asami@freebsd.org">Satoshi Asami</a> for his
+        <a href="mailto:asami@FreeBSD.org">Satoshi Asami</a> for his
         work on the ports collection.
 
-        <a href="mailto:dfr@freebsd.org">Doug Rabson</a> and
-        <a href="mailto:jb@freebsd.org">John Birrell</a>
+        <a href="mailto:dfr@FreeBSD.org">Doug Rabson</a> and
+        <a href="mailto:jb@FreeBSD.org">John Birrell</a>
         for making FreeBSD/alpha happen and to the NetBSD project for
         substantial indirect aid.
 
-        <a href="mailto:peter@freebsd.org">Peter Wemm</a> for the new kernel
+        <a href="mailto:peter@FreeBSD.org">Peter Wemm</a> for the new kernel
         module system (with substantial aid from Doug Rabson).
 
         And to the many thousands of FreeBSD users and testers all over the
diff --git a/en/releases/3.2R/errata.sgml b/en/releases/3.2R/errata.sgml
index e4e1778de7..a9e7368ace 100644
--- a/en/releases/3.2R/errata.sgml
+++ b/en/releases/3.2R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.2R/errata.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $">
 <!ENTITY title "FreeBSD 3.2 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/3.2R/errata.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/3.2-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.2-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 3.2 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For all FreeBSD security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -44,7 +44,7 @@ Fix: cd /usr/lib/compat
 <strong>o /usr/bin/gdb crashes when debugging core files from static programs</strong>
 
 Fix: This was corrected in revision 1.3.2.2 of solib.c. Obtain the fixed
-     version via CVSup (see instructions in handbook) or apply <a href="http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/gdb/gdb/solib.c.diff?r1=1.3.2.1&amp;r2=1.3.2.2">the patch</a>
+     version via CVSup (see instructions in handbook) or apply <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/contrib/gdb/gdb/solib.c.diff?r1=1.3.2.1&amp;r2=1.3.2.2">the patch</a>
      from our CVSweb service.
 
 <strong>o While booting the install floppy, user sees the following message 
diff --git a/en/releases/3.2R/notes.sgml b/en/releases/3.2R/notes.sgml
index 44959ba32c..35809cf67f 100644
--- a/en/releases/3.2R/notes.sgml
+++ b/en/releases/3.2R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/3.2R/notes.sgml,v 1.3 1999/09/06 07:02:57 peter Exp $">
 <!ENTITY title "FreeBSD 3.2 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -19,7 +19,7 @@ system.  Please see relevant details below.
 
 Any installation failures or crashes should be reported by using the
 send-pr command (those preferring a WEB based interface can also see
-<A href="http://www.freebsd.org/send-pr.html">this page</A>).
+<A href="http://www.FreeBSD.org/send-pr.html">this page</A>).
 
 For information about FreeBSD and the layout of the 3.2-RELEASE
 directory (especially if you're installing from floppies!), see
@@ -436,7 +436,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -524,7 +524,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -583,7 +583,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
@@ -591,7 +591,7 @@ or, if you've loaded the doc distribution:
 
 Special mention to:
 
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
 
         And to the many thousands of FreeBSD users and testers all over the
         world, without whom this release simply would not have been possible.
diff --git a/en/releases/3.3R/errata.sgml b/en/releases/3.3R/errata.sgml
index 62bf324d32..31d22bef21 100644
--- a/en/releases/3.3R/errata.sgml
+++ b/en/releases/3.3R/errata.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/releases/3.3R/errata.sgml,v 1.5 1999/11/08 10:57:02 yokota Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/3.3R/errata.sgml,v 1.6 1999/11/08 20:12:35 wosch Exp $">
 <!ENTITY title "FreeBSD 3.3 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/3.3R/errata.sgml,v 1.5 1999/11/08 10:57:02 yokota Exp $ -->
+<!-- $FreeBSD: www/en/releases/3.3R/errata.sgml,v 1.6 1999/11/08 20:12:35 wosch Exp $ -->
 
 <html>
 &header;
 
 <pre>
-The file <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/3.3-RELEASE/ERRATA.TXT">
+The file <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.3-RELEASE/ERRATA.TXT">
 ERRATA.TXT</a> contains post-release ERRATA for 3.3 and should always
 be considered the definitive place to look *first* before reporting
 a problem with this release.  This file will also be periodically
@@ -18,11 +18,11 @@ updated as new issues are reported so even if you've checked this
 file recently, check it again before filing a bug report.  Any
 changes to this file are also automatically emailed to:
 
-	freebsd-stable@freebsd.org
+	freebsd-stable@FreeBSD.org
 
 For all FreeBSD security advisories, see:
 
-<a href="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/</a>
+<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</a>
 
 For the latest information.
 
@@ -59,7 +59,7 @@ Fix: Either install using boot floppies (see floppies/README.TXT)
      rather than booting from the CDROM or grab the updated ISO image
      from:
 
-       <a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/ISO-IMAGES/">ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/ISO-IMAGES/</a>
+       <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/ISO-IMAGES/">ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/ISO-IMAGES/</a>
 
      See also the CHECKSUM.MD5 file in that directory to verify whether
      you have the "old" or new image - some mirrors may be slow
diff --git a/en/releases/3.3R/notes.sgml b/en/releases/3.3R/notes.sgml
index b81d99b7d2..f0f52b96ec 100644
--- a/en/releases/3.3R/notes.sgml
+++ b/en/releases/3.3R/notes.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/releases/3.3R/notes.sgml,v 1.3 1999/09/06 07:02:57 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/3.3R/notes.sgml,v 1.1 1999/09/17 12:34:27 jkh Exp $">
 <!ENTITY title "FreeBSD 3.3 Release Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -18,7 +18,7 @@ details below.
 
 Any installation failures or crashes should be reported by using the
 send-pr command (those preferring a WEB based interface can also see
-<A href="http://www.freebsd.org/send-pr.html">this page</A>).
+<A href="http://www.FreeBSD.org/send-pr.html">this page</A>).
 
 For information about FreeBSD and the layout of the 3.3-RELEASE
 directory (especially if you're installing from floppies!), see
@@ -508,7 +508,7 @@ You may obtain FreeBSD in a variety of ways:
 -------------
 
 You can ftp FreeBSD and any or all of its optional packages from
-`ftp.freebsd.org' - the official FreeBSD release site.
+`ftp.FreeBSD.org' - the official FreeBSD release site.
 
 For other locations that mirror the FreeBSD software see the file
 MIRROR.SITES.  Please ftp the distribution from the site closest (in
@@ -605,7 +605,7 @@ valued - please do not hesitate to report any problems you may find
 
 The preferred method to submit bug reports from a machine with
 Internet mail connectivity is to use the send-pr command or use the CGI
-script at http://www.freebsd.org/send-pr.html.  Bug reports
+script at http://www.FreeBSD.org/send-pr.html.  Bug reports
 will be dutifully filed by our faithful bugfiler program and you can
 be sure that we'll do our best to respond to all reported bugs as soon
 as possible.  Bugs filed in this way are also visible on our WEB site
@@ -664,7 +664,7 @@ hundreds, of individuals from around the world who have worked very
 hard to bring you this release.  For a complete list of FreeBSD
 project staffers, please see:
 
-        http://www.freebsd.org/handbook/staff.html
+        http://www.FreeBSD.org/handbook/staff.html
 
 or, if you've loaded the doc distribution:
 
@@ -673,7 +673,7 @@ or, if you've loaded the doc distribution:
 
 Special mention to:
 
-        The donors listed at http://www.freebsd.org/handbook/donors.html
+        The donors listed at http://www.FreeBSD.org/handbook/donors.html
 
         And to the many thousands of FreeBSD users and testers all over the
         world, without whom this release simply would not have been possible.
diff --git a/en/releases/index.sgml b/en/releases/index.sgml
index 908925cc7c..ea7f31d9b9 100644
--- a/en/releases/index.sgml
+++ b/en/releases/index.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.31 1999/09/18 00:06:17 jkh Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.32 1999/09/29 00:23:28 jkh Exp $">
 <!ENTITY title "Release Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/index.sgml,v 1.31 1999/09/18 00:06:17 jkh Exp $ -->
+<!-- $FreeBSD: www/en/releases/index.sgml,v 1.32 1999/09/29 00:23:28 jkh Exp $ -->
 
 <html>
 &header;
@@ -167,8 +167,8 @@ FreeBSD</A> for details.</p>
 <p>
 A snapshot of the current FreeBSD release usage
 is available at 
-<A HREF="http://www.freebsd.org/statistic/release_usage/1999/">
-http://www.freebsd.org/statistic/release_usage/1999/</A>.
+<A HREF="http://www.FreeBSD.org/statistic/release_usage/1999/">
+http://www.FreeBSD.org/statistic/release_usage/1999/</A>.
 </p>
 
 &footer;
diff --git a/en/releases/snapshots.sgml b/en/releases/snapshots.sgml
index 8e0b9b72cd..4505e303e6 100644
--- a/en/releases/snapshots.sgml
+++ b/en/releases/snapshots.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/releases/snapshots.sgml,v 1.8 1999/09/06 07:02:49 peter Exp $">
 <!ENTITY title "FreeBSD Snapshot Releases">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/releases/snapshots.sgml,v 1.8 1999/09/06 07:02:49 peter Exp $ -->
 
 <html>
 &header;
@@ -62,8 +62,8 @@
 
     <p>Snapshots of <a href="&base/handbook/cutting-edge.html#CURRENT">FreeBSD-current</a>
         are available via anonymous FTP from
-        <a href="ftp://current.freebsd.org/pub/FreeBSD/">
-        ftp://current.freebsd.org/pub/FreeBSD/</a>.
+        <a href="ftp://current.FreeBSD.org/pub/FreeBSD/">
+        ftp://current.FreeBSD.org/pub/FreeBSD/</a>.
 	The snapshot releases are in directories named in the
 	format <b>REL-YYMMDD-SNAP</b> where `<b>REL</b>' is the
 	release number, `<b>YY</b>' is the year, `<b>MM</b>' is
@@ -74,8 +74,8 @@
 
     <p>By popular demand, snapshots are also now available for the
         <a href="&base/handbook/stable.html">FreeBSD-stable</a> branch via anonymous FTP from
-	<a href="ftp://releng22.freebsd.org/pub/FreeBSD/">
-	ftp://releng22.freebsd.org/pub/FreeBSD/</a>.
+	<a href="ftp://releng22.FreeBSD.org/pub/FreeBSD/">
+	ftp://releng22.FreeBSD.org/pub/FreeBSD/</a>.
 	The snapshot releases are in directories named in the
 	same manner as -current snapshots, but ending in the keyword
 	RELENG instead of SNAP.
diff --git a/en/search/search-mid.sgml b/en/search/search-mid.sgml
index 9bafe59221..962fa0072f 100644
--- a/en/search/search-mid.sgml
+++ b/en/search/search-mid.sgml
@@ -1,25 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/search/search-mid.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $">
 <!ENTITY title "Mailing list Message-ID Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 
 <!-- Created at 1998-03-21 by Wolfram Schneider <wosch@FreeBSD.org> -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/search/search-mid.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $ -->
 
 
 <html>
 &header;
 
-<FORM ACTION="http://www.freebsd.org/cgi/mid.cgi" METHOD="GET">
+<FORM ACTION="http://www.FreeBSD.org/cgi/mid.cgi" METHOD="GET">
 <b>Message-ID:</b><br>
 <INPUT NAME="id" TYPE="text" SIZE="50">
 <INPUT name="db" VALUE="mid" TYPE="hidden">
 <INPUT TYPE="submit" VALUE="Search">
 </FORM>
 
-<FORM ACTION="http://www.freebsd.org/cgi/mid.cgi" METHOD="GET">
+<FORM ACTION="http://www.FreeBSD.org/cgi/mid.cgi" METHOD="GET">
 <b>Answers to a Message-ID:</b><br>
 <INPUT NAME="db" VALUE="irt" TYPE="hidden">
 <INPUT TYPE="text" NAME="id" SIZE="50">
diff --git a/en/security/advisories.xml b/en/security/advisories.xml
index 4715335dd9..50aa1f8867 100644
--- a/en/security/advisories.xml
+++ b/en/security/advisories.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $ -->
 
 <html>
     &header;
@@ -38,7 +38,7 @@ introduce security holes in the first place.</P>
 
 <P>To better coordinate information exchange with others in the security
 community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@freebsd.org">security officer</a>.
+The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
 The position is actually staffed by a team of dedicated security officers,
 their main tasks being to send out advisories when there are known security
 holes and to act on reports of possible security problems with FreeBSD.</P>
@@ -56,7 +56,7 @@ active members of those organizations.</P>
 
 <P>If you do need to contact the Security Officer about a particularly
 sensitive matter, please use their <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc">PGP key
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
 </A> to encrypt your message before sending it.</P>
 
 <A NAME=adv></A>
@@ -93,57 +93,57 @@ out.</P>
 
 <P>Advisories are sent to the following FreeBSD mailing lists:
 <UL>
-<LI>FreeBSD-security-notifications@freebsd.org
-<LI>FreeBSD-security@freebsd.org
-<LI>FreeBSD-announce@freebsd.org
+<LI>FreeBSD-security-notifications@FreeBSD.org
+<LI>FreeBSD-security@FreeBSD.org
+<LI>FreeBSD-announce@FreeBSD.org
 </UL>
 
 
 <P>Advisories are always signed using the FreeBSD Security Officer
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
 </A> and are archived, along with their associated patches, at our
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/index.html">FTP CERT
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html">FTP CERT
 repository</A>.  At the time of this writing, the following advisories are
 currently available:</P>
 
 <UL>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
 </UL>
 
 <A NAME=ml></A>
@@ -157,7 +157,7 @@ freebsd-security                General security related discussion
 freebsd-security-notifications  Security notifications (moderated mailing list)
 </PRE>
 
-Send mail to <A HREF="mailto:majordomo@freebsd.org">
+Send mail to <A HREF="mailto:majordomo@FreeBSD.org">
 majordomo@FreeBSD.ORG</A> with
 <PRE>
      subscribe &lt;listname&gt;  [&lt;optional address&gt;]
@@ -165,11 +165,11 @@ majordomo@FreeBSD.ORG</A> with
 in the body of the message in order to subscribe yourself.
 For example:
 <PRE>
-% echo "subscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "subscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 and if you would like to unsubscribe from a mailing list:
 <PRE>
-% echo "unsubscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "unsubscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 
 <A NAME=spg></A>
@@ -396,8 +396,8 @@ in their hands.<P></P>
 
 <P>There is also a FreeBSD Security How-To available which provides some
 advanced tips on how to improve security of your system.  You can 
-find it at <A HREF="http://www.freebsd.org/~jkb/howto.html">
-http://www.freebsd.org/~jkb/howto.html</A>.</P>
+find it at <A HREF="http://www.FreeBSD.org/~jkb/howto.html">
+http://www.FreeBSD.org/~jkb/howto.html</A>.</P>
 <P>Security is an ongoing process.  Make sure you are following the latest
 developments in the security arena.</P>
 
@@ -421,7 +421,7 @@ Did the breaking occur via a well know security bug? If that is the case,
 make sure to install the correct patches.  Was the breaking successful due
 to a misconfiguration? Was the breakin result of a new bug? If you believe
 the breakin occurred via a new bug, you should warn the
-<A HREF="mailto:security-officer@freebsd.org"> FreeBSD Security 
+<A HREF="mailto:security-officer@FreeBSD.org"> FreeBSD Security 
 Officer</A>.</LI>
 
 <LI><B>Fix the security hole</B><BR>
diff --git a/en/security/security.sgml b/en/security/security.sgml
index 4715335dd9..50aa1f8867 100644
--- a/en/security/security.sgml
+++ b/en/security/security.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $ -->
 
 <html>
     &header;
@@ -38,7 +38,7 @@ introduce security holes in the first place.</P>
 
 <P>To better coordinate information exchange with others in the security
 community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@freebsd.org">security officer</a>.
+The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
 The position is actually staffed by a team of dedicated security officers,
 their main tasks being to send out advisories when there are known security
 holes and to act on reports of possible security problems with FreeBSD.</P>
@@ -56,7 +56,7 @@ active members of those organizations.</P>
 
 <P>If you do need to contact the Security Officer about a particularly
 sensitive matter, please use their <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc">PGP key
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
 </A> to encrypt your message before sending it.</P>
 
 <A NAME=adv></A>
@@ -93,57 +93,57 @@ out.</P>
 
 <P>Advisories are sent to the following FreeBSD mailing lists:
 <UL>
-<LI>FreeBSD-security-notifications@freebsd.org
-<LI>FreeBSD-security@freebsd.org
-<LI>FreeBSD-announce@freebsd.org
+<LI>FreeBSD-security-notifications@FreeBSD.org
+<LI>FreeBSD-security@FreeBSD.org
+<LI>FreeBSD-announce@FreeBSD.org
 </UL>
 
 
 <P>Advisories are always signed using the FreeBSD Security Officer
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
 </A> and are archived, along with their associated patches, at our
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/index.html">FTP CERT
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html">FTP CERT
 repository</A>.  At the time of this writing, the following advisories are
 currently available:</P>
 
 <UL>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
 </UL>
 
 <A NAME=ml></A>
@@ -157,7 +157,7 @@ freebsd-security                General security related discussion
 freebsd-security-notifications  Security notifications (moderated mailing list)
 </PRE>
 
-Send mail to <A HREF="mailto:majordomo@freebsd.org">
+Send mail to <A HREF="mailto:majordomo@FreeBSD.org">
 majordomo@FreeBSD.ORG</A> with
 <PRE>
      subscribe &lt;listname&gt;  [&lt;optional address&gt;]
@@ -165,11 +165,11 @@ majordomo@FreeBSD.ORG</A> with
 in the body of the message in order to subscribe yourself.
 For example:
 <PRE>
-% echo "subscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "subscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 and if you would like to unsubscribe from a mailing list:
 <PRE>
-% echo "unsubscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "unsubscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 
 <A NAME=spg></A>
@@ -396,8 +396,8 @@ in their hands.<P></P>
 
 <P>There is also a FreeBSD Security How-To available which provides some
 advanced tips on how to improve security of your system.  You can 
-find it at <A HREF="http://www.freebsd.org/~jkb/howto.html">
-http://www.freebsd.org/~jkb/howto.html</A>.</P>
+find it at <A HREF="http://www.FreeBSD.org/~jkb/howto.html">
+http://www.FreeBSD.org/~jkb/howto.html</A>.</P>
 <P>Security is an ongoing process.  Make sure you are following the latest
 developments in the security arena.</P>
 
@@ -421,7 +421,7 @@ Did the breaking occur via a well know security bug? If that is the case,
 make sure to install the correct patches.  Was the breaking successful due
 to a misconfiguration? Was the breakin result of a new bug? If you believe
 the breakin occurred via a new bug, you should warn the
-<A HREF="mailto:security-officer@freebsd.org"> FreeBSD Security 
+<A HREF="mailto:security-officer@FreeBSD.org"> FreeBSD Security 
 Officer</A>.</LI>
 
 <LI><B>Fix the security hole</B><BR>
diff --git a/en/send-pr.sgml b/en/send-pr.sgml
index 0db1fd5abe..d9378fd680 100644
--- a/en/send-pr.sgml
+++ b/en/send-pr.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/en/send-pr.sgml,v 1.15 1999/09/06 07:02:37 peter Exp $">
 <!ENTITY title "Submit a FreeBSD problem report">
 <!ENTITY copyright "This gnats pr-submission mechanism Copyright &copy; 1996
  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/send-pr.sgml,v 1.15 1999/09/06 07:02:37 peter Exp $ -->
 
 <html>
     &header;
@@ -19,7 +19,7 @@
       you fill in the "Environment" field as requested with the output from
       the machine on which problem occurred.</p>
 
-    <form action="http://www.freebsd.org/cgi/dosendpr.cgi" method="post">
+    <form action="http://www.FreeBSD.org/cgi/dosendpr.cgi" method="post">
       <input type="hidden" name="gndb" value="freebsd" >
       <input type="hidden" name="submitterid" value="net" >
       <input type="hidden" name="confidential" value="no" >
diff --git a/en/support.sgml b/en/support.sgml
index 85db0028db..6f8e7a91a2 100644
--- a/en/support.sgml
+++ b/en/support.sgml
@@ -1,9 +1,9 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.175 1999/12/05 20:24:16 joe Exp $">
+<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.176 1999/12/10 10:50:49 wosch Exp $">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/support.sgml,v 1.175 1999/12/05 20:24:16 joe Exp $ -->
+<!-- $FreeBSD: www/en/support.sgml,v 1.176 1999/12/10 10:50:49 wosch Exp $ -->
 
 <html>
     &header;
@@ -33,16 +33,16 @@
       numerous mailing lists covering different topic areas.  When in doubt
       about what list to post a question to, post to <a
 	href="mailto:freebsd-questions@FreeBSD.ORG">freebsd-questions@FreeBSD.ORG</a>.  You can <strong><a
-	  href="http://www.freebsd.org/mail/">browse</a></strong> or
+	  href="http://www.FreeBSD.org/mail/">browse</a></strong> or
       <strong><a href="&base/search/search.html#mailinglists">search</a></strong> the
       mailing list archives at <a
-	href="http://www.freebsd.org/">www.freebsd.org.</a></p>
+	href="http://www.FreeBSD.org/">www.FreeBSD.org.</a></p>
     
     <p>Several non-English mailing lists are also available:</p>
 
     <ul>
       <li><strong>Traditional Chinese</strong> -- <a
-	  href="mailto:majordomo@maillist.tw.freebsd.org">majordomo@maillist.tw.freebsd.org</a>, Big5 encoding.</li>
+	  href="mailto:majordomo@maillist.tw.FreeBSD.org">majordomo@maillist.tw.FreeBSD.org</a>, Big5 encoding.</li>
       
       <li><strong>Simplified Chinese</strong> -- <a
 	  href="mailto:majordomo@cn.FreeBSD.org">majordomo@cn.FreeBSD.org</a>,
@@ -52,8 +52,8 @@
 	  href="mailto:majordomo@freebsd.cz">majordomo@freebsd.cz</a></li>
       
       <li><strong>German</strong> -- <a
-	  href="mailto:majordomo@de.freebsd.org">majordomo@de.freebsd.org</a>
-	or <a href="http://www.de.freebsd.org/de/mailinglists.html">WWW</a>.</li>
+	  href="mailto:majordomo@de.FreeBSD.org">majordomo@de.FreeBSD.org</a>
+	or <a href="http://www.de.FreeBSD.org/de/mailinglists.html">WWW</a>.</li>
 	
       <li><strong>French</strong> -- <a
 	  href="mailto:listserver@freebsd-fr.org">listserver@freebsd-fr.org</a>
@@ -65,32 +65,32 @@
 	information.</li>
 
       <li><strong>Hungarian</strong> -- <a
-	  href="mailto:majordomo@hu.freebsd.org">majordomo@hu.freebsd.org</a></li>
+	  href="mailto:majordomo@hu.FreeBSD.org">majordomo@hu.FreeBSD.org</a></li>
 
       <li><strong>Indonesian</strong> -- <a
 	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
       
       <li><strong>Japanese</strong> -- <a
-	  href="mailto:majordomo@jp.freebsd.org">majordomo@jp.freebsd.org</a></li>
+	  href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a></li>
       
       <li><strong>Korean</strong> -- <a
-	  href="mailto:majordomo@kr.freebsd.org">majordomo@kr.freebsd.org</a>
+	  href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
 	or <a
-	  href="http://www.kr.freebsd.org/support.shtml#mailing-list">WWW</a></li>
+	  href="http://www.kr.FreeBSD.org/support.shtml#mailing-list">WWW</a></li>
 	
       <li><strong>Polish</strong> -- <a
 	  href="mailto:majordomo@pap.waw.pl">majordomo@pap.waw.pl</a></li>
 
       <li><strong>Portuguese</strong> -- <a
-	  href="mailto:listproc@br.freebsd.org">listproc@br.freebsd.org</a>
+	  href="mailto:listproc@br.FreeBSD.org">listproc@br.FreeBSD.org</a>
 	or <a
-	  href="http://www.br.freebsd.org/list.html">WWW</a></li>
+	  href="http://www.br.FreeBSD.org/list.html">WWW</a></li>
 
       <li><strong>Slovakian</strong> -- <a
-	  href="mailto:majordomo@sk.freebsd.org">majordomo@sk.freebsd.org</a></li>
+	  href="mailto:majordomo@sk.FreeBSD.org">majordomo@sk.FreeBSD.org</a></li>
 
       <li><strong>Spanish</strong> -- <a
-	  href="mailto:majordomo@es.freebsd.org">majordomo@es.freebsd.org</a></li>
+	  href="mailto:majordomo@es.FreeBSD.org">majordomo@es.FreeBSD.org</a></li>
     </ul>
     
     <p>If you create other FreeBSD mailing lists, <a
@@ -120,10 +120,10 @@
     <ul>
       <li><p>Our WEB pages remain one of the best sources of information, and
 	  are also mirrored at many sites around the world.  Try connecting to
-	  www.<b>yourcountry</b>.freebsd.org (e.g. <a
-	    href="http://www.de.freebsd.org/">www.de.freebsd.org</a> for
+	  www.<b>yourcountry</b>.FreeBSD.org (e.g. <a
+	    href="http://www.de.FreeBSD.org/">www.de.FreeBSD.org</a> for
 	  Germany or <a
-	    href="http://www.au.freebsd.org/">www.au.freebsd.org</a> for
+	    href="http://www.au.FreeBSD.org/">www.au.FreeBSD.org</a> for
 	  Australia), or select a mirror from the list on the <a
 	    href="&base/index.html">home page</>.  The same naming convention
 	  is also used for <b>FTP</b> servers.</p>
@@ -132,31 +132,31 @@
 	  are available:</p>
 	
 	<ul>
-	  <li><a href="http://www.cz.freebsd.org/">Czech</a></>
+	  <li><a href="http://www.cz.FreeBSD.org/">Czech</a></>
 	  
 	  <li><a href="zh/FAQ/FAQ.html">Chinese FAQ</a></>
 	  
-	  <li><a href="http://www.de.freebsd.org/de/">German</a></>
+	  <li><a href="http://www.de.FreeBSD.org/de/">German</a></>
 	  
-	  <li><a href="http://www.hu.freebsd.org/hu/">Hungarian</a></>
+	  <li><a href="http://www.hu.FreeBSD.org/hu/">Hungarian</a></>
 	  
 	  <li><a href="http://www.freebsd.or.id">Indonesian</a></>
 	  
-	  <li><a href="http://www.jp.freebsd.org/">Japanese</a></>
+	  <li><a href="http://www.jp.FreeBSD.org/">Japanese</a></>
 	  
-	  <li><a href="http://www.kr.freebsd.org/">Korean</a></>
+	  <li><a href="http://www.kr.FreeBSD.org/">Korean</a></>
 	  
-	  <li><a href="http://www.freebsd.org.pl">Polish</a></>
+	  <li><a href="http://www.FreeBSD.org.pl">Polish</a></>
 	  
-	  <li><a href="http://www.br.freebsd.org/">Portuguese</a> (<a
-	      href="http://www2.br.freebsd.org/">mirror</a>)</>
+	  <li><a href="http://www.br.FreeBSD.org/">Portuguese</a> (<a
+	      href="http://www2.br.FreeBSD.org/">mirror</a>)</>
 
-	  <li><a href="http://www.sk.freebsd.org/">Slovakian</a></>
+	  <li><a href="http://www.sk.FreeBSD.org/">Slovakian</a></>
 
-	  <li><a href="http://www.es.freebsd.org/es/">Spanish</a>, <a
+	  <li><a href="http://www.es.FreeBSD.org/es/">Spanish</a>, <a
 	      href="es/FAQ/FAQ.html">FAQ</a></>
 
-	  <li><a href="http://www.freebsd.org.ru/">Russian</a>, <a
+	  <li><a href="http://www.FreeBSD.org.ru/">Russian</a>, <a
 	      href="ru/FAQ/FAQ.html">FAQ</a></>
 	</ul>
 	
@@ -164,7 +164,7 @@
       </li>
 
       <!--
-      http://www.tw.freebsd.org/    Local language
+      http://www.tw.FreeBSD.org/    Local language
       -->
 
       <li><p>For information on recent FreeBSD progress and releases, see the
@@ -184,34 +184,34 @@
     <p>Current FreeBSD problem reports are tracked using the GNATS database.<p>
       
     <ul>
-      <li><a href="http://www.freebsd.org/cgi/query-pr-summary.cgi">View the
+      <li><a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">View the
 	  open problem reports</a>.</li>
       
-      <li><a href="http://www.freebsd.org/cgi/query-pr.cgi">View a problem
+      <li><a href="http://www.FreeBSD.org/cgi/query-pr.cgi">View a problem
 	  report by tracker id</a>.</li>
       
       <li><a
-	  href="http://www.freebsd.org/cgi/query-pr-summary.cgi?query">Formulate
+	  href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">Formulate
 	  a specific query</a>.</li>
       
-      <li><a href="http://www.freebsd.org/send-pr.html">Submit a Problem
+      <li><a href="http://www.FreeBSD.org/send-pr.html">Submit a Problem
 	  Report</a>.</li>
     </ul>
 
     <p>Problem reports may also be submitted to the development team using the
-      <a href="http://www.freebsd.org/send-pr.html">send-pr(1)</a> command on
+      <a href="http://www.FreeBSD.org/send-pr.html">send-pr(1)</a> command on
       a FreeBSD system or by sending an email message to <a
 	href="mailto:freebsd-bugs@FreeBSD.ORG">freebsd-bugs@FreeBSD.ORG</a>.
       Please note that <a
-	href="http://www.freebsd.org/send-pr.html">send-pr</a> is preferred
+	href="http://www.FreeBSD.org/send-pr.html">send-pr</a> is preferred
       since messages sent to the mailing list are <em>not</em> tracked as
       official problem reports!
 
       <a name="cvs"></a>
       
-    <h2><a href="http://www.freebsd.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
+    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
     
-    <p><a href="http://www.freebsd.org/cgi/man.cgi?cvs">CVS</a> (the
+    <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (the
       Concurrent Version System) is the tool we use for keeping our sources
       under control.  Every change (with accompanying log message explaining
       its purpose) from FreeBSD 2.0 to the present is stored here, and can be
@@ -234,23 +234,23 @@
 	very low overhead, batch-mode access (basically, patches through
 	email) access.</li>
 
-      <li>The <a href="http://www.freebsd.org/cgi/cvsweb.cgi">web interface</a>
+      <li>The <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web interface</a>
 	if you're looking to simply browse the repository in search of a
 	specific change or file revision.</li>
 
       <li>Finally, if you've got bandwidth to burn or you prefer / are forced
 	to use FTP, you can simply mirror the CVS repository from <a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.freebsd.org</a>.
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.FreeBSD.org</a>.
       </li>
     </ul>
 
     <p>Mirrors of the CVS Repository cgi script are available in <a
-	href="http://www.freebsd.org/cgi/cvsweb.cgi">California</a>, <a
-	href="http://www.de.freebsd.org/cgi/cvsweb.cgi">Germany</a>, <a
-	href="http://www.jp.freebsd.org/cgi/cvsweb.cgi">
+	href="http://www.FreeBSD.org/cgi/cvsweb.cgi">California</a>, <a
+	href="http://www.de.FreeBSD.org/cgi/cvsweb.cgi">Germany</a>, <a
+	href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">
 	Japan</a> and Spain (<a
-	href="http://www.es.freebsd.org/cgi/cvsweb.cgi">English</a>, <a
-	href="http://www.es.freebsd.org/cgi/cvsweb-es.cgi">Spanish</a>).</p>
+	href="http://www.es.FreeBSD.org/cgi/cvsweb.cgi">English</a>, <a
+	href="http://www.es.FreeBSD.org/cgi/cvsweb-es.cgi">Spanish</a>).</p>
 
     <a name="user"></a>
     
@@ -258,7 +258,7 @@
     
     <p>FreeBSD's widespread popularity has spawned a number of user groups
       around the world.  If you know of a FreeBSD user group not listed here,
-      <a href="mailto:www@freebsd.org">let us know</a> about it.</p>
+      <a href="mailto:www@FreeBSD.org">let us know</a> about it.</p>
     
     <h3>Australia</h3>
     
@@ -287,19 +287,19 @@
 	  chair. <p></p></li>
 
       <li><strong>New South Wales.</strong> The <A
-	  HREF="http://www.bugs.au.freebsd.org/">BSD Users Group,
+	  HREF="http://www.bugs.au.FreeBSD.org/">BSD Users Group,
 	  Sydney</a> (BUGS) meets in Sydney every two months and has
 	  mailing list members from all over NSW. To join the mailing
 	  list send a message to <a
-	  href="mailto:majordomo@bugs.au.freebsd.org">majordomo@bugs.au.freebsd.org</a>
+	  href="mailto:majordomo@bugs.au.FreeBSD.org">majordomo@bugs.au.FreeBSD.org</a>
 	  with <code>subscribe bugs</code> in the body of the message.
 	<p></p></li>
       
       <li><strong>Victoria.</strong> <A
-	  HREF="http://www.vicfug.au.freebsd.org/">Victoria's FreeBSD
+	  HREF="http://www.vicfug.au.FreeBSD.org/">Victoria's FreeBSD
 	  Users Group</a> (VicFUG) is based in Melbourne.  You can
 	  join the mailing list by sending an empty message to <A
-	  HREF="mailto:general-subscribe@vicfug.au.freebsd.org">general-subscribe@vicfug.au.freebsd.org</a>
+	  HREF="mailto:general-subscribe@vicfug.au.FreeBSD.org">general-subscribe@vicfug.au.FreeBSD.org</a>
 	</li>
     </ul>
 
@@ -371,7 +371,7 @@
 	<p></p></li>
 
       <li><strong>United Kingdom</strong> The <a
-	  href="http://ukug.uk.freebsd.org/">FreeBSD UKUG</a> (FreeBSD UK
+	  href="http://ukug.uk.FreeBSD.org/">FreeBSD UKUG</a> (FreeBSD UK
 	User's Group) exists for the benefit of FreeBSD users in the United
 	Kingdom.  Please follow the link for details.
 
@@ -616,7 +616,7 @@
 	<p></p></li>
       
       <li><strong>New Zealand</strong> The <a
-	  href="http://www.nzfug.nz.freebsd.org">New Zealand FreeBSD User's
+	  href="http://www.nzfug.nz.FreeBSD.org">New Zealand FreeBSD User's
 	  group</a> is located in Wellington.  No meetings have been scheduled
 	yet.
 
@@ -695,7 +695,7 @@
 
       <li>Laptop users looking for PCCARD (aka PCMCIA) support not already
 	provided in the FreeBSD base distribution should see the <a
-	  href="http://www.jp.freebsd.org/PAO/">PAO</a> distribution page for
+	  href="http://www.jp.FreeBSD.org/PAO/">PAO</a> distribution page for
 	the latest and greatest experimental laptop support.</li>
 
       <li><a href="http://www.x86.org/">Intel Secrets -- What Intel Doesn't
diff --git a/en/tutorials/index.sgml b/en/tutorials/index.sgml
index ebe62bddc9..05dbd68887 100644
--- a/en/tutorials/index.sgml
+++ b/en/tutorials/index.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/tutorials/index.sgml,v 1.7 1999/09/07 19:12:16 jhb Exp $">
+<!ENTITY date "$FreeBSD: www/en/tutorials/index.sgml,v 1.8 1999/09/17 23:52:10 nik Exp $">
 <!ENTITY title "FreeBSD Tutorials">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/tutorials/index.sgml,v 1.7 1999/09/07 19:12:16 jhb Exp $ -->
+<!-- $FreeBSD: www/en/tutorials/index.sgml,v 1.8 1999/09/17 23:52:10 nik Exp $ -->
 
 <html>
 &header;
@@ -39,11 +39,11 @@
       <li><a href="http://www.nothing-going-on.demon.co.uk/FreeBSD/make-world/make-world.html">Upgrading FreeBSD from source (using <b><tt>make world</tt></b>)</a></li>
       <li><a href="http://www.freebsd-fr.org/tutorials/make-world/index.html">Upgrading FreeBSD from source (using <b><tt>make world</tt></b>)</a> - French Translation</li>
 
-      <li><a href="http://ukug.uk.freebsd.org/~mark/ntfs_install_2.2.html">Installing the FreeBSD 2.2.x NTFS (NT file system) driver</a></li>
+      <li><a href="http://ukug.uk.FreeBSD.org/~mark/ntfs_install_2.2.html">Installing the FreeBSD 2.2.x NTFS (NT file system) driver</a></li>
 
-      <li><a href="http://ukug.uk.freebsd.org/~mark/ntfs_install_3.1.html">Installing the FreeBSD 3.1 NTFS driver</a></li>
+      <li><a href="http://ukug.uk.FreeBSD.org/~mark/ntfs_install_3.1.html">Installing the FreeBSD 3.1 NTFS driver</a></li>
 
-      <li><a href="http://www.freebsd.org/~rpratt/227/">FreeBSD 2.2.7 Installation Details for Newbies</a>
+      <li><a href="http://www.FreeBSD.org/~rpratt/227/">FreeBSD 2.2.7 Installation Details for Newbies</a>
        
       <li><a href="&base;/tutorials/docproj-primer/">FreeBSD Documentation 
         Project Primer</a> (many small HTML files)</li>
diff --git a/en/usergroups.sgml b/en/usergroups.sgml
index 85db0028db..6f8e7a91a2 100644
--- a/en/usergroups.sgml
+++ b/en/usergroups.sgml
@@ -1,9 +1,9 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.175 1999/12/05 20:24:16 joe Exp $">
+<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.176 1999/12/10 10:50:49 wosch Exp $">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/support.sgml,v 1.175 1999/12/05 20:24:16 joe Exp $ -->
+<!-- $FreeBSD: www/en/support.sgml,v 1.176 1999/12/10 10:50:49 wosch Exp $ -->
 
 <html>
     &header;
@@ -33,16 +33,16 @@
       numerous mailing lists covering different topic areas.  When in doubt
       about what list to post a question to, post to <a
 	href="mailto:freebsd-questions@FreeBSD.ORG">freebsd-questions@FreeBSD.ORG</a>.  You can <strong><a
-	  href="http://www.freebsd.org/mail/">browse</a></strong> or
+	  href="http://www.FreeBSD.org/mail/">browse</a></strong> or
       <strong><a href="&base/search/search.html#mailinglists">search</a></strong> the
       mailing list archives at <a
-	href="http://www.freebsd.org/">www.freebsd.org.</a></p>
+	href="http://www.FreeBSD.org/">www.FreeBSD.org.</a></p>
     
     <p>Several non-English mailing lists are also available:</p>
 
     <ul>
       <li><strong>Traditional Chinese</strong> -- <a
-	  href="mailto:majordomo@maillist.tw.freebsd.org">majordomo@maillist.tw.freebsd.org</a>, Big5 encoding.</li>
+	  href="mailto:majordomo@maillist.tw.FreeBSD.org">majordomo@maillist.tw.FreeBSD.org</a>, Big5 encoding.</li>
       
       <li><strong>Simplified Chinese</strong> -- <a
 	  href="mailto:majordomo@cn.FreeBSD.org">majordomo@cn.FreeBSD.org</a>,
@@ -52,8 +52,8 @@
 	  href="mailto:majordomo@freebsd.cz">majordomo@freebsd.cz</a></li>
       
       <li><strong>German</strong> -- <a
-	  href="mailto:majordomo@de.freebsd.org">majordomo@de.freebsd.org</a>
-	or <a href="http://www.de.freebsd.org/de/mailinglists.html">WWW</a>.</li>
+	  href="mailto:majordomo@de.FreeBSD.org">majordomo@de.FreeBSD.org</a>
+	or <a href="http://www.de.FreeBSD.org/de/mailinglists.html">WWW</a>.</li>
 	
       <li><strong>French</strong> -- <a
 	  href="mailto:listserver@freebsd-fr.org">listserver@freebsd-fr.org</a>
@@ -65,32 +65,32 @@
 	information.</li>
 
       <li><strong>Hungarian</strong> -- <a
-	  href="mailto:majordomo@hu.freebsd.org">majordomo@hu.freebsd.org</a></li>
+	  href="mailto:majordomo@hu.FreeBSD.org">majordomo@hu.FreeBSD.org</a></li>
 
       <li><strong>Indonesian</strong> -- <a
 	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
       
       <li><strong>Japanese</strong> -- <a
-	  href="mailto:majordomo@jp.freebsd.org">majordomo@jp.freebsd.org</a></li>
+	  href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a></li>
       
       <li><strong>Korean</strong> -- <a
-	  href="mailto:majordomo@kr.freebsd.org">majordomo@kr.freebsd.org</a>
+	  href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
 	or <a
-	  href="http://www.kr.freebsd.org/support.shtml#mailing-list">WWW</a></li>
+	  href="http://www.kr.FreeBSD.org/support.shtml#mailing-list">WWW</a></li>
 	
       <li><strong>Polish</strong> -- <a
 	  href="mailto:majordomo@pap.waw.pl">majordomo@pap.waw.pl</a></li>
 
       <li><strong>Portuguese</strong> -- <a
-	  href="mailto:listproc@br.freebsd.org">listproc@br.freebsd.org</a>
+	  href="mailto:listproc@br.FreeBSD.org">listproc@br.FreeBSD.org</a>
 	or <a
-	  href="http://www.br.freebsd.org/list.html">WWW</a></li>
+	  href="http://www.br.FreeBSD.org/list.html">WWW</a></li>
 
       <li><strong>Slovakian</strong> -- <a
-	  href="mailto:majordomo@sk.freebsd.org">majordomo@sk.freebsd.org</a></li>
+	  href="mailto:majordomo@sk.FreeBSD.org">majordomo@sk.FreeBSD.org</a></li>
 
       <li><strong>Spanish</strong> -- <a
-	  href="mailto:majordomo@es.freebsd.org">majordomo@es.freebsd.org</a></li>
+	  href="mailto:majordomo@es.FreeBSD.org">majordomo@es.FreeBSD.org</a></li>
     </ul>
     
     <p>If you create other FreeBSD mailing lists, <a
@@ -120,10 +120,10 @@
     <ul>
       <li><p>Our WEB pages remain one of the best sources of information, and
 	  are also mirrored at many sites around the world.  Try connecting to
-	  www.<b>yourcountry</b>.freebsd.org (e.g. <a
-	    href="http://www.de.freebsd.org/">www.de.freebsd.org</a> for
+	  www.<b>yourcountry</b>.FreeBSD.org (e.g. <a
+	    href="http://www.de.FreeBSD.org/">www.de.FreeBSD.org</a> for
 	  Germany or <a
-	    href="http://www.au.freebsd.org/">www.au.freebsd.org</a> for
+	    href="http://www.au.FreeBSD.org/">www.au.FreeBSD.org</a> for
 	  Australia), or select a mirror from the list on the <a
 	    href="&base/index.html">home page</>.  The same naming convention
 	  is also used for <b>FTP</b> servers.</p>
@@ -132,31 +132,31 @@
 	  are available:</p>
 	
 	<ul>
-	  <li><a href="http://www.cz.freebsd.org/">Czech</a></>
+	  <li><a href="http://www.cz.FreeBSD.org/">Czech</a></>
 	  
 	  <li><a href="zh/FAQ/FAQ.html">Chinese FAQ</a></>
 	  
-	  <li><a href="http://www.de.freebsd.org/de/">German</a></>
+	  <li><a href="http://www.de.FreeBSD.org/de/">German</a></>
 	  
-	  <li><a href="http://www.hu.freebsd.org/hu/">Hungarian</a></>
+	  <li><a href="http://www.hu.FreeBSD.org/hu/">Hungarian</a></>
 	  
 	  <li><a href="http://www.freebsd.or.id">Indonesian</a></>
 	  
-	  <li><a href="http://www.jp.freebsd.org/">Japanese</a></>
+	  <li><a href="http://www.jp.FreeBSD.org/">Japanese</a></>
 	  
-	  <li><a href="http://www.kr.freebsd.org/">Korean</a></>
+	  <li><a href="http://www.kr.FreeBSD.org/">Korean</a></>
 	  
-	  <li><a href="http://www.freebsd.org.pl">Polish</a></>
+	  <li><a href="http://www.FreeBSD.org.pl">Polish</a></>
 	  
-	  <li><a href="http://www.br.freebsd.org/">Portuguese</a> (<a
-	      href="http://www2.br.freebsd.org/">mirror</a>)</>
+	  <li><a href="http://www.br.FreeBSD.org/">Portuguese</a> (<a
+	      href="http://www2.br.FreeBSD.org/">mirror</a>)</>
 
-	  <li><a href="http://www.sk.freebsd.org/">Slovakian</a></>
+	  <li><a href="http://www.sk.FreeBSD.org/">Slovakian</a></>
 
-	  <li><a href="http://www.es.freebsd.org/es/">Spanish</a>, <a
+	  <li><a href="http://www.es.FreeBSD.org/es/">Spanish</a>, <a
 	      href="es/FAQ/FAQ.html">FAQ</a></>
 
-	  <li><a href="http://www.freebsd.org.ru/">Russian</a>, <a
+	  <li><a href="http://www.FreeBSD.org.ru/">Russian</a>, <a
 	      href="ru/FAQ/FAQ.html">FAQ</a></>
 	</ul>
 	
@@ -164,7 +164,7 @@
       </li>
 
       <!--
-      http://www.tw.freebsd.org/    Local language
+      http://www.tw.FreeBSD.org/    Local language
       -->
 
       <li><p>For information on recent FreeBSD progress and releases, see the
@@ -184,34 +184,34 @@
     <p>Current FreeBSD problem reports are tracked using the GNATS database.<p>
       
     <ul>
-      <li><a href="http://www.freebsd.org/cgi/query-pr-summary.cgi">View the
+      <li><a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">View the
 	  open problem reports</a>.</li>
       
-      <li><a href="http://www.freebsd.org/cgi/query-pr.cgi">View a problem
+      <li><a href="http://www.FreeBSD.org/cgi/query-pr.cgi">View a problem
 	  report by tracker id</a>.</li>
       
       <li><a
-	  href="http://www.freebsd.org/cgi/query-pr-summary.cgi?query">Formulate
+	  href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">Formulate
 	  a specific query</a>.</li>
       
-      <li><a href="http://www.freebsd.org/send-pr.html">Submit a Problem
+      <li><a href="http://www.FreeBSD.org/send-pr.html">Submit a Problem
 	  Report</a>.</li>
     </ul>
 
     <p>Problem reports may also be submitted to the development team using the
-      <a href="http://www.freebsd.org/send-pr.html">send-pr(1)</a> command on
+      <a href="http://www.FreeBSD.org/send-pr.html">send-pr(1)</a> command on
       a FreeBSD system or by sending an email message to <a
 	href="mailto:freebsd-bugs@FreeBSD.ORG">freebsd-bugs@FreeBSD.ORG</a>.
       Please note that <a
-	href="http://www.freebsd.org/send-pr.html">send-pr</a> is preferred
+	href="http://www.FreeBSD.org/send-pr.html">send-pr</a> is preferred
       since messages sent to the mailing list are <em>not</em> tracked as
       official problem reports!
 
       <a name="cvs"></a>
       
-    <h2><a href="http://www.freebsd.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
+    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
     
-    <p><a href="http://www.freebsd.org/cgi/man.cgi?cvs">CVS</a> (the
+    <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (the
       Concurrent Version System) is the tool we use for keeping our sources
       under control.  Every change (with accompanying log message explaining
       its purpose) from FreeBSD 2.0 to the present is stored here, and can be
@@ -234,23 +234,23 @@
 	very low overhead, batch-mode access (basically, patches through
 	email) access.</li>
 
-      <li>The <a href="http://www.freebsd.org/cgi/cvsweb.cgi">web interface</a>
+      <li>The <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web interface</a>
 	if you're looking to simply browse the repository in search of a
 	specific change or file revision.</li>
 
       <li>Finally, if you've got bandwidth to burn or you prefer / are forced
 	to use FTP, you can simply mirror the CVS repository from <a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.freebsd.org</a>.
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.FreeBSD.org</a>.
       </li>
     </ul>
 
     <p>Mirrors of the CVS Repository cgi script are available in <a
-	href="http://www.freebsd.org/cgi/cvsweb.cgi">California</a>, <a
-	href="http://www.de.freebsd.org/cgi/cvsweb.cgi">Germany</a>, <a
-	href="http://www.jp.freebsd.org/cgi/cvsweb.cgi">
+	href="http://www.FreeBSD.org/cgi/cvsweb.cgi">California</a>, <a
+	href="http://www.de.FreeBSD.org/cgi/cvsweb.cgi">Germany</a>, <a
+	href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">
 	Japan</a> and Spain (<a
-	href="http://www.es.freebsd.org/cgi/cvsweb.cgi">English</a>, <a
-	href="http://www.es.freebsd.org/cgi/cvsweb-es.cgi">Spanish</a>).</p>
+	href="http://www.es.FreeBSD.org/cgi/cvsweb.cgi">English</a>, <a
+	href="http://www.es.FreeBSD.org/cgi/cvsweb-es.cgi">Spanish</a>).</p>
 
     <a name="user"></a>
     
@@ -258,7 +258,7 @@
     
     <p>FreeBSD's widespread popularity has spawned a number of user groups
       around the world.  If you know of a FreeBSD user group not listed here,
-      <a href="mailto:www@freebsd.org">let us know</a> about it.</p>
+      <a href="mailto:www@FreeBSD.org">let us know</a> about it.</p>
     
     <h3>Australia</h3>
     
@@ -287,19 +287,19 @@
 	  chair. <p></p></li>
 
       <li><strong>New South Wales.</strong> The <A
-	  HREF="http://www.bugs.au.freebsd.org/">BSD Users Group,
+	  HREF="http://www.bugs.au.FreeBSD.org/">BSD Users Group,
 	  Sydney</a> (BUGS) meets in Sydney every two months and has
 	  mailing list members from all over NSW. To join the mailing
 	  list send a message to <a
-	  href="mailto:majordomo@bugs.au.freebsd.org">majordomo@bugs.au.freebsd.org</a>
+	  href="mailto:majordomo@bugs.au.FreeBSD.org">majordomo@bugs.au.FreeBSD.org</a>
 	  with <code>subscribe bugs</code> in the body of the message.
 	<p></p></li>
       
       <li><strong>Victoria.</strong> <A
-	  HREF="http://www.vicfug.au.freebsd.org/">Victoria's FreeBSD
+	  HREF="http://www.vicfug.au.FreeBSD.org/">Victoria's FreeBSD
 	  Users Group</a> (VicFUG) is based in Melbourne.  You can
 	  join the mailing list by sending an empty message to <A
-	  HREF="mailto:general-subscribe@vicfug.au.freebsd.org">general-subscribe@vicfug.au.freebsd.org</a>
+	  HREF="mailto:general-subscribe@vicfug.au.FreeBSD.org">general-subscribe@vicfug.au.FreeBSD.org</a>
 	</li>
     </ul>
 
@@ -371,7 +371,7 @@
 	<p></p></li>
 
       <li><strong>United Kingdom</strong> The <a
-	  href="http://ukug.uk.freebsd.org/">FreeBSD UKUG</a> (FreeBSD UK
+	  href="http://ukug.uk.FreeBSD.org/">FreeBSD UKUG</a> (FreeBSD UK
 	User's Group) exists for the benefit of FreeBSD users in the United
 	Kingdom.  Please follow the link for details.
 
@@ -616,7 +616,7 @@
 	<p></p></li>
       
       <li><strong>New Zealand</strong> The <a
-	  href="http://www.nzfug.nz.freebsd.org">New Zealand FreeBSD User's
+	  href="http://www.nzfug.nz.FreeBSD.org">New Zealand FreeBSD User's
 	  group</a> is located in Wellington.  No meetings have been scheduled
 	yet.
 
@@ -695,7 +695,7 @@
 
       <li>Laptop users looking for PCCARD (aka PCMCIA) support not already
 	provided in the FreeBSD base distribution should see the <a
-	  href="http://www.jp.freebsd.org/PAO/">PAO</a> distribution page for
+	  href="http://www.jp.FreeBSD.org/PAO/">PAO</a> distribution page for
 	the latest and greatest experimental laptop support.</li>
 
       <li><a href="http://www.x86.org/">Intel Secrets -- What Intel Doesn't
diff --git a/en/where.sgml b/en/where.sgml
index 11fa6ae18a..0a8da113db 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.38 1999/09/06 07:02:37 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.39 1999/09/22 06:04:18 chris Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/where.sgml,v 1.38 1999/09/06 07:02:37 peter Exp $ -->
+<!-- $FreeBSD: www/en/where.sgml,v 1.39 1999/09/22 06:04:18 chris Exp $ -->
 
 <html>
     &header;
@@ -35,13 +35,13 @@
       
     <ul>
       <li>Anonymous ftp from <a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD">ftp://ftp.FreeBSD.org/pub/FreeBSD</a>:
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp://ftp.FreeBSD.org/pub/FreeBSD</a>:
 	
 	<ul>
 	  <li><a
-	      href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/2.2.8-RELEASE">FreeBSD 2.2.8-RELEASE</a></li>
+	      href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/2.2.8-RELEASE">FreeBSD 2.2.8-RELEASE</a></li>
 	  
-	  <li><a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/3.3-RELEASE">FreeBSD 3.3-RELEASE</a></li>
+	  <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.3-RELEASE">FreeBSD 3.3-RELEASE</a></li>
 	</ul>
       </li>
       
@@ -61,7 +61,7 @@
     <p>If you're interesting in a purely experimental <strong>snapshot</strong>
       release of FreeBSD-current (AKA 4.0-current), aimed at developers and
       bleeding-edge testers only, then please see the <a
-	href="ftp://current.freebsd.org/pub/FreeBSD/">daily snapshot
+	href="ftp://current.FreeBSD.org/pub/FreeBSD/">daily snapshot
 	server</a> FTP site.  This site also contains daily snapshots of the
       2.2-stable branch.</p>
 
@@ -77,13 +77,13 @@
 
     <ul>
       <li><a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/branches/-current/packages">Packages for FreeBSD-current</a></li>
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/-current/packages">Packages for FreeBSD-current</a></li>
       
       <li><a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/branches/2.2-stable/packages">Packages for FreeBSD 2.2-stable</a></li>
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/2.2-stable/packages">Packages for FreeBSD 2.2-stable</a></li>
       
       <li><a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/branches/3.2-stable/packages">Packages for FreeBSD 3.2-stable</a></li>
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/3.2-stable/packages">Packages for FreeBSD 3.2-stable</a></li>
     </ul>
 
     <h3>The Ports collection</h3>
@@ -95,10 +95,10 @@
       than the "package" version.</p>
 
     <ul>
-      <li><a href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports-current">Ports
+      <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports-current">Ports
 	  for FreeBSD-current</a></li>
 
-      <li><a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/2.2.8-RELEASE/ports">Ports
+      <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/2.2.8-RELEASE/ports">Ports
 	  for FreeBSD 2.2.8-RELEASE</a></li>
       
       <li><a href="ports/index.html">WWW interface
@@ -121,7 +121,7 @@
 
     <ul>
       <li><a
-	  href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/2.2.8-RELEASE/commerce">Commercial
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/2.2.8-RELEASE/commerce">Commercial
 	  products for FreeBSD 2.2.8</a></li>
       
       <li><a href="commercial/commercial.html">Commercial vendors supporting
diff --git a/en/y2kbug.sgml b/en/y2kbug.sgml
index 59e9962247..c354dc9bfa 100644
--- a/en/y2kbug.sgml
+++ b/en/y2kbug.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/y2kbug.sgml,v 1.32 1999/10/05 00:08:00 chris Exp $">
+<!ENTITY date "$FreeBSD: www/en/y2kbug.sgml,v 1.33 1999/11/12 21:55:52 jim Exp $">
 <!ENTITY title 'Year 2000 Compatibility (aka "Millennium Bug")'>
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/y2kbug.sgml,v 1.32 1999/10/05 00:08:00 chris Exp $ -->
+<!-- $FreeBSD: www/en/y2kbug.sgml,v 1.33 1999/11/12 21:55:52 jim Exp $ -->
 
 <html>
     &header;
@@ -86,7 +86,7 @@
     
     <dl>
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1380">misc/1380</a></dt>
       
       <dd>Several programs have a hardcoded 19%d in responses for the year.
 	Affected programs include: yacc, ftpd, and make.  [Fixed: yacc v1.2
@@ -94,14 +94,14 @@
 	FreeBSD-2.2 and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=1382">conf/1382</a></dt>
       
       <dd>The sed script in /etc/rc.local that builds the host/kernel ID line
 	for the message of the day relies on the year not going past 1999.
 	[Fixed v1.21 1996/10/24; fixes in FreeBSD-2.2 and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3465">misc/3465</a></dt>
       
       <dd>The etc/namedb/make-localhost command generates the DNS serial
 	number as YYMMDD. In the year 2000, this will be generated as
@@ -109,9 +109,9 @@
 	above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> and
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=4930">gnu/4930</a> and
 	  <a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=8321">gnu/8321</a></dt>
       
       <dd>groff tmac macros have hardcoded 19 for generating some dates.
 	[Fixed: tmac.e v1.3 1998/12/06; doc-common v1.10 1999/01/19; fixes in
@@ -119,7 +119,7 @@
 
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9323">bin/9323</a></dt>
       
       <dd>In its obsolescent form, touch doesn't treat the two digit year
         year specification correctly.  Years in the range 00-68 are treated
@@ -127,7 +127,7 @@
         FreeBSD-3.1 and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
+	  href="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
       
       <dd>The leap year calculations for the number of days in a year, and the
 	conversion of DCF77 time to seconds since the Epoch were wrong.  These
@@ -135,7 +135,7 @@
 	FreeBSD-3.1 and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/cvsweb.cgi/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
+	  href="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
       
       <dd>Function Convert() was hard-coded for two digit years in range 70-99.
 	Now adjusted to allow two digit years for 1970-2069.  The function
@@ -144,7 +144,7 @@
       </dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
+	  href="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
       
       <dd>The HTTP protocol includes an obsolete date format which uses a
 	two-digit year.  Previous versions of fetch would interpret all such
@@ -158,14 +158,14 @@
 	and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9500">misc/9500</a></dt>
       
       <dd>The `edithook' script in the CVSROOT directory uses a raw tm_year
 	and will therefore display 01/01/100 for 2000-JAN-01.  [Fixed v1.2
 	1999/01/17; not relevant to FreeBSD releases]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9501">bin/9501</a></dt>
       
       <dd>Several cvs contrib files are not Y2K compliant.  The log.pl and
 	sccs2rcs.csh scripts prepend `19' to the year resulting in a display
@@ -175,7 +175,7 @@
 	sccs2rcs.csh v1.3 1999/01/15; fixes in FreeBSD-3.1 and above]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9502">bin/9502</a></dt>
       <dd>The groff number register `yr' is assigned from a (struct
 	tm).tm_year and therefore represents the number of years since 1900,
 	not the year within the century (see definition in troff/input.cc).
@@ -183,27 +183,27 @@
 	in FreeBSD-3.3]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9503">bin/9503</a></dt>
       
       <dd>PicoBSD's simple_httpd uses a raw tm_year and will therefore display
 	01/01/100 for 2000-JAN-01.  [Fixed v1.2 1999/01/16; fixes in
 	FreeBSD-3.1 and above]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9505">bin/9505</a></dt>
       
       <dd>Adduser uses a raw tm_year and will therefore display 100/01/01 for
 	2000-JAN-01.  [Fixed v1.42 1999/01/15; fixes in FreeBSD-3.1 and
 	above]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9506">bin/9506</a></dt>
       
       <dd>Cron uses a raw tm_year and will therefore display 100 for 2000.
 	[Fixed v1.7 1999/01/16; fixes in FreeBSD-3.1 and above]</dd>
 	
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9507">bin/9507</a></dt>
       
       <dd>tcpslice(8) uses a raw tm_year and will therefore display
 	100y01m01d... for 2000-JAN-01.  For compatibility, use a two-digit
@@ -211,13 +211,13 @@
 	above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14472">bin/14472</a></dt>
       
       <dd>Date command does not take thousand/hundred digits. [Fixed v1.31 1999/11/10]
 	</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=14511">misc/14511</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14511">misc/14511</a></dt>
       
       <dd>Chpass has a problem using 00 for expiration year.
 	</dd>
@@ -227,7 +227,7 @@
 
     <dl>
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=7681">ports/7681</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=7681">ports/7681</a></dt>
       
       <dd>TkDesk 1.0 uses a hardcoded 19 in the file listing window.  A file
 	with a date &gt 2000 is displayed with a year looking like "191xx"
@@ -236,14 +236,14 @@
 	and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9295">ports/9295</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9295">ports/9295</a></dt>
 
       <dd>INN 1.7.2 suffers from 2 Y2K related problems.  One occurs when
 	pulling news (-f option to nntpget) and the other relates to the
 	Expire header with relative dates past 2000.  [Both INN ports upgraded
 	to INN 2.2 1999/05/02; fixes in FreeBSD-3.2 and above]</dd>
 
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9298">ports/9298</a></dt>
+      <dt><a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9298">ports/9298</a></dt>
 
       <dd>Knews suffers from 2 Y2K related problems.  One occurs during the
 	generation of the NNTP NEWGROUPS command.  The other occurs because
@@ -252,13 +252,13 @@
 	above]</dd>                               
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=9300">ports/9300</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=9300">ports/9300</a></dt>
 
       <dd>Nntp-t5 suffers from a Y2K problem during the generation of the
 	NEWNEWS command.  [Port patched 1999/01/05; fixes in FreeBSD-3.1 and
 	above]</dd>
 
-      <dt><a href="http://www.freebsd.org/cgi/query-pr.cgi?pr=11144">ports/11144</a></dt>
+      <dt><a href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=11144">ports/11144</a></dt>
 
       <dd>The tiff port has a hardcoded 19xx.  While this is in the contrib
 	section (for converting Sun rasterfile format to TIFF), and not
@@ -267,14 +267,14 @@
 	above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=11145">ports/11145</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=11145">ports/11145</a></dt>
 
       <dd>The dgs port suffers from the same TIFF related problem as the tiff
 	port.  [contrib routine for converting Sun rasterfiles to TIFF] [Port
 	patched 1999/04/18; fixes in FreeBSD-3.2 and above]</dd>
 
       <dt><a
-	  href="http://www.freebsd.org/cgi/query-pr.cgi?pr=13694">ports/13694</a></dt>
+	  href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=13694">ports/13694</a></dt>
 
       <dd>The slurp port has a problem generating a correctly formatted host file
       name when tm_year is greater than 100. [Port patched 1999/10/27; fixes
diff --git a/share/sgml/advisories.xml b/share/sgml/advisories.xml
index 4715335dd9..50aa1f8867 100644
--- a/share/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.17 1999/09/22 21:54:16 chris Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.18 1999/11/09 13:05:25 kuriyama Exp $ -->
 
 <html>
     &header;
@@ -38,7 +38,7 @@ introduce security holes in the first place.</P>
 
 <P>To better coordinate information exchange with others in the security
 community, FreeBSD has a focal point for security related communications:
-The FreeBSD <a href="mailto:security-officer@freebsd.org">security officer</a>.
+The FreeBSD <a href="mailto:security-officer@FreeBSD.org">security officer</a>.
 The position is actually staffed by a team of dedicated security officers,
 their main tasks being to send out advisories when there are known security
 holes and to act on reports of possible security problems with FreeBSD.</P>
@@ -56,7 +56,7 @@ active members of those organizations.</P>
 
 <P>If you do need to contact the Security Officer about a particularly
 sensitive matter, please use their <A
-HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc">PGP key
+HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc">PGP key
 </A> to encrypt your message before sending it.</P>
 
 <A NAME=adv></A>
@@ -93,57 +93,57 @@ out.</P>
 
 <P>Advisories are sent to the following FreeBSD mailing lists:
 <UL>
-<LI>FreeBSD-security-notifications@freebsd.org
-<LI>FreeBSD-security@freebsd.org
-<LI>FreeBSD-announce@freebsd.org
+<LI>FreeBSD-security-notifications@FreeBSD.org
+<LI>FreeBSD-security@FreeBSD.org
+<LI>FreeBSD-announce@FreeBSD.org
 </UL>
 
 
 <P>Advisories are always signed using the FreeBSD Security Officer
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc"> PGP key
 </A> and are archived, along with their associated patches, at our
-<A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/index.html">FTP CERT
+<A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html">FTP CERT
 repository</A>.  At the time of this writing, the following advisories are
 currently available:</P>
 
 <UL>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
-<LI><A HREF="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:01.sliplogin.asc">FreeBSD-SA-96:01.sliplogin.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:02.apache.asc">FreeBSD-SA-96:02.apache.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:03.sendmail-suggestion.asc">FreeBSD-SA-96:03.sendmail-suggestion.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:08.syslog.asc">FreeBSD-SA-96:08.syslog.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:09.vfsload.asc">FreeBSD-SA-96:09.vfsload.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:10.mount_union.asc">FreeBSD-SA-96:10.mount_union.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:11.man.asc">FreeBSD-SA-96:11.man.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:12.perl.asc">FreeBSD-SA-96:12.perl.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:13.comsat.asc">FreeBSD-SA-96:13.comsat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:14.ipfw.asc">FreeBSD-SA-96:14.ipfw.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:15.ppp.asc">FreeBSD-SA-96:15.ppp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:16.rdist.asc">FreeBSD-SA-96:16.rdist.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:17.rzsz.asc">FreeBSD-SA-96:17.rzsz.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:18.lpr.asc">FreeBSD-SA-96:18.lpr.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:19.modstat.asc">FreeBSD-SA-96:19.modstat.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:20.stack-overflow.asc">FreeBSD-SA-96:20.stack-overflow.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-96:21.talkd.asc">FreeBSD-SA-96:21.talkd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:02.lpd.asc">FreeBSD-SA-97:02.lpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:03.sysinstall.asc">FreeBSD-SA-97:03.sysinstall.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:04.procfs.asc">FreeBSD-SA-97:04.procfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:05.open.asc">FreeBSD-SA-97:05.open.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-97:06.f00f.asc">FreeBSD-SA-97:06.f00f.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:01.land.asc">FreeBSD-SA-98:01.land.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:02.mmap.asc">FreeBSD-SA-98:02.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:03.ttcp.asc">FreeBSD-SA-98:03.ttcp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:04.mmap.asc">FreeBSD-SA-98:04.mmap.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:05.nfs.asc">FreeBSD-SA-98:05.nfs.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:06.icmp.asc">FreeBSD-SA-98:06.icmp.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:07.rst.asc">FreeBSD-SA-98:07.rst.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-98:08.fragment.asc">FreeBSD-SA-98:08.fragment.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:01.chflags.asc">FreeBSD-SA-99:01.chflags.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:02.profil.asc">FreeBSD-SA-99:02.profil.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:03.ftpd.asc">FreeBSD-SA-99:03.ftpd.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:04.core.asc">FreeBSD-SA-99:04.core.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:05.fts.asc">FreeBSD-SA-99:05.fts.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-99:06.amd.asc">FreeBSD-SA-99:06.amd.asc</A></LI>
 </UL>
 
 <A NAME=ml></A>
@@ -157,7 +157,7 @@ freebsd-security                General security related discussion
 freebsd-security-notifications  Security notifications (moderated mailing list)
 </PRE>
 
-Send mail to <A HREF="mailto:majordomo@freebsd.org">
+Send mail to <A HREF="mailto:majordomo@FreeBSD.org">
 majordomo@FreeBSD.ORG</A> with
 <PRE>
      subscribe &lt;listname&gt;  [&lt;optional address&gt;]
@@ -165,11 +165,11 @@ majordomo@FreeBSD.ORG</A> with
 in the body of the message in order to subscribe yourself.
 For example:
 <PRE>
-% echo "subscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "subscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 and if you would like to unsubscribe from a mailing list:
 <PRE>
-% echo "unsubscribe freebsd-security" | mail majordomo@freebsd.org
+% echo "unsubscribe freebsd-security" | mail majordomo@FreeBSD.org
 </PRE>
 
 <A NAME=spg></A>
@@ -396,8 +396,8 @@ in their hands.<P></P>
 
 <P>There is also a FreeBSD Security How-To available which provides some
 advanced tips on how to improve security of your system.  You can 
-find it at <A HREF="http://www.freebsd.org/~jkb/howto.html">
-http://www.freebsd.org/~jkb/howto.html</A>.</P>
+find it at <A HREF="http://www.FreeBSD.org/~jkb/howto.html">
+http://www.FreeBSD.org/~jkb/howto.html</A>.</P>
 <P>Security is an ongoing process.  Make sure you are following the latest
 developments in the security arena.</P>
 
@@ -421,7 +421,7 @@ Did the breaking occur via a well know security bug? If that is the case,
 make sure to install the correct patches.  Was the breaking successful due
 to a misconfiguration? Was the breakin result of a new bug? If you believe
 the breakin occurred via a new bug, you should warn the
-<A HREF="mailto:security-officer@freebsd.org"> FreeBSD Security 
+<A HREF="mailto:security-officer@FreeBSD.org"> FreeBSD Security 
 Officer</A>.</LI>
 
 <LI><B>Fix the security hole</B><BR>