diff --git a/en/applications.sgml b/en/applications.sgml
index 8ee91f4c71..dbf63cbf31 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: www/en/applications.sgml,v 1.16 1999/12/12 16:23:59 jhb Exp $">
+<!ENTITY date "$FreeBSD: www/en/applications.sgml,v 1.17 2000/05/22 23:25:07 jim Exp $">
 <!ENTITY title "About Applications for FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/applications.sgml,v 1.16 1999/12/12 16:23:59 jhb Exp $ -->
+<!-- $FreeBSD: www/en/applications.sgml,v 1.17 2000/05/22 23:25:07 jim Exp $ -->
 
 <html>
     &header;
@@ -30,7 +30,7 @@
 	corporate needs.</p>
 
       <p>With its generous <a
-	  href="&base/copyright/freebsd-license.html">licensing policy</a>,
+	  href="&base;/copyright/freebsd-license.html">licensing policy</a>,
 	you can use FreeBSD as the basis for any number of free <i>or
 	  commercial </i>applications.</p>
     </blockquote>
@@ -42,11 +42,11 @@
     <blockquote>
       <p>Because FreeBSD is based on 4.4BSD, an industry-standard version of
 	UNIX, it is easy to compile and run programs.  FreeBSD also includes
-	an extensive <a href="&base/where.html">packages collection </a>and <a
-	  href="&base/ports/index.html">ports collection</a> that bring
+	an extensive <a href="&base;/where.html">packages collection </a>and <a
+	  href="&base;/ports/index.html">ports collection</a> that bring
 	precompiled and easy-to-build software right to your desktop or
 	enterprise server.  There is also a growing number of <a
-	  href="&base/commercial/commercial.html">commercial applications</a>
+	  href="&base;/commercial/commercial.html">commercial applications</a>
 	written for FreeBSD.</p>
 
       <p>Here are some examples of the environments in which FreeBSD is
@@ -59,7 +59,7 @@
 	    href="http://www.apache.org/">Apache</a> web server or the Wu-ftpd
 	  FTP&nbsp;server make it easy to set up a business or
 	  community-centered ISP.  Of course, with FreeBSD's unbeatable <a
-	    href="&base/internet.html">networking</a>, your users will enjoy
+	    href="&base;/internet.html">networking</a>, your users will enjoy
 	  high speed, reliable services.</li>
 
 	<li><b>X Window workstation. </b>From an inexpensive X terminal to an
@@ -101,7 +101,7 @@
 	  for FreeBSD today.  If you have an innovative application for
 	  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>
+	    href="&base;/gallery/gallery.html">gallery</a>.</li>
       </ul>
     </blockquote>
     
diff --git a/en/availability.sgml b/en/availability.sgml
index 61ffd12e30..5674c9ae4b 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: www/en/availability.sgml,v 1.27 2001/01/20 15:34:48 alex Exp $">
+<!ENTITY date "$FreeBSD: www/en/availability.sgml,v 1.28 2001/04/11 22:31:43 dd Exp $">
 <!ENTITY title "About FreeBSD's availability">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/availability.sgml,v 1.27 2001/01/20 15:34:48 alex Exp $ -->
+<!-- $FreeBSD: www/en/availability.sgml,v 1.28 2001/04/11 22:31:43 dd Exp $ -->
 
 <html>
     &header;
@@ -50,15 +50,15 @@
       <p>FreeBSD is developed and supported by a worldwide team of
 	programmers. <a href="mailto:jkh@FreeBSD.ORG">Jordan Hubbard,</a> one
 	of the project's founders, has written a <a
-	  href="&base/handbook/history.html">brief history</a> 
+	  href="&base;/handbook/history.html">brief history</a> 
 	  of the FreeBSD project.  Information about <a
-	  href="&base/handbook/staff-who.html">who's responsible for what</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
 	  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
-	<a href="&base/handbook/index.html">FreeBSD Handbook</a>.  FreeBSD is
+	  href="&base;/handbook/contrib.html">Contributors</a> section of the
+	<a href="&base;/handbook/index.html">FreeBSD Handbook</a>.  FreeBSD is
 	an open project, and welcomes the help of individuals who have time and or
 	skills to offer.</p>
       
