diff --git a/en/cgi/cvsweb.cgi b/en/cgi/cvsweb.cgi
index cd607d4842..b1c3cce8a4 100755
--- a/en/cgi/cvsweb.cgi
+++ b/en/cgi/cvsweb.cgi
@@ -13,7 +13,7 @@
 #
 # Based on:
 # * Bill Fenners cvsweb.cgi revision 1.28 available from:
-#   http://www.FreeBSD.org/cgi/cvsweb.cgi/www/en/cgi/cvsweb.cgi
+#   http://cvsweb.FreeBSD.org/www/en/cgi/cvsweb.cgi
 #
 # Copyright (c) 1996-1998 Bill Fenner
 #           (c) 1998-1999 Henner Zeller
@@ -42,9 +42,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: cvsweb.cgi,v 1.76 2001-09-19 15:18:41 fenner Exp $
+# $Id: cvsweb.cgi,v 1.77 2001-11-07 16:32:11 sobomax Exp $
 # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.82 2001/08/01 09:54:52 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.75 2001/08/01 10:41:47 knu Exp $
+# $FreeBSD$
 #
 ###
 
@@ -234,7 +234,7 @@ $LOG_REVSEPARATOR  = q/^-{28}$/;
 ##### End of configuration variables #####
 
 $cgi_style::hsty_base = 'http://www.FreeBSD.org';
-$_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.75 2001/08/01 10:41:47 knu Exp $;
+$_ = q$FreeBSD$;
 @_ = split;
 $cgi_style::hsty_date = "@_[3,4]";
 
diff --git a/en/cgi/cvsweb.conf b/en/cgi/cvsweb.conf
index 0a171b8eda..7c894846b7 100644
--- a/en/cgi/cvsweb.conf
+++ b/en/cgi/cvsweb.conf
@@ -6,9 +6,9 @@
 #     1999      H. Nordstrom <hno@hem.passagen.se>
 #     2000-2001 A. MUSHA     <knu@FreeBSD.org>
 #          based on work by Bill Fenner  <fenner@FreeBSD.org>
-# $Id: cvsweb.conf,v 1.22 2001-08-01 10:41:47 knu Exp $
+# $Id: cvsweb.conf,v 1.23 2001-11-07 16:32:11 sobomax Exp $
 # $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.21 2001/07/06 09:58:17 knu Exp $
+# $FreeBSD$
 #
 ###
 
@@ -60,7 +60,7 @@ $cvstreedefault = $CVSrepositories[2 * 0];    # The first one
 	    'Portugal'        => 'http://cvsup.pt.freebsd.org/cgi-bin/cvsweb/cvsweb.cgi',
 	    'Russia'          => 'http://www.FreeBSD.org.ua/cgi/cvsweb.cgi?cvsroot=freebsd',
 	    'Spain'           => 'http://www.es.FreeBSD.org/cgi/cvsweb.cgi',
-	    'USA, California' => 'http://www.FreeBSD.org/cgi/cvsweb.cgi',
+	    'USA, California' => 'http://cvsweb.FreeBSD.org/',
 	    'Japan'           => 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi',
 	   );
 
diff --git a/en/cgi/getmsg.cgi b/en/cgi/getmsg.cgi
index 7a5e8270ba..2fc34e5357 100755
--- a/en/cgi/getmsg.cgi
+++ b/en/cgi/getmsg.cgi
@@ -6,7 +6,7 @@
 # by John Fieber
 # February 26, 1998
 #
-# $FreeBSD: www/en/cgi/getmsg.cgi,v 1.29 2000/11/29 22:10:24 wosch Exp $
+# $FreeBSD$
 #
 
 require "./cgi-lib.pl";