diff --git a/en/includes.sgml b/en/includes.sgml
index 8bd294e927..a976f94dc0 100644
--- a/en/includes.sgml
+++ b/en/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/includes.sgml,v 1.37 2001/04/11 22:31:43 dd Exp $ -->
+<!-- $FreeBSD: www/en/includes.sgml,v 1.38 2001/04/21 21:03:23 ache Exp $ -->
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
@@ -6,8 +6,8 @@
   <em>before</em> including this file if the page does not live at the
   default location below. 
 
-  When making a  link, use <a href="&base/mypage.html">foo</a> and
-  &base will be expanded appropriately.  Base is also used in the
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
   definition of standard boilerplate entities in this file, so be sure
   base is correct!
 -->
@@ -15,8 +15,8 @@
 <!ENTITY base CDATA ".">
 
 <!-- Images -->
-<!ENTITY i.daemon '<img src="&base/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
-<!ENTITY i.new '<img src="&base/gifs/new.gif" alt="[New!]" width="28" height="11">'>
+<!ENTITY i.daemon '<img src="&base;/gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
+<!ENTITY i.new '<img src="&base;/gifs/new.gif" alt="[New!]" width="28" height="11">'>
 
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
@@ -24,38 +24,38 @@
 <!ENTITY copyright 'Copyright &copy; 1995-2001 The FreeBSD Project.  
   All rights reserved.'>
 <!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base/mailto.html">&email@FreeBSD.ORG</a><br>
+<!ENTITY author '<a href="&base;/mailto.html">&email@FreeBSD.ORG</a><br>
   &copyright;'>
 <!ENTITY date ''>
-<!ENTITY home '<a href="&base/index.html"><img src="&base/gifs/home.gif"
+<!ENTITY home '<a href="&base;/index.html"><img src="&base;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
 
 <!-- Standard headers and footers -->
 
 <!ENTITY header '<head><title>&title;</title></head><body
 text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
-src="&base/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
+src="&base;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
 <h1 align="left"><font color="#660000">&title;</font></h1><br clear="all">
 
 
 <map name="bar">
-<area shape="rect" coords="1,1,111,31" href="&base/index.html" alt="Top">
-<area shape="rect" coords="112,11,196,31" href="&base/ports/index.html" alt="Applications">
-<area shape="rect" coords="196,12,257,33" href="&base/support.html" alt="Support">
-<area shape="rect" coords="256,12,365,33" href="&base/docs.html" alt="Documentation"> 
-<area shape="rect" coords="366,13,424,32" href="&base/commercial/commercial.html" alt="Vendors">
-<area shape="rect" coords="425,16,475,32" href="&base/search/search.html" alt="Search">
-<area shape="rect" coords="477,16,516,33" href="&base/search/index-site.html" alt="Index">
-<area shape="rect" coords="516,15,562,33" href="&base/index.html" alt="Top">
-<area shape="rect" href="&base/index.html" coords="0,0,564,32" alt="Top">
+<area shape="rect" coords="1,1,111,31" href="&base;/index.html" alt="Top">
+<area shape="rect" coords="112,11,196,31" href="&base;/ports/index.html" alt="Applications">
+<area shape="rect" coords="196,12,257,33" href="&base;/support.html" alt="Support">
+<area shape="rect" coords="256,12,365,33" href="&base;/docs.html" alt="Documentation"> 
+<area shape="rect" coords="366,13,424,32" href="&base;/commercial/commercial.html" alt="Vendors">
+<area shape="rect" coords="425,16,475,32" href="&base;/search/search.html" alt="Search">
+<area shape="rect" coords="477,16,516,33" href="&base;/search/index-site.html" alt="Index">
+<area shape="rect" coords="516,15,562,33" href="&base;/index.html" alt="Top">
+<area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="Top">
 </map>'>
 
 <!ENTITY footer '<HR NOSHADE>
 <address>&author;<br>&date;</address>'>
 
 <!-- Short names for various anchor points -->
-<!ENTITY a.latest.not '<a href="&base/releases/3.4R/notes.html">'>
-<!ENTITY a.latest.ann '<a href="&base/releases/3.4R/announce.html">'>
+<!ENTITY a.latest.not '<a href="&base;/releases/3.4R/notes.html">'>
+<!ENTITY a.latest.ann '<a href="&base;/releases/3.4R/announce.html">'>
 
 
 <!-- macro for webbuild paper --> 
diff --git a/en/internet.sgml b/en/internet.sgml
index e8189bb576..dcb30b261c 100644
--- a/en/internet.sgml
+++ b/en/internet.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/internet.sgml,v 1.21 2000/05/22 23:18:57 jim Exp $">
+<!ENTITY date "$FreeBSD: www/en/internet.sgml,v 1.22 2000/10/30 01:22:52 jim Exp $">
 <!ENTITY title "About FreeBSD's Internetworking">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/internet.sgml,v 1.21 2000/05/22 23:18:57 jim Exp $ -->
+<!-- $FreeBSD: www/en/internet.sgml,v 1.22 2000/10/30 01:22:52 jim Exp $ -->
 
 <html>
     &header;
@@ -91,7 +91,7 @@
 	  responsive web servers.</li>
 
 	<li>If that is not enough, visit our <a
-	    href="&base/gallery/gallery.html">Gallery</a> of satisfied FreeBSD
+	    href="&base;/gallery/gallery.html">Gallery</a> of satisfied FreeBSD
 	  users.</li>
       </ul>
       
@@ -108,7 +108,7 @@
 	<li>Enterprise file and print services</li>
       </ul>
       
-      <p>The FreeBSD <a href="&base/ports/index.html">ports collection</a>
+      <p>The FreeBSD <a href="&base;/ports/index.html">ports collection</a>
 	contains ready-to-run software that makes it easy to set up your own
 	Internet server.</p>
     </blockquote>
diff --git a/en/mailto.sgml b/en/mailto.sgml
index 75fe03850d..4ea968ef64 100644
--- a/en/mailto.sgml
+++ b/en/mailto.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/mailto.sgml,v 1.18 2000/10/30 01:54:36 jim Exp $">
+<!ENTITY date "$FreeBSD: www/en/mailto.sgml,v 1.19 2001/04/11 22:31:43 dd Exp $">
 <!ENTITY title "Contacting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/mailto.sgml,v 1.18 2000/10/30 01:54:36 jim Exp $ -->
+<!-- $FreeBSD: www/en/mailto.sgml,v 1.19 2001/04/11 22:31:43 dd Exp $ -->
 
 <html>
     &header;
@@ -22,8 +22,8 @@
     <h2>Questions about the contents of this WWW server...</h2>
     
     <p>Questions or suggestions about our documentation (<a
-	href="&base/handbook/index.html">Handbook</a>, <a href="&base/FAQ/index.html">FAQ</a>, <a
-	href="&base/tutorials/index.html">Tutorials</a>) should be addressed to the
+	href="&base;/handbook/index.html">Handbook</a>, <a href="&base;/FAQ/index.html">FAQ</a>, <a
+	href="&base;/tutorials/index.html">Tutorials</a>) should be addressed to the
       members of the FreeBSD Documentation Project, <a
 	href="mailto:freebsd-doc@FreeBSD.ORG">freebsd-doc@FreeBSD.ORG</a>.</p>
 
diff --git a/en/news/1996/index.sgml b/en/news/1996/index.sgml
index 10a7aed225..2888860929 100644
--- a/en/news/1996/index.sgml
+++ b/en/news/1996/index.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/news/1996/index.sgml,v 1.2 2001/04/11 22:31:45 dd Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/1996/index.sgml,v 1.3 2001/04/13 00:54:02 eric Exp $">
 <!ENTITY title "FreeBSD News flash! (1996)">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
 <!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/en/news/1996/index.sgml,v 1.2 2001/04/11 22:31:45 dd Exp $ -->
+<!-- $FreeBSD: www/en/news/1996/index.sgml,v 1.3 2001/04/13 00:54:02 eric Exp $ -->
 
 <html>
     &header;
@@ -35,9 +35,9 @@
     <ul>
       <li>
 	<p><b>15-Nov-1996</b> FreeBSD <a
-	    href="&base/releases/2.1.6R/security.html">2.1.6-RELEASE</a> is
+	    href="&base;/releases/2.1.6R/security.html">2.1.6-RELEASE</a> is
 	  out.  Please see the <a
-	    href="&base/releases/2.1.6R/security.html">release notes</a> for
+	    href="&base;/releases/2.1.6R/security.html">release notes</a> for
 	  more information.</p>
 	</li>
 
diff --git a/en/news/1997/index.sgml b/en/news/1997/index.sgml
index b0a49ae34e..41de1537bf 100644
--- a/en/news/1997/index.sgml
+++ b/en/news/1997/index.sgml
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/news/1997/index.sgml,v 1.1 2000/03/21 18:45:13 nik Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/1997/index.sgml,v 1.2 2001/04/03 18:21:36 wosch Exp $">
 <!ENTITY title "FreeBSD News flash! (1997)">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
 <!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
 <!ENTITY ftp "ftp://ftp.FreeBSD.org/pub/FreeBSD">
 ]>