@@ -208,7 +208,7 @@ sub MessageToHTML
 sub AddAnchors
 {
     my ($text) = @_;
-    my $cvsweb = 'http://www.freebsd.org/cgi/cvsweb.cgi';
+    my $cvsweb = 'http://cvsweb.FreeBSD.org/';
 
     $text =~ s/(http|https|ftp|gopher|mailto|news|file)(:[^\s]*?\/?)(\W?\s)/<a href="$1$2">$1$2<\/a>$3/goi;
 
diff --git a/en/cgi/ports.cgi b/en/cgi/ports.cgi
index bae23ecd88..c023cf2e69 100755
--- a/en/cgi/ports.cgi
+++ b/en/cgi/ports.cgi
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.57 2001/08/26 18:27:45 wosch Exp $
+# $FreeBSD$
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -91,7 +91,7 @@ sub init_variables {
 
     # CVS Web interface
     $remotePrefixCvs =
-	'http://www.FreeBSD.org/cgi/cvsweb.cgi/ports';
+	'http://cvsweb.FreeBSD.org/ports';
 
     # Ports documentation
     $portsDesc = '../ports/';
@@ -553,7 +553,7 @@ sub footer {
 <img ALIGN="RIGHT" src="/gifs/powerlogo.gif">
 &copy; 1996-2001 by Wolfram Schneider. All rights reserved.<br>
 };
-    #print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.57 2001/08/26 18:27:45 wosch Exp $} . "<br>\n";
+    #print q{$FreeBSD$} . "<br>\n";
     print qq{Please direct questions about this service to
 <I><A HREF="$mailtoURL">$mailto</A></I><br>\n};
     print qq{General questions about FreeBSD ports should be sent to } .
diff --git a/en/cgi/query-pr.cgi b/en/cgi/query-pr.cgi
index 0be0399b54..6a0d94b34c 100755
--- a/en/cgi/query-pr.cgi
+++ b/en/cgi/query-pr.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.25 2000/12/29 12:43:12 wosch Exp $
+# $FreeBSD$
 
 $ENV{'PATH'} = "/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin";
 
@@ -194,7 +194,7 @@ sub getline
 sub cvsweb {
     local($file) = shift;
     $file =~ s/[,.;]$//;
-    return 'http://www.FreeBSD.org/cgi/cvsweb.cgi/' . $file;
+    return 'http://cvsweb.FreeBSD.org/' . $file;
 }
     
 
diff --git a/en/conspectus/stable/2000/05/29.sgml b/en/conspectus/stable/2000/05/29.sgml
index 861cb4df7c..3195acd088 100644
--- a/en/conspectus/stable/2000/05/29.sgml
+++ b/en/conspectus/stable/2000/05/29.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY title "FreeBSD-stable Conspectus, week ending 29th May 2000">
-<!ENTITY date "$FreeBSD: www/en/conspectus/stable/2000/05/29.sgml,v 1.1 2000/05/31 20:35:47 nik Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY base "../../../..">
 <!ENTITY % includes SYSTEM "../../../../includes.sgml"> %includes;]>
 
@@ -352,7 +352,7 @@
     <blockquote>
       <p><i>1) Get the diffs.</i></p>
       <p><i>You will need a CVS repository, or use the cvsweb interface
-          at http://www.freebsd.org/cgi/cvsweb.cgi to extract the diffs.
+          at http://cvsweb.FreeBSD.org/ to extract the diffs.
           Note that mlx.c, mlx_disk.c, mlx_pci.c and mlxvar.h all
           changed in this fix.</i></p>
       <p><i>2) Apply the diffs.</i></p>
diff --git a/en/news/1996/index.sgml b/en/news/1996/index.sgml
index 9574e1ffda..91bfc58405 100644
--- a/en/news/1996/index.sgml
+++ b/en/news/1996/index.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/news/1996/index.sgml,v 1.6 2001/07/13 12:52:15 dd Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD News Flash! (1996)">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
@@ -42,7 +42,7 @@
 
       <li>
 	<p><b>4-Nov-1996</b> The FreeBSD <a