-<!-- $FreeBSD: www/en/news/1997/index.sgml,v 1.1 2000/03/21 18:45:13 nik Exp $ -->
+<!-- $FreeBSD: www/en/news/1997/index.sgml,v 1.2 2001/04/03 18:21:36 wosch Exp $ -->
 
 <html>
     &header;
@@ -73,7 +73,7 @@
     <ul>
       <li>
 	<p><b>22-Oct-97</b> FreeBSD 2.2.5 has been released.  See the <a
-	    href="&base/releases/index.html">Release Information</a> page for
+	    href="&base;/releases/index.html">Release Information</a> page for
 	  details.  Also be sure to check the <a
 	    href="&ftp;/2.2.5-RELEASE/ERRATA.TXT"> release errata</a> after
 	  installation for any late-breaking issues with 2.2.5 that you should
@@ -204,7 +204,7 @@
 	<p><b>25-Mar-97</b> <a href="&ftp;/2.2.1-RELEASE/">FreeBSD
 	    2.2.1-RELEASE</a> is now available, replacing 2.2-RELEASE.  Read
 	  the <a href="&ftp;/2.2.1-RELEASE/README.TXT">README.TXT</a> file or
-	  the <a href="&base/releases/2.2.1R/notes.html">Release Notes</a>
+	  the <a href="&base;/releases/2.2.1R/notes.html">Release Notes</a>
 	  for more information.</p>
       </li>
 
@@ -212,7 +212,7 @@
 	<p><b>16-Mar-97</b> <a href="&ftp;/2.2-RELEASE/">FreeBSD
 	    2.2-RELEASE</a> is now available.  Read the <a
 	    href="&ftp;/2.2-RELEASE/README.TXT">README.TXT</a> file or the <a
-	    href="&base/releases/2.2R/notes.html">Release Notes</a> 	for
+	    href="&base;/releases/2.2R/notes.html">Release Notes</a> 	for
 	  more information.</p>
       </li>
     </ul>
@@ -222,7 +222,7 @@
     <ul>
       <li>
 	<p><b>20-Feb-1997</b> FreeBSD 2.1.7-RELEASE is now available. Read the
-	  README.TXT file or the <a href="&base/releases/2.1.7R/notes.html">
+	  README.TXT file or the <a href="&base;/releases/2.1.7R/notes.html">
 	    Release Notes</a> for more information.</p>
       </li>
 
diff --git a/en/releases/2.1.6R/announce.sgml b/en/releases/2.1.6R/announce.sgml
index 01a3371a4c..07cd6b6dce 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: www/en/releases/2.1.6R/announce.sgml,v 1.5 1999/09/06 07:02:52 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.6R/announce.sgml,v 1.6 1999/12/12 16:24:30 jhb Exp $">
 <!ENTITY title "FreeBSD 2.1.6 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -23,7 +23,7 @@ announcement</A> regarding FreeBSD 2.1.6</p>
 </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
diff --git a/en/releases/2.1.7R/announce.sgml b/en/releases/2.1.7R/announce.sgml
index ac8c8a8dc6..6e7c96157e 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: www/en/releases/2.1.7R/announce.sgml,v 1.6 1999/09/06 07:02:52 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/2.1.7R/announce.sgml,v 1.7 1999/12/12 16:24:32 jhb Exp $">
 <!ENTITY title "FreeBSD 2.1.7 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -16,7 +16,7 @@ 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
diff --git a/en/releases/2.2.5R/announce.sgml b/en/releases/2.2.5R/announce.sgml
index 371bdfa16b..eaf43c83c5 100644
--- a/en/releases/2.2.5R/announce.sgml
+++ b/en/releases/2.2.5R/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.5R/announce.sgml,v 1.5 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.5 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -22,7 +22,7 @@ this).</p>
 
 <p>FreeBSD 2.2.5-RELEASE is available on <A
 HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
-various <A HREF="&base/handbook/mirrors.html">FTP mirror
+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 will be shipping shortly as a new 4 CD set containing a
@@ -55,7 +55,7 @@ WWW: <a href="http://www.cdrom.com/">http://www.cdrom.com/</a></p>
 </blockquote>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A> in Argentina,
+HREF="&base;/handbook/mirrors.html">mirror sites</A> in Argentina,
 Australia, Brazil, Canada, the Czech Republic, Denmark, Estonia,
 Finland, France, Germany, Hong Kong, Ireland, Israel, Japan,
 Korea, the Netherlands, Poland, Portugal, Russia, South Africa,
diff --git a/en/releases/2.2.6R/announce.sgml b/en/releases/2.2.6R/announce.sgml
index d3da4a3bb4..5386369b65 100644
--- a/en/releases/2.2.6R/announce.sgml
+++ b/en/releases/2.2.6R/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.6R/announce.sgml,v 1.5 1999/09/06 07:02:54 peter Exp $">
 <!ENTITY title "FreeBSD 2.2.6 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -19,7 +19,7 @@ since the previous release.</p>
 
 <p>FreeBSD 2.2.6-RELEASE is available on <A
 HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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
 will be shipping shortly as a 4 CD set containing a lot of extra stuff
@@ -51,7 +51,7 @@ WWW: <a href="http://www.cdrom.com/">http://www.cdrom.com/</a></p>
 </blockquote>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A> in Argentina,
+HREF="&base;/handbook/mirrors.html">mirror sites</A> in Argentina,
 Australia, Brazil, Canada, the Czech Republic, Denmark, Estonia,
 Finland, France, Germany, Hong Kong, Ireland, Israel, Japan,
 Korea, the Netherlands, Poland, Portugal, Russia, South Africa,
diff --git a/en/releases/2.2.7R/announce.sgml b/en/releases/2.2.7R/announce.sgml
index 26c2a7e0fd..ac3278e864 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: www/en/releases/2.2.7R/announce.sgml,v 1.7 1999/09/06 07:02:55 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.7R/announce.sgml,v 1.8 1999/12/12 16:24:38 jhb Exp $">
 <!ENTITY title "FreeBSD 2.2.7 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -21,7 +21,7 @@ information).</P>
 
 <p>FreeBSD 2.2.7-RELEASE is available on <A
 HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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
 will be shipping shortly as a 4 CD set containing a lot of extra stuff
@@ -69,7 +69,7 @@ version of the 2.2.7 product.  Pacific HiTech is now an affiliate of
 Walnut Creek CDROM for Japanese sales of FreeBSD.</p>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A>
+HREF="&base;/handbook/mirrors.html">mirror sites</A>
 in the following countries: Argentina, Australia, Brazil, Bulgaria,
 Canada, the Czech Republic, Denmark, Estonia, Finland, France,
 Germany, Hong Kong, Hungary, Iceland, Ireland, Israel, Japan, Korea,
diff --git a/en/releases/2.2.8R/announce.sgml b/en/releases/2.2.8R/announce.sgml
index 85c1980c00..5eff779dd3 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: www/en/releases/2.2.8R/announce.sgml,v 1.3 1999/09/06 07:02:55 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2.8R/announce.sgml,v 1.4 1999/12/12 16:24:39 jhb Exp $">
 <!ENTITY title "FreeBSD 2.2.8 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -21,7 +21,7 @@ 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
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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
 will be shipping shortly as a 4 CD set containing a lot of extra stuff
@@ -61,7 +61,7 @@ version of the 2.2.8 product.  Pacific HiTech is now an affiliate of
 Walnut Creek CDROM for Japanese sales of FreeBSD.</p>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A>
+HREF="&base;/handbook/mirrors.html">mirror sites</A>
 in the following countries: Argentina, Australia, Brazil, Bulgaria,
 Canada, the Czech Republic, Denmark, Estonia, Finland, France,
 Germany, Hong Kong, Hungary, Iceland, Ireland, Israel, Japan, Korea,
diff --git a/en/releases/2.2R/announce.sgml b/en/releases/2.2R/announce.sgml
index 5a81278127..3d73fadcba 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: www/en/releases/2.2R/announce.sgml,v 1.4 1999/09/06 07:02:56 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/2.2R/announce.sgml,v 1.5 1999/12/12 16:24:40 jhb Exp $">
 <!ENTITY title "FreeBSD 2.2 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -13,14 +13,14 @@ 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 
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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 will be shipping shortly.</P>
 
 <P>FreeBSD 2.2 represents a rather large leap in functionality from the
 2.1.x releases, everyone being is strongly encouraged to read the