-	    href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS</a> development
+	    href="http://cvsweb.FreeBSD.org/">CVS</a> development
 	  tree has branched again.  <a href="&base;/releases/index.html">See here</a> for
 	  more information.</p>
 	</li>
diff --git a/en/news/1998/index.sgml b/en/news/1998/index.sgml
index 921e23c642..cb35c7a46d 100644
--- a/en/news/1998/index.sgml
+++ b/en/news/1998/index.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/news/1998/index.sgml,v 1.3 2001/05/01 07:59:39 eric Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD News Flash! (1998)">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 <!ENTITY newshome '<a href="../news.html">News Home</a>'>
@@ -180,7 +180,7 @@
       <li><p><b>01-May-98</b>
 	The FreeBSD Project set up <a name="anoncvs"
 	href="&base;/handbook/synching.html#ANONCVS">Anonymous CVS</a> for the
-	<a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">FreeBSD CVS
+	<a href="http://cvsweb.FreeBSD.org/">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
diff --git a/en/projects/mozilla.sgml b/en/projects/mozilla.sgml
index 0b70a6e369..e0e45e70f1 100644
--- a/en/projects/mozilla.sgml
+++ b/en/projects/mozilla.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/mozilla.sgml,v 1.12 2001/07/13 12:52:16 dd Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title 'FreeBSD Mozilla Group'>
 <!ENTITY email 'freebsd-mozilla'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
@@ -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://cvsweb.FreeBSD.org/?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://cvsweb.FreeBSD.org/">CVS repository</a>,
         being able to select and compare specific revisions of the various
         files within it.</dd>
 	-->
diff --git a/en/releases/2.2.8R/errata.sgml b/en/releases/2.2.8R/errata.sgml
index 58f01a6c21..13fa67fccd 100644
--- a/en/releases/2.2.8R/errata.sgml
+++ b/en/releases/2.2.8R/errata.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/releases/2.2.8R/errata.sgml,v 1.10 1999/09/06 07:02:55 peter Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD 2.2.8 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/2.2.8R/errata.sgml,v 1.10 1999/09/06 07:02:55 peter Exp $ -->
+<!-- $FreeBSD$ -->
 
 <html>
 &header;
@@ -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://cvsweb.FreeBSD.org/src/lib/libc/gen/getpwent.c.diff?r1=1.35.2.2&amp;r2=1.35.2.3
 
 </pre>
 
diff --git a/en/releases/3.2R/errata.sgml b/en/releases/3.2R/errata.sgml
index a9e7368ace..f3becd0756 100644
--- a/en/releases/3.2R/errata.sgml
+++ b/en/releases/3.2R/errata.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/releases/3.2R/errata.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD 3.2 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/3.2R/errata.sgml,v 1.5 1999/09/06 07:02:57 peter Exp $ -->
+<!-- $FreeBSD$ -->
 
 <html>
 &header;
@@ -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://cvsweb.FreeBSD.org/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/support.sgml b/en/support.sgml
index fecaa506c2..32887d149d 100644
--- a/en/support.sgml
+++ b/en/support.sgml
@@ -1,5 +1,5 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.240 2001/10/17 01:47:11 grog Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
@@ -240,7 +240,7 @@
 
       <a name="cvs"></a>
       
-    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
+    <h2><a href="http://cvsweb.FreeBSD.org/">CVS Repository</a></h2>
     
     <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
@@ -265,7 +265,7 @@
 	very low overhead, batch-mode access (basically, patches through
 	email).</li>
 
-      <li>The <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web interface</a>
+      <li>The <a href="http://cvsweb.FreeBSD.org/">web interface</a>
 	if you are looking to simply browse the repository in search of a
 	specific change or file revision.</li>
 
@@ -276,7 +276,7 @@
     </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://cvsweb.FreeBSD.org/">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