-<A HREF="&base/releases/2.2R/notes.html">release notes</A> for a list 
+<A HREF="&base;/releases/2.2R/notes.html">release notes</A> for a list 
 of new features.</P>
 
 <p></p><a href="../index.html">Release Home</a>
diff --git a/en/releases/3.0R/announce.sgml b/en/releases/3.0R/announce.sgml
index 8a384584b4..e4580139c1 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: www/en/releases/3.0R/announce.sgml,v 1.4 1999/09/06 07:02:56 peter Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/3.0R/announce.sgml,v 1.5 1999/12/12 16:24:41 jhb Exp $">
 <!ENTITY title "FreeBSD 3.0 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -23,7 +23,7 @@ information.</P>
 
 <p>FreeBSD 3.0-RELEASE is available on <A
 HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD">ftp.FreeBSD.org</A> and
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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
 will be shipping shortly as a 4 CD set containing a lot of extra stuff
@@ -71,7 +71,7 @@ version of the 3.0 product when it becomes available.  Pacific HiTech is
 now an affiliate of Walnut Creek CDROM for Japanese sales of FreeBSD.</p>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A>
+HREF="&base;/handbook/mirrors.html">mirror sites</A>
 in the following countries: Argentina, Australia, Brazil, Bulgaria,
 Canada, the Czech Republic, Denmark, Estonia, Finland, France,
 Germany, Hong Kong, Hungary, Iceland, Ireland, Israel, Japan, Korea,
diff --git a/en/releases/3.1R/announce.sgml b/en/releases/3.1R/announce.sgml
index e446cbd162..9b02fc9b22 100644
--- a/en/releases/3.1R/announce.sgml
+++ b/en/releases/3.1R/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.1R/announce.sgml,v 1.5 1999/09/06 07:02:56 peter Exp $">
 <!ENTITY title "FreeBSD 3.1 Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
@@ -20,7 +20,7 @@ more information.</P>
 
 <p>FreeBSD 3.1-RELEASE is available on <A
 HREF="ftp://ftp.freebsd.org/pub/FreeBSD">ftp.freebsd.org</A> and
-various <A HREF="&base/handbook/mirrors.html">FTP mirror sites</A>
+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
 will be shipping shortly as a 4 CD set containing a lot of extra stuff
@@ -68,7 +68,7 @@ version of the 3.1 product when it becomes available.  Pacific HiTech is
 now an affiliate of Walnut Creek CDROM for Japanese sales of FreeBSD.</p>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from <A
-HREF="&base/handbook/mirrors.html">mirror sites</A>
+HREF="&base;/handbook/mirrors.html">mirror sites</A>
 in the following countries: Argentina, Australia, Brazil, Bulgaria,
 Canada, the Czech Republic, Denmark, Estonia, Finland, France,
 Germany, Hong Kong, Hungary, Iceland, Ireland, Israel, Japan, Korea,
diff --git a/en/releases/index.sgml b/en/releases/index.sgml
index d024878079..a7eb7f1ffd 100644
--- a/en/releases/index.sgml
+++ b/en/releases/index.sgml
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.52 2001/04/22 17:16:54 jkh Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.53 2001/04/22 17:49:53 wosch Exp $">
 <!ENTITY title "Release Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/index.sgml,v 1.52 2001/04/22 17:16:54 jkh Exp $ -->
+<!-- $FreeBSD: www/en/releases/index.sgml,v 1.53 2001/04/22 17:49:53 wosch Exp $ -->
 
 <html>
 &header;
 <img src="../gifs/releases.jpg" height="200" width="300" align="right" border="0">
 
 <p><em>For late-breaking news about FreeBSD, please visit
-the <A HREF="&base/news/newsflash.html">Newsflash</A> page.</em></p>
+the <A HREF="&base;/news/newsflash.html">Newsflash</A> page.</em></p>
 
 <a name="current"></A>
 <h2>Current Release(s)</h2>
@@ -24,7 +24,7 @@ the <A HREF="&base/news/newsflash.html">Newsflash</A> page.</em></p>
 </em></p>
 
 <p>The latest daily release from our <A
-HREF="&base/handbook/current-stable.html#STABLE">FreeBSD-stable</A> branch is
+HREF="&base;/handbook/current-stable.html#STABLE">FreeBSD-stable</A> branch is
 also available.  Please see <A HREF="../where.html">Getting
 FreeBSD</A> for details.</p>
 
@@ -32,8 +32,8 @@ FreeBSD</A> for details.</p>
 <h2>Future Releases</h2>
 
        <p>We will continue to bring you new releases from both
-       our <A HREF="&base/handbook/current-stable.html#STABLE">FreeBSD-stable</A> and
-       <A HREF="&base/handbook/cutting-edge.html#CURRENT">FreeBSD-current</A>
+       our <A HREF="&base;/handbook/current-stable.html#STABLE">FreeBSD-stable</A> and
+       <A HREF="&base;/handbook/cutting-edge.html#CURRENT">FreeBSD-current</A>
        branches, both as developer's snapshots and as regular full releases.
        The next scheduled release on the <b>-stable</b> branch will be
        <b>FreeBSD 4.4</b> in August of 2001.  The first release on
diff --git a/en/releases/snapshots.sgml b/en/releases/snapshots.sgml
index 12d32d1d8f..c3a3956e69 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: www/en/releases/snapshots.sgml,v 1.10 1999/12/17 14:19:10 phantom Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/snapshots.sgml,v 1.11 2000/12/17 18:16:07 dannyboy Exp $">
 <!ENTITY title "FreeBSD Snapshot Releases">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/snapshots.sgml,v 1.10 1999/12/17 14:19:10 phantom Exp $ -->
+<!-- $FreeBSD: www/en/releases/snapshots.sgml,v 1.11 2000/12/17 18:16:07 dannyboy Exp $ -->
 
 <html>
 &header;
@@ -60,7 +60,7 @@
 
     <h2>Where to find snapshots</h2>
 
-    <p>Snapshots of <a href="&base/handbook/cutting-edge.html#CURRENT">FreeBSD-current</a>
+    <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>.
@@ -73,7 +73,7 @@
 	particular snapshot.</p>
 
     <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="&base;/handbook/stable.html">FreeBSD-stable</a> branch via anonymous FTP from
 	<a href="ftp://releng4.FreeBSD.org/pub/FreeBSD/">
 	ftp://releng4.FreeBSD.org/pub/FreeBSD/</a>.
 	The snapshot releases are in directories named in the
diff --git a/en/search/search.sgml b/en/search/search.sgml
index 5bc1c005ea..34af1744fb 100644
--- a/en/search/search.sgml
+++ b/en/search/search.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.65 2001/04/13 03:50:07 dd Exp $">
+<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.66 2001/04/17 12:21:56 nik Exp $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/search/search.sgml,v 1.65 2001/04/13 03:50:07 dd Exp $ -->
+<!-- $FreeBSD: www/en/search/search.sgml,v 1.66 2001/04/17 12:21:56 nik Exp $ -->
 
 <html>
 &header;
@@ -30,8 +30,8 @@ A cross reference of the FreeBSD kernel</a>
 
 <hr noshade>
 
-<a name="web"></a><h2>Web pages (including <a href="&base/FAQ/index.html">FAQ</a>
-and <a href="&base/handbook/index.html">Handbook</a>)</h2>
+<a name="web"></a><h2>Web pages (including <a href="&base;/FAQ/index.html">FAQ</a>
+and <a href="&base;/handbook/index.html">Handbook</a>)</h2>
 
 <form action="http://www.FreeBSD.org/cgi/search.cgi" method="GET">
 <h3>Search for:</h3>
diff --git a/en/support.sgml b/en/support.sgml
index 9990942ae6..9788199f01 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.224 2001/04/20 16:22:06 dannyboy Exp $">
+<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.225 2001/04/24 22:57:02 grog Exp $">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/support.sgml,v 1.224 2001/04/20 16:22:06 dannyboy Exp $ -->
+<!-- $FreeBSD: www/en/support.sgml,v 1.225 2001/04/24 22:57:02 grog Exp $ -->
 
 <html>
     &header;
@@ -29,13 +29,13 @@
 
     <h2>Mailing lists</h2>
     
-    <p><a href="&base/handbook/eresources.html#ERESOURCES-MAIL">Mailing
+    <p><a href="&base;/handbook/eresources.html#ERESOURCES-MAIL">Mailing
 	lists</a> are the primary support channel for FreeBSD users, with
       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
-      <strong><a href="&base/search/search.html#mailinglists">search</a></strong> the
+      <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>
 
@@ -107,14 +107,14 @@
     </ul>
     
     <p>If you create other FreeBSD mailing lists, <a
-	href="&base/mailto.html">let us know about them</a>.</p>
+	href="&base;/mailto.html">let us know about them</a>.</p>
 
     <a name="newsgroups"></a>
 
     <h2>Newsgroups</h2>
 
     <p>There are a few FreeBSD specific <a