diff --git a/en/usergroups.sgml b/en/usergroups.sgml
index fecaa506c2..32887d149d 100644
--- a/en/usergroups.sgml
+++ b/en/usergroups.sgml
@@ -1,5 +1,5 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.240 2001/10/17 01:47:11 grog Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
@@ -240,7 +240,7 @@
 
       <a name="cvs"></a>
       
-    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS Repository</a></h2>
+    <h2><a href="http://cvsweb.FreeBSD.org/">CVS Repository</a></h2>
     
     <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
@@ -265,7 +265,7 @@
 	very low overhead, batch-mode access (basically, patches through
 	email).</li>
 
-      <li>The <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web interface</a>
+      <li>The <a href="http://cvsweb.FreeBSD.org/">web interface</a>
 	if you are looking to simply browse the repository in search of a
 	specific change or file revision.</li>
 
@@ -276,7 +276,7 @@
     </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://cvsweb.FreeBSD.org/">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
diff --git a/en/y2kbug.sgml b/en/y2kbug.sgml
index 41e160bee4..867859755c 100644
--- a/en/y2kbug.sgml
+++ b/en/y2kbug.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/en/y2kbug.sgml,v 1.40 2001/07/19 12:31:21 asmodai Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title 'Year 2000 Compatibility (aka "Millennium Bug")'>
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
@@ -109,7 +109,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://cvsweb.FreeBSD.org/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
@@ -117,7 +117,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://cvsweb.FreeBSD.org/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
@@ -126,7 +126,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://cvsweb.FreeBSD.org/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
diff --git a/es/news/newsflash.sgml b/es/news/newsflash.sgml
index e3edf103ce..8ddc1d1be6 100644
--- a/es/news/newsflash.sgml
+++ b/es/news/newsflash.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/es/news/newsflash.sgml,v 1.20 1999/09/27 22:07:01 jesusr Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD News flash!">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $FreeBSD: www/es/news/newsflash.sgml,v 1.20 1999/09/27 22:07:01 jesusr Exp $ -->
+<!-- $FreeBSD$ -->
 
 <html>
 &header;
@@ -348,7 +348,7 @@ Releases</a></strong>.</p>
 	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://cvsweb.freebsd.org/">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. 
@@ -694,7 +694,7 @@ Releases</a></strong>.</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://cvsweb.freebsd.org/">CVS</a>
       development tree has branched again.  <a href="../releases/">See here</a>
       for more information.
     </P></li>
diff --git a/es/projects/mozilla.sgml b/es/projects/mozilla.sgml
index 7eb2115080..214dd47ecd 100644
--- a/es/projects/mozilla.sgml
+++ b/es/projects/mozilla.sgml
@@ -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://cvsweb.freebsd.org/?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://cvsweb.freebsd.org/">CVS repository</a>,
         being able to select and compare specific revisions of the various
         files within it.</dd>
 	-->
diff --git a/es/releases/2.2.8R/errata.sgml b/es/releases/2.2.8R/errata.sgml
index cb6e1b0a28..45aa258768 100644
--- a/es/releases/2.2.8R/errata.sgml
+++ b/es/releases/2.2.8R/errata.sgml
@@ -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://cvsweb.freebsd.org/src/lib/libc/gen/getpwent.c.diff?r1=1.35.2.2&amp;r2=1.35.2.3
 
 </pre>
 
diff --git a/es/releases/3.2R/errata.sgml b/es/releases/3.2R/errata.sgml
index e4e1778de7..f2de52ea29 100644
--- a/es/releases/3.2R/errata.sgml
+++ b/es/releases/3.2R/errata.sgml
@@ -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://cvsweb.freebsd.org/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/es/support.sgml b/es/support.sgml
index eb905164fb..7095f85249 100644
--- a/es/support.sgml
+++ b/es/support.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/es/support.sgml,v 1.25 1999/09/28 16:38:41 jmas Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "Soporte">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/es/support.sgml,v 1.25 1999/09/28 16:38:41 jmas Exp $ -->
+<!-- $FreeBSD$ -->
 
 <html>
 &header;