-	href="&base/handbook/eresources-news.html">newsgroups</a>, along with
+	href="&base;/handbook/eresources-news.html">newsgroups</a>, along with
       numerous other newsgroups on topics of interest to FreeBSD users, though
       the mailing lists remain the most reliable way to get in touch with the
       FreeBSD developers.  For miscellaneous FreeBSD discussion, see <a
@@ -137,7 +137,7 @@
   	want to try these or any other channels on IRC, it is nonetheless
         at your own risk and any complaints about conduct on those channels
 	should not be directed to the FreeBSD project.  See also
-	<a href="&base/FAQ/preface.html#IRC">the FAQ entry</a> for
+	<a href="&base;/FAQ/preface.html#IRC">the FAQ entry</a> for
 	more information.</p>
 
     <a name="web"></a>
@@ -152,7 +152,7 @@
 	  Germany or <a
 	    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
+	    href="&base;/index.html">home page</>.  The same naming convention
 	  is also used for <b>FTP</b> servers.</p>
     
 	<p>In addition to the mirrors, several non-English web resources
diff --git a/en/usergroups.sgml b/en/usergroups.sgml
index 9990942ae6..9788199f01 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.224 2001/04/20 16:22:06 dannyboy Exp $">
+<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.225 2001/04/24 22:57:02 grog Exp $">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/support.sgml,v 1.224 2001/04/20 16:22:06 dannyboy Exp $ -->
+<!-- $FreeBSD: www/en/support.sgml,v 1.225 2001/04/24 22:57:02 grog Exp $ -->
 
 <html>
     &header;
@@ -29,13 +29,13 @@
 
     <h2>Mailing lists</h2>
     
-    <p><a href="&base/handbook/eresources.html#ERESOURCES-MAIL">Mailing
+    <p><a href="&base;/handbook/eresources.html#ERESOURCES-MAIL">Mailing
 	lists</a> are the primary support channel for FreeBSD users, with
       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
-      <strong><a href="&base/search/search.html#mailinglists">search</a></strong> the
+      <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>
 
@@ -107,14 +107,14 @@
     </ul>
     
     <p>If you create other FreeBSD mailing lists, <a
-	href="&base/mailto.html">let us know about them</a>.</p>
+	href="&base;/mailto.html">let us know about them</a>.</p>
 
     <a name="newsgroups"></a>
 
     <h2>Newsgroups</h2>
 
     <p>There are a few FreeBSD specific <a
-	href="&base/handbook/eresources-news.html">newsgroups</a>, along with
+	href="&base;/handbook/eresources-news.html">newsgroups</a>, along with
       numerous other newsgroups on topics of interest to FreeBSD users, though
       the mailing lists remain the most reliable way to get in touch with the
       FreeBSD developers.  For miscellaneous FreeBSD discussion, see <a
@@ -137,7 +137,7 @@
   	want to try these or any other channels on IRC, it is nonetheless
         at your own risk and any complaints about conduct on those channels
 	should not be directed to the FreeBSD project.  See also
-	<a href="&base/FAQ/preface.html#IRC">the FAQ entry</a> for
+	<a href="&base;/FAQ/preface.html#IRC">the FAQ entry</a> for
 	more information.</p>
 
     <a name="web"></a>
@@ -152,7 +152,7 @@
 	  Germany or <a
 	    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
+	    href="&base;/index.html">home page</>.  The same naming convention
 	  is also used for <b>FTP</b> servers.</p>
     
 	<p>In addition to the mirrors, several non-English web resources
diff --git a/en/where.sgml b/en/where.sgml
index 5a708c998f..7b81fe1b9b 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.47 2001/04/11 22:31:43 dd Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.48 2001/04/22 05:50:59 jkh Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/where.sgml,v 1.47 2001/04/11 22:31:43 dd Exp $ -->
+<!-- $FreeBSD: www/en/where.sgml,v 1.48 2001/04/22 05:50:59 jkh Exp $ -->
 
 <html>
     &header;
 
     <a name="releases"></a>
     
-    <h2><a href="&base/releases/index.html">Release Information</a></h2>
+    <h2><a href="&base;/releases/index.html">Release Information</a></h2>
     
     <p>Detailed descriptions of past, present, and future releases.  Look here
       first to determine what the latest version of FreeBSD is.</p>