@@ -208,7 +208,7 @@ http://www.tw.freebsd.org/    Local language
       </ul>
 
       <p>Mirrors del script de CVSWeb est&aacute;n disponibles en 
-      <a href="http://www.freebsd.org/cgi/cvsweb.cgi">California</a>,
+      <a href="http://cvsweb.FreeBSD.org/">California</a>,
       <a href="http://www.de.freebsd.org/cgi/cvsweb.cgi">Alemania</a>,
       <a href="http://www.jp.freebsd.org/cgi/cvsweb.cgi">
       Jap&oacute;n</a> y Espa&ntilde;a 
diff --git a/es/y2kbug.sgml b/es/y2kbug.sgml
index 5c4a211c7b..a8bae3a913 100644
--- a/es/y2kbug.sgml
+++ b/es/y2kbug.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/es/y2kbug.sgml,v 1.5 1999/09/06 07:02:59 peter Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title 'Compatibilidad a&ntilde;o  2000 ("Millennium Bug")'>
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/es/y2kbug.sgml,v 1.5 1999/09/06 07:02:59 peter Exp $ -->
+<!-- $FreeBSD$ -->
 
 <html>
 &header;
@@ -128,14 +128,14 @@
         1900-1968 en lugar de 2000-2068. [Solucionado: v1.7 1999/01/05]
       </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>
+      <dt><a href="http://cvsweb.freebsd.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
       <dd>El c&aacute;lculo de a&ntilde;os bisiestos para el n&uacute;mero de 
         d&iacute;as en un a&ntilde;o, y la conversi&oacute;n del tiempo DFC77 
         a segundos desde el Epoch era incorrecta. Estos errores afectaban a 
         todos los a&ntilde;os. [Solucionado: v1.6 1999/01/12]
       </dd>
 
-      <dt><a href="http://www.freebsd.org/cgi/cvsweb.cgi/src/gnu/usr.bin/tar/getdate.y.diff?r1=1.3&amp;r2=1.4">tar/getdate.y</a></dt>
+      <dt><a href="http://cvsweb.freebsd.org/src/gnu/usr.bin/tar/getdate.y.diff?r1=1.3&amp;r2=1.4">tar/getdate.y</a></dt>
       <dd>La funci&oacute;n convert() ten&iacute;a fijado el uso de dos
         d&iacute;gitos en el a&ntilde;o para el rango 70-99. Ha sido ajustada
         para permitir a&ntilde;os de dos d&iacute;gitos para for 1970-2069.
@@ -143,7 +143,7 @@
         alerta y2k1!. [Solucionado: v1.4 1999/01/12]
       </dd>
 
-      <dt><a href="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/fetch/http.c.diff?r1=1.22&amp;r2=1.24">fetch/http.c</a></dt>
+      <dt><a href="http://cvsweb.freebsd.org/src/usr.bin/fetch/http.c.diff?r1=1.22&amp;r2=1.24">fetch/http.c</a></dt>
       <dd>El protocolo HTTP incluye un formato de fecha obsoleto que usa un
         a&ntilde;o de dos d&iacute;gitos. Las versiones anteriores de fetch
         interpretaban todas las fechas en 1900s; con esta revisi&oacute;n, se
diff --git a/ja/projects/mozilla.sgml b/ja/projects/mozilla.sgml
index 7e173cb00a..9d67f7e3c9 100644
--- a/ja/projects/mozilla.sgml
+++ b/ja/projects/mozilla.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/mozilla.sgml,v 1.14 2000/10/31 19:32:48 kuriyama Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title 'FreeBSD Mozilla Group'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
@@ -28,11 +28,11 @@
 
     <dl>
     <!--
-      <dt><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi?cvsroot=mozilla">WEB
+      <dt><a href="http://cvsweb.FreeBSD.org/?cvsroot=mozilla">WEB
       ���󥿥ե�����</a></dt>
 
       <dd>CVSweb �ˤ�ä�
-      <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS ��ݥ��ȥ�</a>
+      <a href="http://cvsweb.FreeBSD.org/">CVS ��ݥ��ȥ�</a>
       ��������뤿��� web ����פȤ������󥿥ե��������󶡤���ޤ�.
       ����ˤ��, CVS ��ݥ��ȥ����μ�Υե�������椫��������Ǥ�
       ���򤷤�����Ӥ����ꤹ�뤳�Ȥ���ǽ�ˤʤ�ޤ�.</dd>
diff --git a/ja/releases/2.2.8R/errata.sgml b/ja/releases/2.2.8R/errata.sgml
index 52bf539749..19010bac05 100644
--- a/ja/releases/2.2.8R/errata.sgml
+++ b/ja/releases/2.2.8R/errata.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.8 2000/01/10 08:23:09 motoyuki Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD 2.2.8 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/releases/2.2.8R/errata.sgml,v 1.8 2000/01/10 08:23:09 motoyuki Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
 
@@ -67,7 +67,7 @@ ERRATA.TXT</a> 
         �����Ĺ����ʸ�������Ƭ�˻��Ĥ�Τ˥ޥå����Ƥ��ޤ��ޤ�.
         ���ε�ư��������ˤ�, libc �������ƥꥳ��ѥ��뤹��ɬ�פ�����ޤ�.
         Ŭ�ڤʥѥå��ϼ��Τ褦�ˤ��Ƽ�äƤ��뤳�Ȥ��Ǥ��ޤ�.
-        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://cvsweb.FreeBSD.org/src/lib/libc/gen/getpwent.c.diff?r1=1.35.2.2&amp;r2=1.35.2.3
 
 </pre>
 
diff --git a/ja/releases/3.2R/errata.sgml b/ja/releases/3.2R/errata.sgml
index 832effee49..0b9d820265 100644
--- a/ja/releases/3.2R/errata.sgml
+++ b/ja/releases/3.2R/errata.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.8 2000/01/10 08:23:13 motoyuki Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD 3.2 Errata Notes">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/releases/3.2R/errata.sgml,v 1.8 2000/01/10 08:23:13 motoyuki Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 
@@ -54,7 +54,7 @@ o    
 
 �к�: solib.c �� revision 1.3.2.2 �Dz��ѤߤǤ�. 
       �к��λܤ��줿�С������� CVSup ��ͳ��(�ϥ�ɥ֥å��������򸫤Ƥ�������)
-      �䤿���� CVSweb �����ӥ����餳��<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>�����ƤƤ�������.
+      �䤿���� CVSweb �����ӥ����餳��<a href="http://cvsweb.FreeBSD.org/src/contrib/gdb/gdb/solib.c.diff?r1=1.3.2.1&amp;r2=1.3.2.2">the patch</a>�����ƤƤ�������.
 
 <strong>
 o    ���󥹥ȡ���ե��åԡ����鵯ư����֤�
diff --git a/ja/support.sgml b/ja/support.sgml
index 7a71658802..1486c17501 100644
--- a/ja/support.sgml
+++ b/ja/support.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/ja/support.sgml,v 1.32 2001/07/30 13:31:59 kuriyama Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "Support">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
@@ -246,7 +246,7 @@
 
       <a name="cvs"></a>
       
-    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS ��ݥ��ȥ�</a></h2>
+    <h2><a href="http://cvsweb.FreeBSD.org/">CVS ��ݥ��ȥ�</a></h2>
     
     <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (
       Concurrent Version System) ��桹�ϥ������򥳥�ȥ����뤹��
@@ -271,7 +271,7 @@
       �㤤, �Хå��⡼�ɤǥ�������������ˡ�Ǥ�.  ����Ū�˥ѥå����᡼��
       ���Ϥ����ޤ�.</li>
 
-      <li><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web
+      <li><a href="http://cvsweb.FreeBSD.org/">web
       ���󥿡��ե�����</a> ����Ū���ѹ���ե�����Υ�ӥ�����
       Ĵ�٤뤿���, ñ�˥�ݥ��ȥ��������뤿��Υ���������ˡ�Ǥ�. </li>
 
@@ -283,7 +283,7 @@
     </ul>
 
     <p>CVS ��ݥ��ȥ� CGI ������ץȤΥߥ顼�� <a
-	href="http://www.FreeBSD.org/cgi/cvsweb.cgi">����ե���˥�</a>, <a
+	href="http://cvsweb.FreeBSD.org/">����ե���˥�</a>, <a
 	href="http://www.de.FreeBSD.org/cgi/cvsweb.cgi">�ɥ���</a>, <a
 	href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">
 	����</a> �����ƥ��ڥ��� (<a
diff --git a/ja/y2kbug.sgml b/ja/y2kbug.sgml
index 992604bfe6..aa45713a37 100644
--- a/ja/y2kbug.sgml
+++ b/ja/y2kbug.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/ja/y2kbug.sgml,v 1.17 2000/10/31 19:32:41 kuriyama Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title 'Year 2000 bug (aka "Millennium bug")'>
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
@@ -118,7 +118,7 @@
        [������ v1.7 1999/01/05; FreeBSD-3.1 �ʹߤǽ�����]</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://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
       
       <dd>UNIX �ˤ����뵪���ΰ������ְ�äƤ��뤿���, ���뤦ǯ������
         �η׻�, DCF77 �����λ��֤��Ѵ����������Ԥ��ޤ���. ���Υ��顼��, 2000 
@@ -126,7 +126,7 @@
        [������ v1.6 1999/01/12; FreeBSD-3.1 �ʹߤǽ�����]</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://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
       
       <dd>Conver() �ؿ��� 70-99 �� 2 ���ǯ�򰷤��褦�˥ϡ��ɥ����ɤ�
          ��Ƥ��ޤ���. ���� 2 ���ǯ���� 1970-2069 �ޤǰ�����褦���ѹ�����ޤ�
@@ -134,7 +134,7 @@
       [������ v1.4 1999/01/12; FreeBSD-3.1 �ʹߤǽ�����]</dd>
 
       <dt><a
-	  href="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
+	  href="http://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
       
       <dd>HTTP �ץ��ȥ����ǯ�٤� 2 ���ɽ������������եե����ޥåȤ�
         �ޤ�Ǥ��ޤ�. �����ΥС������� fetch ��, ���Τ褦�� 2 ���ǯ�٤�, ��
diff --git a/ru/news/1996/index.sgml b/ru/news/1996/index.sgml
index 2b49744384..0e0364fa2e 100644
--- a/ru/news/1996/index.sgml
+++ b/ru/news/1996/index.sgml
@@ -42,7 +42,7 @@
 
     <li><p><b>4 ������ 1996</b>
       �� ������������ � ���������� ������ <a
-      href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS</a> FreeBSD �����
+      href="http://cvsweb.FreeBSD.org/">CVS</a> FreeBSD �����
       ���������� �����.  ��������� ���������� ��������� <a
       href="../releases/">�����</a>.</p></li>
   </ul>
diff --git a/ru/news/newsflash.sgml b/ru/news/newsflash.sgml
index 16dcb042f8..e5efb872e3 100644
--- a/ru/news/newsflash.sgml
+++ b/ru/news/newsflash.sgml
@@ -964,7 +964,7 @@
     <li><b>1 ��� 1998</b>
       ������ FreeBSD �������� ������ <a name="anoncvs"
       href="../handbook/synching.html#ANONCVS">Anonymous CVS</a> ��� ������
-      <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">FreeBSD CVS</a>.
+      <a href="http://cvsweb.FreeBSD.org/">FreeBSD CVS</a>.
       ����� ����� �������, ��� �������� ������������� FreeBSD ��� ������
       ���������� ������������ �������� � CVS � ������ "������ ������" �
       ����� �� ����������� anoncvs-�������� ������� FreeBSD.<p></p></li>
diff --git a/ru/projects/mozilla.sgml b/ru/projects/mozilla.sgml
index 8d6df8af62..1687c4752f 100644
--- a/ru/projects/mozilla.sgml
+++ b/ru/projects/mozilla.sgml
@@ -29,10 +29,10 @@
 
     <dl>
     <!--
-      <dt><a href="http://www.freebsd.org/cgi/cvsweb.cgi?cvsroot=mozilla">WEB Interface</a></dt>
+      <dt><a href="http://cvsweb.freebsd.org/?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://cvsweb.freebsd.org/">CVS repository</a>,
 	being able to select and compare specific revisions of the various
 	files within it.</dd>
 	-->
diff --git a/ru/support.sgml b/ru/support.sgml
index 9ddfc8c8ae..1b22301e25 100644
--- a/ru/support.sgml
+++ b/ru/support.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/ru/support.sgml,v 1.18 2000/10/27 12:13:48 phantom Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "���������">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ru/support.sgml,v 1.18 2000/10/27 12:13:48 phantom Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- The FreeBSD Russian Documentation Project -->
 <!-- $FreeBSDru: frdp/www/ru/support.sgml,v 1.14 2000/10/12 10:02:48 phantom Exp $ -->
 <!-- Original revision: 1.201 -->
@@ -249,7 +249,7 @@
 
     <a name="cvs"></a>
 
-    <h2><a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">������ CVS</a></h2>
+    <h2><a href="http://cvsweb.FreeBSD.org/">������ CVS</a></h2>
 
     <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a>
       (Concurrent Version System) �������� ��� ������������, ������� ��
@@ -278,7 +278,7 @@
         �������� ��������� ������ �� ����������� �����).</li>
 
       <li>�� ������ ����� ��������������� <a
-        href="http://www.FreeBSD.org/cgi/cvsweb.cgi">web-�����������</a>,
+        href="http://cvsweb.FreeBSD.org/">web-�����������</a>,
         ���� ��� ����� ������ ���������� ������ � ������� ����������
         ��������� � ���������� �����.</li>
 
@@ -290,7 +290,7 @@
     </ul>
 
     <p>������� ����� ���������� � ����������� CVS ��������� �
-      <a href="http://www.FreeBSD.org/cgi/cvsweb.cgi">����������</a>,
+      <a href="http://cvsweb.FreeBSD.org/">����������</a>,
       <a href="http://www.de.FreeBSD.org/cgi/cvsweb.cgi">��������</a>,
       <a href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">������</a> �
       ������� (<a
diff --git a/ru/y2kbug.sgml b/ru/y2kbug.sgml
index 68657bd798..9cab7f49e5 100644
--- a/ru/y2kbug.sgml
+++ b/ru/y2kbug.sgml
@@ -138,7 +138,7 @@
       </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://cvsweb.FreeBSD.org/src/usr.sbin/xntpd/parse/util/dcfd.c">xntpd/parse/util/dcfd.c</a></dt>
 
       <dd>���������� ����������� ���� ��� ��������� ����� ���� � ���� �
 	�������������� ������� DCF77 � ����� ������, ��������� � ������ ����
@@ -147,7 +147,7 @@
       </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://cvsweb.FreeBSD.org/src/gnu/usr.bin/tar/getdate.y">tar/getdate.y</a></dt>
 
       <dd>� ������� Convert() ���� ������ ������������� ������ ����, ����������
         �� ���� ����, ��� ��� � ��������� 70-99.  ������ ��� ����������, �����
@@ -157,7 +157,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://cvsweb.FreeBSD.org/src/usr.bin/fetch/http.c">fetch/http.c</a></dt>
 
       <dd>�������� HTTP ��������� ���������� ������ ������������� ����, �
 	������� ������������ ��� ����� ����.  ���������� ������ ������� fetch