From root@gits.dyndns.org  Tue Oct 23 00:25:47 2001
Return-Path: <root@gits.dyndns.org>
Received: from smtp.noos.fr (lafontaine.noos.net [212.198.2.72])
	by hub.freebsd.org (Postfix) with ESMTP id B9C0637B405
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Oct 2001 00:25:43 -0700 (PDT)
Received: (qmail 85387211 invoked by uid 0); 23 Oct 2001 07:25:20 -0000
Received: from unknown (HELO gits.dyndns.org) ([212.198.229.145]) (envelope-sender <root@gits.dyndns.org>)
          by 212.198.2.72 (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 23 Oct 2001 07:25:20 -0000
Received: (from root@localhost)
	by gits.dyndns.org (8.11.6/8.11.6) id f9N7PId00496;
	Tue, 23 Oct 2001 09:25:18 +0200 (CEST)
	(envelope-from root)
Message-Id: <200110230725.f9N7PId00496@gits.dyndns.org>
Date: Tue, 23 Oct 2001 09:25:18 +0200 (CEST)
From: Cyrille Lefevre <clefevre@citeweb.net>
Reply-To: Cyrille Lefevre <clefevre@citeweb.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: global broken links fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         31447
>Category:       docs
>Synopsis:       global broken links fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 23 00:30:01 PDT 2001
>Closed-Date:    Mon Nov 5 02:36:56 PST 2001
>Last-Modified:  Mon Nov 05 02:38:20 PST 2001
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.4-STABLE FreeBSD 4.4-STABLE #9: Sun Oct 21 22:55:26 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386

>Description:
	hi,

	here is the result of a 2+ weeks works.

	I began by fixing the fact that doc and www aren't objdir
	prefix clean.  then, when everything seems everything build
	and install ok, I ran linbot from ports, to find 404 missing
	internal links (-ab). so, I try to fix almost all of them.
	I already have submited 3 PRs, one for doc objdir prefix
	clean (PR #31131), another for www objdir prefix clean (PR
	#31132) and the last for gif to png (PR #31109). this is
	the first PR concerning broken doc links fix, a second one
	will be in a day or two about the web broken links.

	about the hardware notes :
	(was doc/en_US.ISO8859-1/books/handbook/install-hw.html)
	they have been taken out of the handbook and aren't easy
	to find on the website.  in fact, it seems they only exist
	on the ftp site!  unfortunately, they are installed if
	BUILD_RELNOTES is defined, but no links point on them.
	IMHO, relnotes/4-STABLE/hardware/i386/index.html should be
	added to releases/index.html and should replace all occurences
	of handbook/install-hw.html. for instance, I've replaced
	handbook/install-hw.html by doc/en_US.ISO8859-1/handbook/install.html
	which isn't really accurate...

	about the handbook :
	the kernelopts section is missing from the handbook, is
	that normal ?

	about the contrib and the policies section :
	while they have been removed  from the handbook before to
	be inserted somewhere else ? as the cvs log says, they will
	be moved "shortly", but they aren't yet.  IMHO, it would
	be better to remove such references only when the move is
	effective and not before.

	about the missing links, the following main rules have been
	followed :

	internal urls :
		file:/... has been replaced by file://localhost/...
		index.html added ot all / terminated urls
		(these changes may help local browsing using lynx and co)

		in the second patch set, all relative or absolute references
		have been replaced by new &url... entities. this allow you
		to have the choice between the one or the other at compilation
		time using TOPLEVEL=<level> between 1 and 4 or -1 (default)
		for absolute reference.

	external urls :
		ftp://... and http://... have been / ended if not refering a file
		FreeBSD.org everywhere ;^)
		all article and book references are now relative between them
		(see the second patch set note above).
		tutorials/index.html has been replaces by docs.html#articles
		ftp://...:/... changed to ftp://.../...

	to get rid of all thoses bad links, I suggest to declare
	all internal URLs as entity as it is done for manuals and
	authors in -doc. even better would be to also declare all
	external URLs, also... but there are a lot of them!

	PS : of course, I personally prefer the second patch set :P
>How-To-Repeat:
	cd /usr/www
	make
	/usr/local/bin/linbot -ab -o /usr/share/www/linbot http://localhost/share/www/data/
	/usr/local/bin/links http://localhost/share/www/linbot/badlinks.html
>Fix:

	take care, there is two set of patches. the first one is somewhat
	simple while the second one intensively uses &url...; entities.

============================ primary fix =============================

Index: articles/committers-guide/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v
retrieving revision 1.85
diff -u -r1.85 article.sgml
--- en_US.ISO8859-1/articles/committers-guide/article.sgml	2001/10/16 11:52:49	1.85
+++ en_US.ISO8859-1/articles/committers-guide/article.sgml	2001/10/22 22:07:57
@@ -158,7 +158,7 @@
 
     <para>CVS reference information, tutorials, and FAQs can also be found at:
       <ulink
-	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>, 
+	url="http://www.cvshome.org/docs/">http://www.cvshome.org/docs/</ulink>, 
       and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
         chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
       useful.</para>
@@ -815,7 +815,7 @@
     <itemizedlist>
       <listitem>
 	<para>Add yourself to the <quote>Developers</quote> section of
-	  the <ulink url="../contributors">Contributors List</ulink>
+	  the <ulink url="../contributors/index.html">Contributors List</ulink>
 	  and remove yourself from the <quote>Additional
 	  Contributors</quote> section.</para>
 
@@ -949,11 +949,11 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/support.html">http://www.FreeBSD.org/support.html</ulink></para>
+	<para><ulink url="../../../../support.html">http://www.FreeBSD.org/support.html</ulink></para>
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/send-pr.html">http://www.FreeBSD.org/send-pr.html</ulink></para>
+	<para><ulink url="../../../../send-pr.html">http://www.FreeBSD.org/send-pr.html</ulink></para>
       </listitem>
 
       <listitem>
@@ -1089,7 +1089,7 @@
 	
 	<listitem>
 	  <para>Nik oversees the
-	    <ulink url="http://www.FreeBSD.org/docproj/index.html">Doc. Project</ulink>.
+	    <ulink url="../../../../docproj/index.html">Doc. Project</ulink>.
 	    As well as writing documentation he put together the
 	    infrastructure under <filename>doc/share/mk</filename> and the
 	    stylesheets and related code under
@@ -1098,7 +1098,7 @@
 	    <email>doc@FreeBSD.org</email> mailing list.  Committers
 	    interested in contributing to the documentation should familiarise
 	    themself with the
-	    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/fdp-primer/index.html">Documentation Project Primer</ulink>.</para>
+	    <ulink url="../../books/fdp-primer/index.html">Documentation Project Primer</ulink>.</para>
 	</listitem>
       </varlistentry>
       
@@ -1526,7 +1526,7 @@
 	    <filename>Makefile</filename> for any package or subtree
 	    which is being actively maintained by one or more people;
 	    see <ulink
-	    url="http://www.FreeBSD.org/handbook/policies.html">http://www.FreeBSD.org/handbook/policies.html</ulink>
+	    url="../../books/developers-handbook/policies.html">http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html</ulink>
 	    for documentation on this.  Where sections of code have
 	    several maintainers, commits to affected areas by one
 	    maintainer need to be reviewed by at least one other
@@ -1814,7 +1814,7 @@
 	    </screen>
 
 	    <para>The 
-	      <ulink url="http://www.FreeBSD.org/porters-handbook/index.html">Porters
+	      <ulink url="../../books/porters-handbook/index.html">Porters
 	      Handbook</ulink> contains more detailed
 	      instructions.</para>
 
Index: articles/console-server/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/console-server/article.sgml,v
retrieving revision 1.3
diff -u -r1.3 article.sgml
--- en_US.ISO8859-1/articles/console-server/article.sgml	2001/10/16 13:18:28	1.3
+++ en_US.ISO8859-1/articles/console-server/article.sgml	2001/10/22 22:07:57
@@ -82,7 +82,7 @@
       pointed out that you <em>can</em> get KVM switches that also do
       serial consoles or Sun-compatible KVM switching as well as PCs,
       but they are expensive.  See <a
-      href="http://www.avocent.com">Avocent</a> for example.]</p>
+      href="http://www.avocent.com/">Avocent</a> for example.]</p>
 
     <p>You might be tempted to do without a console terminal, but when
       things go pear-shaped you <em>really</em> need to see what is on
@@ -122,7 +122,7 @@
       terminal server software may not support that.)  Also there is
       no logging or replay of console messages.  But with a bit of
       work, and the addition of some software such as <a
-      href="http://www.conserver.com">conserver</a> (described below),
+      href="http://www.conserver.com/">conserver</a> (described below),
       this can be made to work pretty well.</p>
 
     <p>A possibility suggested by Bron Gondwana is similar to the
@@ -131,7 +131,7 @@
       the "next" server, creating a ring of console connections (in
       some sort of order).  This can be made to work reasonably well
       with the aid of the <a
-      href="http://www.conserver.com">conserver</a> software, but can
+      href="http://www.conserver.com/">conserver</a> software, but can
       be a bit confusing otherwise (i.e. remembering which port is
       connected to which console).  And you are stuck if you need to
       use serial ports for other things (such as modems) or you have
@@ -141,8 +141,8 @@
       buy an off-the-shelf solution.  These vary in price and
       capability.  See, for example, <a
       href="http://www.lightwavecom.com/">Lightwave</a>, <a
-      href="http://www.perle.com">Perle</a>, <a
-      href="http://www.avocent.com">Avocent</a> or <a
+      href="http://www.perle.com/">Perle</a>, <a
+      href="http://www.avocent.com/">Avocent</a> or <a
       href="http://www.blackbox.com/faxbacks/23000/23362.PDF">Black
       Box</a>.  These solutions can be quite expensive - typically
       $USD100 - $USD400 per port.</p>
@@ -162,12 +162,12 @@
         enough.</p></li>
 
       <li><p>A PC Unix system.  We used <a
-        href="http://www.freebsd.org">FreeBSD 4.3</a> as that is used
+        href="../../../../index.html">FreeBSD 4.3</a> as that is used
         for other tasks within our office.</p></li>
 
       <li><p>A multi-port serial card.  We chose the <a
         href="http://www.stallion.com/html/products/easyio.html">EasyIO-PCI</a>
-        8-port card from <a href="http://www.stallion.com">Stallion
+        8-port card from <a href="http://www.stallion.com/">Stallion
         Technologies</a>.  This cost us about $AUD740, or under
         $100/port, from <a href="http://www.ht.com.au/">Harris
         Technologies</a> (which has lots of stuff but is by no means
@@ -275,7 +275,7 @@
       config file with the appropriate entries.  See the
       <samp>stl(4)</samp> man page and the appropriate section of the
       <a
-      href="http://www.au.freebsd.org/handbook/kernelconfig.html">FreeBSD
+      href="../../../../doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">FreeBSD
       Handbook</a>.</p>
 
     <h4>Building World</h4>
@@ -993,7 +993,7 @@
     <h2><a name="freebsd">Using a Serial Console on FreeBSD</a></h2>
 
     <p>The procedure for doing this is described in detail in the <a
-      href="http://www.freebsd.org/handbook/serialconsole-setup.html">FreeBSD
+      href="../../../../doc/en_US.ISO8859-1/books/handbook/serialconsole-setup.html">FreeBSD
       Handbook</a>.  This is a quick summary.</p>
 
     <h4>Check the kernel configuration</h4>
@@ -1089,7 +1089,7 @@
     <p>As shipped with FreeBSD, the 8.5 version does not authenticate
       against FreeBSD servers using MD5 passwords.  There is a patch
       in the FreeBSD GNATS system (<a
-      href="http://www.freebsd.org/cgi/query-pr.cgi?pr=28432">ports/28432</a>)
+      href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28432">ports/28432</a>)
       that fixes this problem.  Kevin has indicated this patch will be
       included in future versions of conserver from him.  There are a
       couple of other problems with the 8.5 version as well.</p>
@@ -1138,7 +1138,7 @@
       href="ftp://ftp.conserver.com/conserver/conserver-7.0.2.tar.gz">FTP</a>
       the conserver 7.0.2 source tarball.</p>
 
-    <p><a href="http://www.stallion.com">Stallion Technologies</a> homepage.</p>
+    <p><a href="http://www.stallion.com/">Stallion Technologies</a> homepage.</p>
 
     <p>David Harris' <a
       href="http://www.conserver.com/consoles/msock.html">Minor Scroll
@@ -1155,7 +1155,7 @@
       similar console server</a> based on the <samp>screen</samp>
       program and an old SunOs host.</p>
 
-    <p>The <a href="http://www.realweasel.com">Real Weasel</a> company
+    <p>The <a href="http://www.realweasel.com/">Real Weasel</a> company
       makes a ISA or PCI video card that looks like a PC video card
       but actually talks to a serial port.  This can be used to
       implement serial consoles on PC hardware for operating systems
Index: articles/contributing/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributing/article.sgml,v
retrieving revision 1.471
diff -u -r1.471 article.sgml
--- en_US.ISO8859-1/articles/contributing/article.sgml	2001/10/15 13:28:21	1.471
+++ en_US.ISO8859-1/articles/contributing/article.sgml	2001/10/22 22:07:57
@@ -199,13 +199,13 @@
 	an interest in such things (and a tolerance for a
 	<emphasis>high</emphasis> volume of mail!) may subscribe to the
 	hackers mailing list by sending mail to &a.majordomo;.  See <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">The
+	url="../../books/handbook/eresources.html#ERESOURCES-MAIL">The
 	FreeBSD Handbook</ulink> for more information
 	about this and other mailing lists.</para>
 	  
       <para>If you find a bug or are submitting a specific change, please
 	report it using the &man.send-pr.1; program or its <ulink
-	  url="http://www.FreeBSD.org/send-pr.html">WEB-based
+	  url="../../../../send-pr.html">WEB-based
 	  equivalent</ulink>.  Try to fill-in each field of the bug report.
 	Unless they exceed 65KB, include any patches directly in the report.
 	If the patch is suitable to be applied to the source tree put
@@ -250,7 +250,7 @@
 	on-going release of FreeBSD known as <quote>FreeBSD-current</quote>
 	which is made available in a variety of ways for the convenience of
 	developers working actively on the system. See <ulink url="
-	http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html">The
+	../../books/handbook/current-stable.html">The
 	FreeBSD Handbook</ulink> for more
 	information about getting and using FreeBSD-current.</para>
 	  
Index: articles/contributors/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributors/article.sgml,v
retrieving revision 1.34
diff -u -r1.34 article.sgml
--- en_US.ISO8859-1/articles/contributors/article.sgml	2001/10/20 18:39:29	1.34
+++ en_US.ISO8859-1/articles/contributors/article.sgml	2001/10/22 22:07:57
@@ -259,7 +259,7 @@
 	  <listitem>
 	    <para><ulink url="http://www.osd.bsdi.com/">BSDi</ulink> (formerly Walnut Creek CDROM)
 	      has donated almost more than we can say (see the History
-	      section of the <ulink url="/handbook">FreeBSD Handbook</ulink> for more details).
+	      section of the <ulink url="../../books/handbook/index.html">FreeBSD Handbook</ulink> for more details).
 	      In particular, we would like to thank them for the original
 	      hardware used for <hostid
 		role="fqdn">freefall.FreeBSD.org</hostid>, our primary
@@ -1478,7 +1478,7 @@
 
     <title>The FreeBSD Documentation Project</title>
     
-    <para>The <ulink url="http://www.FreeBSD.org/docproj/docproj.html">FreeBSD
+    <para>The <ulink url="../../../../docproj/index.html">FreeBSD
 	Documentation Project</ulink> is responsible for a number of different
       services, each service being run by an individual and his
       <emphasis>deputies</emphasis> (if any):</para>
@@ -1605,7 +1605,7 @@
     <variablelist>
       <varlistentry>
 	<term><ulink
-	    url="http://www.FreeBSD.org/docproj/docproj.html">Documentation
+	    url="../../../../docproj/index.html">Documentation
 	    Project Manager</ulink></term>
 
 	<listitem>
@@ -1663,7 +1663,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/security/">Security
+	<term><ulink url="../../../../security/index.html">Security
 	    Officer</ulink></term>
 
 	<listitem>
@@ -1672,7 +1672,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/support.html#cvs">Source
+	<term><ulink url="../../../../support.html#cvs">Source
 	    Repository Managers</ulink></term>
 
 	<listitem>
@@ -1683,7 +1683,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/ports/">Ports
+	<term><ulink url="../../../../ports/index.html">Ports
 	    Manager</ulink></term>
 
 	<listitem>
@@ -1708,7 +1708,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/support.html#gnats">GNATS
+	<term><ulink url="../../../../support.html#gnats">GNATS
 	    Administrator</ulink></term>
 	      
 	<listitem>
Index: articles/cvsup-advanced/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v
retrieving revision 1.2
diff -u -r1.2 article.sgml
--- en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	2001/10/15 13:21:52	1.2
+++ en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	2001/10/22 22:07:57
@@ -51,7 +51,7 @@
     <title>Introduction</title>
 
       <para>If you have visited
-	<ulink url="http://www.polstra.com">John Polstra's site</ulink>
+	<ulink url="http://www.polstra.com/">John Polstra's site</ulink>
         and read
         <ulink url="http://www.polstra.com/projects/freeware/CVSup/faq.html">his
 FAQ</ulink>,
Index: articles/dialup-firewall/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v
retrieving revision 1.18
diff -u -r1.18 article.sgml
--- en_US.ISO8859-1/articles/dialup-firewall/article.sgml	2001/10/16 11:52:58	1.18
+++ en_US.ISO8859-1/articles/dialup-firewall/article.sgml	2001/10/22 22:07:57
@@ -50,7 +50,7 @@
     <para>The first thing you will need to do is recompile your kernel
       If you need more information on how to recompile the kernel,
       then the best place to start is the <ulink
-	URL="http://www.freebsd.org/handbook/kernelconfig.html">kernel
+	URL="../../books/handbook/kernelconfig.html">kernel
 	configuration section in the Handbook</ulink>. You need to add the
       following options into your kernel configuration file:</para>
 
Index: articles/explaining-bsd/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml,v
retrieving revision 1.5
diff -u -r1.5 article.sgml
--- en_US.ISO8859-1/articles/explaining-bsd/article.sgml	2001/10/16 11:52:59	1.5
+++ en_US.ISO8859-1/articles/explaining-bsd/article.sgml	2001/10/22 22:07:57
@@ -28,9 +28,9 @@
 	  Operating System Counter</ulink>, as of April 1999 31.3% of the
 	world's network connected machines run Linux.  14.6% run BSD UNIX.
 	Some of the world's largest web operations, such as <ulink
-          url="http://www.yahoo.com">Yahoo!</ulink>, run BSD.  The world's
+          url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD.  The world's
 	busiest FTP server, <ulink
-          url="ftp://ftp.cdrom.com">ftp.cdrom.com</ulink>, uses BSD to
+          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, uses BSD to
 	transfer 1.4 TB of data a day.    Clearly this is not a niche
 	market: BSD is a well-kept secret.</para>
 
@@ -145,23 +145,23 @@
       CSRG members, William F. Jolitz, wrote the remaining code and released
       it in early 1992 as <emphasis>386BSD</emphasis>.  At the same time,
       another group of ex-CSRG members formed a commercial company called
-      <ulink url="http://www.bsdi.com">Berkeley Software Design Inc.</ulink>
+      <ulink url="http://www.bsdi.com/">Berkeley Software Design Inc.</ulink>
       and released a beta version of an operating system called
-      <ulink url="http://www.bsdi.com">BSD/386</ulink>, which was based on
+      <ulink url="http://www.bsdi.com/">BSD/386</ulink>, which was based on
       the same sources.  The name of the operating system has since changed
       to BSD/OS.</para>
 
     <para>386BSD never became a stable operating system.  Instead, two other
       projects split off from it in 1993:
-      <ulink url="http://www.NetBSD.org">NetBSD</ulink> and
-      <ulink url="http://www.FreeBSD.org">FreeBSD</ulink>.  The two projects
+      <ulink url="http://www.NetBSD.org/">NetBSD</ulink> and
+      <ulink url="../../../../index.html">FreeBSD</ulink>.  The two projects
       originally diverged due to differences in patience waiting for
       improvements to 386BSD: the NetBSD people started early in the year,
       and the first version of FreeBSD was not ready until the end of the
       year.  In the meantime, the code base had diverged sufficiently to
       make it difficult to merge.  In addition, the projects had different
       aims, as we will see below.  In 1996, a further project,
-      <ulink url="http://www.OpenBSD.org">OpenBSD</ulink>, split off from
+      <ulink url="http://www.OpenBSD.org/">OpenBSD</ulink>, split off from
       NetBSD.</para>
   </sect1>
   
@@ -191,7 +191,7 @@
 
       <listitem>
 	<para>In 1992, AT&amp;T sued
-	  <ulink url="http://www.bsdi.com">BSDI</ulink>,
+	  <ulink url="http://www.bsdi.com/">BSDI</ulink>,
 	  the vendor of BSD/386, alleging that the product contained
 	  AT&amp;T-copyrighted code.  The case was settled out of court in
 	  1994, but the spectre of the litigation continues to haunt people.
@@ -245,7 +245,7 @@
       <para>The BSD kernels are developed and updated following the Open
 	Source development model.  Each project maintains a publicly
 	accessible <emphasis>source tree</emphasis> under the
-	<ulink url="http://www.sourcegear.com/CVS">Concurrent Versions
+	<ulink url="http://www.sourcegear.com/CVS/">Concurrent Versions
 	  System</ulink> (CVS), which contains all source files for the
 	project, including documentation and other incidental files.  CVS
 	allows users to <quote>check out</quote> (in other words, to
@@ -436,7 +436,7 @@
 	<listitem>
 	  <para><ulink url="http://www.apple.com/macosx/server/">Mac OS
 	      X</ulink> is the latest version of the operating system for
-	    <ulink url="http://www.apple.com">Apple Computer Inc.'s</ulink>
+	    <ulink url="http://www.apple.com/">Apple Computer Inc.'s</ulink>
 	      Macintosh line.  Unlike the rest of the operating system, the
 	      kernel is open source.  As part of this development, key Apple
 	      developers have commit access to the FreeBSD source tree.</para>
@@ -528,7 +528,7 @@
 
       <para>In addition, each of the projects has a list of consultants for
 	hire:
-	<ulink url="http://www.freebsd.org/commercial/consulting_bycat.html">FreeBSD</ulink>,
+	<ulink url="../../../../commercial/consulting_bycat.html">FreeBSD</ulink>,
 	<ulink url="http://www.netbsd.org/gallery/consultants.html">NetBSD</ulink>,
 	and <ulink url="http://www.openbsd.org/support.html">OpenBSD</ulink>.</para>
     </sect2>
Index: articles/filtering-bridges/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v
retrieving revision 1.3
diff -u -r1.3 article.sgml
--- en_US.ISO8859-1/articles/filtering-bridges/article.sgml	2001/10/16 11:52:59	1.3
+++ en_US.ISO8859-1/articles/filtering-bridges/article.sgml	2001/10/22 22:07:57
@@ -102,7 +102,7 @@
 
     <para>For instructions on how to build and install a new kernel, refer to
       the
-      <ulink url="http://www.FreeBSD.org/handbook/kernelconfig-building.html">Building and Installing a Custom Kernel</ulink> section of the handbook</para>
+      <ulink url="../../books/handbook/kernelconfig-building.html">Building and Installing a Custom Kernel</ulink> section of the handbook</para>
   </sect1>
 
   <sect1 id="filtering-bridges-finalprep">
Index: articles/fonts/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/fonts/article.sgml,v
retrieving revision 1.18
diff -u -r1.18 article.sgml
--- en_US.ISO8859-1/articles/fonts/article.sgml	2001/10/16 11:52:59	1.18
+++ en_US.ISO8859-1/articles/fonts/article.sgml	2001/10/22 22:07:57
@@ -24,7 +24,7 @@
 
 <!-- The section "Setting a virtual console to 80x60 line mode" was
      updated to reflect changes in FreeBSD system configuration
-     files by Mark Ovens <mark@ukug.uk.freebsd.org> 27/5/00
+     files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
  -->
 
 <article>
@@ -662,7 +662,7 @@
 	    metric (<filename>.afm</filename>) file.</para>
 
 	  <para>Currently available at <ulink
-	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf</ulink>.
+	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/</ulink>.
 	    Note: These files are postscript programs and must be
 	    downloaded to disk by holding down the
 	    <keycap>Shift</keycap> key when clicking on the link.
@@ -850,7 +850,7 @@
       <listitem>
         <para>The freetype module is included with XFree86 4.x.  For
         more information please see the <ulink
-        url="http://www.freebsd.org/handbook/x-fonts.html">FreeBSD
+        url="../../books/handbook/x-fonts.html">FreeBSD
         Handbook</ulink> or the <ulink
         url="http://www.xfree86.org/4.0.2/fonts.html">XFree86 4.0.2
         Fonts</ulink> page.</para>
@@ -871,15 +871,15 @@
       <listitem>
 	<para><command>xfstt</command> is another font server for X11,
 	  available under <ulink url="
-	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts">
-	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts</ulink>.</para>
+	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts/">
+	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts/</ulink>.</para>
       </listitem>
 
       <listitem>
 	<para>A program called <command>ttf2bdf</command> can produce
 	  BDF files suitable for use in an X environment from TrueType
 	  files.  Linux binaries are said to be available from <ulink
-	    url="ftp://crl.nmsu.edu/CLR/multiling/General">ftp://crl.nmsu.edu/CLR/multiling/General/</ulink>.</para>
+	    url="ftp://crl.nmsu.edu/CLR/multiling/General/">ftp://crl.nmsu.edu/CLR/multiling/General/</ulink>.</para>
       </listitem>
 
       <listitem>
@@ -912,7 +912,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="ftp://ftp.winsite.com">ftp://ftp.winsite.com</ulink>
+	    url="ftp://ftp.winsite.com/">ftp://ftp.winsite.com/</ulink>
 	  (Formerly CICA)</para>
       </listitem>
 
@@ -928,12 +928,12 @@
 
       <listitem>
 	<para><ulink
-	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html</ulink></para>
+	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/</ulink></para>
       </listitem>
 
       <listitem>
 	<para><ulink
-	    url="http://www.esselte.com/letraset/index.html">http://www.esselte.com/letraset/index.html</ulink></para>
+	    url="http://www.esselte.com/letraset/">http://www.esselte.com/letraset/</ulink></para>
       </listitem>
 
       <listitem>
Index: articles/multi-os/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/multi-os/article.sgml,v
retrieving revision 1.19
diff -u -r1.19 article.sgml
--- en_US.ISO8859-1/articles/multi-os/article.sgml	2001/10/16 11:53:00	1.19
+++ en_US.ISO8859-1/articles/multi-os/article.sgml	2001/10/22 22:07:57
@@ -48,7 +48,7 @@
       completely occupied by DOS, you might find the FIPS utility
       (included on the FreeBSD CDROM in the
       <filename>\TOOLS</filename> directory or via <ulink
-	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>)
+	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>)
       useful.  It lets you repartition your hard disk without
       destroying the data already on it.  There is also a commercial
       program available called Partition Magic, which lets you size
@@ -105,7 +105,7 @@
 	    selecting the OS with your arrow keys.  It is included on
 	    the FreeBSD CD in the <filename>\TOOLS</filename>
 	    directory, and via <ulink
-	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>.</para>
+	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>.</para>
 	</listitem>
       </varlistentry>
 
@@ -277,7 +277,7 @@
       previous boot manager.  Boot Easy can be reinstalled by using
       the BOOTINST.EXE utility included in the \TOOLS directory on the
       CDROM, and via <ulink
-	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>.
+	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>.
       You can also re-start the installation process and go to the
       partition editor.  From there, mark the FreeBSD partition as
       bootable, select Boot Manager, and then type W to (W)rite out
@@ -344,13 +344,14 @@
 	mini-HOWTO</ulink> might be interesting as well.  The <ulink
 	URL="http://www.in.net/~jkatz/win95/Linux-HOWTO.html">Linux-HOWTO</ulink>
       is also helpful.</para>
-
+<![ IGNORE [
+<!-- dead link -->
     <para>The <ulink
 	URL="http://www.dorsai.org/~dcl/publications/NTLDR_Hacking">NT
 	Loader Hacking Guide</ulink> provides good information on
       multibooting Windows NT, '95, and DOS with other operating
       systems.</para>
-
+]]>
     <para>And Hale Landis's "How It Works" document pack contains some
       good info on all sorts of disk geometry and booting related
       topics.  You can find it at
Index: articles/new-users/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/new-users/article.sgml,v
retrieving revision 1.28
diff -u -r1.28 article.sgml
--- en_US.ISO8859-1/articles/new-users/article.sgml	2001/10/16 11:53:00	1.28
+++ en_US.ISO8859-1/articles/new-users/article.sgml	2001/10/22 22:07:57
@@ -689,7 +689,7 @@
       <command>lp</command> or <command>lpr</command> should send a
       file to the printer.  Whether or not the file actually prints
       depends on configuring it, which is covered in the <ulink
-      URL="../../books/handbook/handbook.html">FreeBSD
+      URL="../../books/handbook/index.html">FreeBSD
       handbook.</ulink></para>
   </sect1>
 
@@ -792,7 +792,7 @@
       edit files, so you can get everything up and running.  There is
       a great deal of information in the FreeBSD handbook (which is
       probably on your hard drive) and <ulink
-      URL="http://www.FreeBSD.org/">FreeBSD's web site</ulink>.  A
+      URL="../../../../index.html">FreeBSD's web site</ulink>.  A
       wide variety of packages and ports are on the CDROM as well as
       the web site.  The handbook tells you more about how to use them
       (get the package if it exists, with <command>pkg_add
@@ -882,7 +882,7 @@
       space after the slash.)</para>
 
     <para>You might want to get the most recent version of Netscape
-      from their <ulink URL="ftp://ftp.netscape.com">FTP site</ulink>.
+      from their <ulink URL="ftp://ftp.netscape.com/">FTP site</ulink>.
       (Netscape requires the X Window System.) There is now a FreeBSD
       version, so look around carefully.  Just use <command>gunzip
       <replaceable>filename</replaceable></command> and <command>tar
Index: articles/programming-tools/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/programming-tools/article.sgml,v
retrieving revision 1.17
diff -u -r1.17 article.sgml
--- en_US.ISO8859-1/articles/programming-tools/article.sgml	2001/09/02 23:53:58	1.17
+++ en_US.ISO8859-1/articles/programming-tools/article.sgml	2001/10/22 22:07:57
@@ -11,7 +11,7 @@
     <title>This document has moved!</title>
 
     <para>This document has been integrated into the <ulink
-      url="../../books/developers-handbook/">Developer's
+      url="../../books/developers-handbook/index.html">Developer's
       Handbook</ulink>.  Please update your bookmarks.</para>
   </sect1>
 </article>
Index: articles/pxe/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pxe/article.sgml,v
retrieving revision 1.8
diff -u -r1.8 article.sgml
--- en_US.ISO8859-1/articles/pxe/article.sgml	2001/10/16 11:53:00	1.8
+++ en_US.ISO8859-1/articles/pxe/article.sgml	2001/10/22 22:07:57
@@ -80,7 +80,7 @@
     <procedure>
       <step>
         <para>Install DHCP : Install isc-dhcp-2.0 you can use this config file 
-          <ulink url="http://people.freebsd.org/~alfred/pxe/dhcpd.conf">
+          <ulink url="http://people.FreeBSD.org/~alfred/pxe/dhcpd.conf">
           dhcpd.conf</ulink>, stick it in /usr/local/etc/</para>
       </step>
       
Index: articles/serial-uart/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml,v
retrieving revision 1.2
diff -u -r1.2 article.sgml
--- en_US.ISO8859-1/articles/serial-uart/article.sgml	2001/10/16 11:53:01	1.2
+++ en_US.ISO8859-1/articles/serial-uart/article.sgml	2001/10/22 22:07:57
@@ -2035,7 +2035,7 @@
 	      
         <para>If you do not already have a custom kernel
 	  configuration file set up, refer to <ulink
-	  url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">Kernel
+	  url="../../books/handbook/kernelconfig.html">Kernel
 	  Configuration</ulink> chapter of the FreeBSD Handbook for
 	  general procedures.  The following are the specifics for the
 	  Boca 16 board and assume you are using the kernel name
Index: books/corp-net-guide/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v
retrieving revision 1.3
diff -u -r1.3 book.sgml
--- en_US.ISO8859-1/books/corp-net-guide/book.sgml	2001/06/24 21:01:54	1.3
+++ en_US.ISO8859-1/books/corp-net-guide/book.sgml	2001/10/22 22:07:59
@@ -26,7 +26,7 @@
 	distributed without the publisher's express written
 	<email>Chanda.Leary-Coutu@awl.com</email>.
 	The other chapters of
-	<ulink url="http://www.awl.com/cseng/titles/0-201-70481-1">the
+	<ulink url="http://cseng.aw.com/book/0,,0201704811,00.html">the
 	  book</ulink> covers topics such as system administration,
 	fileserving, and e-mail delivery.  More information about this book is
 	available from the publisher, with whom you can also sign up to
@@ -571,7 +571,7 @@
 	    play.  I prefer using these devices because they are much cheaper
 	    and more reliable than a standalone PC running printserver
 	    software.  For example, Castelle
-	    <ulink url="http://www.castelle.com">http://www.castelle.com</ulink>
+	    <ulink url="http://www.castelle.com/">http://www.castelle.com/</ulink>
 	    sells the LANpress 1P/10BT printserver for about $170.00.  Using
 	    these devices a FreeBSD UNIX server can have dozens of print spools
 	    accepting print jobs and then route them back out over the network
@@ -684,7 +684,7 @@
 
 	  <step>
 	    <para>Obtain the <filename>TCP16.EXE</filename> file from
-	      <ulink url="ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe">ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe</ulink>.</para>
+	      <ulink url="ftp://ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe">ftp://ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe</ulink>.</para>
 	  </step>
 
 	  <step>
@@ -2131,7 +2131,7 @@
 
 	  <para>The better solution is to use a simple filter that converts
 	    incoming text from UNIX style to DOS style.  The following filter
-	    posted on questions@freebsd.org and the sample
+	    posted on questions@FreeBSD.org and the sample
 	    <filename>/etc/printcap</filename> entry can be used to do
 	    this:</para>
 
Index: books/developers-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v
retrieving revision 1.29
diff -u -r1.29 book.sgml
--- en_US.ISO8859-1/books/developers-handbook/book.sgml	2001/10/17 08:53:34	1.29
+++ en_US.ISO8859-1/books/developers-handbook/book.sgml	2001/10/22 22:07:59
@@ -38,12 +38,12 @@
 	helping with this project, send email to the &a.doc;.</para>
 
       <para>The latest version of this document is always available
-        from the <ulink URL="http://www.FreeBSD.org/">FreeBSD World
+        from the <ulink URL="../../../../index.html">FreeBSD World
         Wide Web server</ulink>.  It may also be downloaded in a
         variety of formats and compression options from the <ulink
-        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP
+        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP
         server</ulink> or one of the numerous <ulink
-        url="http://www.freebsd.org/handbook/mirrors-ftp.html">mirror
+        url="../handbook/mirrors-ftp.html">mirror
         sites</ulink>.</para>
     </abstract>
   </bookinfo>
Index: books/developers-handbook/driverbasics/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml,v
retrieving revision 1.9
diff -u -r1.9 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml	2001/09/02 09:02:29	1.9
+++ en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml	2001/10/22 22:07:59
@@ -353,11 +353,11 @@
       <listitem><simpara><ulink
 	url="http://www.daemonnews.org/200010/blueprints.html">Dynamic
 	Kernel Linker (KLD) Facility Programming Tutorial</ulink> -
-	<ulink url="http://www.daemonnews.org">Daemonnews</ulink> October 2000</simpara></listitem>
+	<ulink url="http://www.daemonnews.org/">Daemonnews</ulink> October 2000</simpara></listitem>
       <listitem><simpara><ulink
 	url="http://www.daemonnews.org/200007/newbus-intro.html">How
 	to Write Kernel Drivers with NEWBUS</ulink> - <ulink
-	url="http://www.daemonnews.org">Daemonnews</ulink> July
+	url="http://www.daemonnews.org/">Daemonnews</ulink> July
 	2000</simpara></listitem>
     </itemizedlist>
     </para>
Index: books/developers-handbook/ipv6/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml,v
retrieving revision 1.4
diff -u -r1.4 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml	2001/07/17 22:20:45	1.4
+++ en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml	2001/10/22 22:07:59
@@ -15,7 +15,7 @@
 
     <para>This section should explain IPv6 and IPsec related implementation
     internals.  These functionalities are derived from <ulink
-    url="http://www.kame.net">KAME project</ulink></para>
+    url="http://www.kame.net/">KAME project</ulink></para>
 
     <sect2 id="ipv6details">
       <title>IPv6</title>
Index: books/developers-handbook/kerneldebug/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v
retrieving revision 1.34
diff -u -r1.34 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml	2001/07/19 22:06:06	1.34
+++ en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml	2001/10/22 22:07:59
@@ -25,7 +25,7 @@
       <filename>/etc/fstab</filename>. Dumps to non-swap devices,
       tapes for example, are currently not supported. Config your
       kernel using <command>config <option>-g</option></command>.  See
-      <ulink url="http://www.FreeBSD.org/handbook">The FreeBSD
+      <ulink url="../handbook/index.html">The FreeBSD
       Handbook</ulink> for details on configuring the FreeBSD
       kernel.</para>
 
@@ -315,7 +315,7 @@
       <programlisting>options DDB</programlisting>
 
       to your config file, and rebuild.  (See <ulink
-	url="http://www.FreeBSD.org/handbook">The FreeBSD Handbook</ulink> for details on
+	url="../handbook/index.html">The FreeBSD Handbook</ulink> for details on
       configuring the FreeBSD kernel.</para>
 
     <note>
Index: books/developers-handbook/l10n/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v
retrieving revision 1.2
diff -u -r1.2 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml	2001/09/13 00:30:04	1.2
+++ en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml	2001/10/22 22:07:59
@@ -47,10 +47,10 @@
 	
 	<para> Michael C. Wu will be maintaining an I18N works in progress
 	  homepage at <ulink
-	  url="http://www.FreeBSD.org/~keichii/i18n/index.html">http://www.FreeBSD.org/~keichii/i18n/index.html</ulink>
+	  url="http://people.FreeBSD.org/~keichii/i18n/">http://people.FreeBSD.org/~keichii/i18n/</ulink>
 	  Please also read the BSDCon2000 I18N paper and presentations
 	  by Clive Lin, Chia-Liang Kao, and Michael C. Wu at <ulink
-	  url="http://www.FreeBSD.org/~keichii/papers/">http://www.FreeBSD.org/~keichii/papers/</ulink></para>
+	  url="http://people.FreeBSD.org/~keichii/papers/">http://people.FreeBSD.org/~keichii/papers/</ulink></para>
       </sect2>
 
       <sect2>
@@ -80,4 +80,4 @@
 	<programlisting><envar>setenv LD_PRELOAD /usr/lib/libxpg4.so</envar></programlisting>
       </sect2>
     </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
Index: books/developers-handbook/pci/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml,v
retrieving revision 1.3
diff -u -r1.3 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml	2001/04/09 08:26:38	1.3
+++ en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml	2001/10/22 22:07:59
@@ -205,7 +205,7 @@
       
     <para>Additional Resources
     <itemizedlist>
-      <listitem><simpara><ulink url="http://www.pcisig.org">PCI
+      <listitem><simpara><ulink url="http://www.pcisig.org/">PCI
 	Special Interest Group</ulink></simpara></listitem>
 
       <listitem><simpara>PCI System Architecture, Fourth Edition by
Index: books/developers-handbook/policies/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v
retrieving revision 1.22
diff -u -r1.22 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml	2001/10/17 08:53:34	1.22
+++ en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml	2001/10/22 22:07:59
@@ -249,7 +249,7 @@
 
       <listitem>
         <para>Any encumbered file requires specific approval from the 
-	  <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> before it is added to the
+	  <ulink url="../../articles/contributors/staff-core.html">Core team</ulink> before it is added to the
 	  CVS repository.</para>
       </listitem>
 
@@ -280,9 +280,9 @@
 
           <listitem>
             <para>Should always be in <filename>LINT</filename>, but the 
-	      <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> decides per case if it
+	      <ulink url="../../articles/contributors/staff-core.html">Core team</ulink> decides per case if it
 	      should be commented out or not.  The 
-	      <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> can, of course, change
+	      <ulink url="../../articles/contributors/staff-core.html">Core team</ulink> can, of course, change
 	      their minds later on.</para>
           </listitem>
 
@@ -299,13 +299,13 @@
         <orderedlist>
           <listitem>
             <indexterm><primary>core team</primary></indexterm>
-            <para>The <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> decides if
+            <para>The <ulink url="../../articles/contributors/staff-core.html">Core team</ulink> decides if
               the code should be part of <command>make world</command>.</para>
           </listitem>
          
           <listitem>
             <indexterm><primary>release engineer</primary></indexterm>
-            <para>The <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html">Release Engineer</ulink>
+            <para>The <ulink url="../../articles/contributors/staff-who.html">Release Engineer</ulink>
               decides if it goes in to the release.</para>
           </listitem>
         </orderedlist>
Index: books/developers-handbook/secure/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml,v
retrieving revision 1.11
diff -u -r1.11 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml	2001/08/28 12:50:03	1.11
+++ en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml	2001/10/22 22:07:59
@@ -440,7 +440,7 @@
       auditing, access control lists, fine grained privileges,
       information labeling, and mandatory access control.</para>
       <para>This is a work in progress and is the focus of the <ulink
-      url="http://www.trustedbsd.org">TrustedBSD</ulink> project.  Some
+      url="http://www.trustedbsd.org/">TrustedBSD</ulink> project.  Some
       of the initial work has been committed to FreeBSD-current
       (cap_set_proc(3)).</para>
 
Index: books/developers-handbook/tools/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml	2001/09/02 09:24:05	1.10
+++ en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml	2001/10/22 22:07:59
@@ -106,7 +106,7 @@
 
       <para>Here is a list of interpreters that are available as
 	<ulink
-	  URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/">FreeBSD
+	  URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">FreeBSD
 	  packages</ulink>, with a brief discussion of some of the
 	more popular interpreted languages.</para>
 
@@ -133,12 +133,12 @@
 	      for Visual Basic.</para>
 
 	    <para>The <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/bwbasic-2.10.tgz">Bywater
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/bwbasic-2.10.tgz">Bywater
 		Basic Interpreter</ulink> and the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/pbasic-2.0.tgz">Phil
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/pbasic-2.0.tgz">Phil
 		Cockroft's Basic Interpreter</ulink> (formerly Rabbit
 	      Basic) are available as <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/">FreeBSD
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">FreeBSD
 		packages</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -159,7 +159,7 @@
 	      language, but can be rather large and unwieldy.</para>
 
 	    <para>FreeBSD has <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/gcl-2.0.tgz">GNU
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/gcl-2.0.tgz">GNU
 		Common Lisp</ulink> available as a package.</para>
 	  </listitem>
 	</varlistentry>
@@ -187,11 +187,11 @@
 	      abstraction to be used in research work.</para>
 
 	    <para>FreeBSD has packages of the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/elk-3.0.tgz">Elk
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/elk-3.0.tgz">Elk
 		Scheme Interpreter</ulink>, the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/mit-scheme-7.3.tgz">MIT
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/mit-scheme-7.3.tgz">MIT
 		Scheme Interpreter</ulink> and the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/scm-4e1.tgz">SCM
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/scm-4e1.tgz">SCM
 		Scheme Interpreter</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -201,7 +201,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/icon-9.0.tgz">The
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/icon-9.0.tgz">The
 		Icon Programming Language</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -211,7 +211,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/ucblogo-3.3.tgz">Brian
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/ucblogo-3.3.tgz">Brian
 		Harvey's LOGO Interpreter</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -221,7 +221,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/python-1.2">The
+		URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/lang/python-1.2.tgz">The
 		Python Object-Oriented Programming
 		Language</ulink></para>
 	  </listitem>
@@ -1694,7 +1694,7 @@
       <para>And doubtless many more that I've overlooked.</para>
 
       <para>Emacs can be installed on FreeBSD using <ulink
-	  URL="../../ports/editors.html">the Emacs
+	  URL="../../../../ports/editors.html">the Emacs
 	  port</ulink>.</para>
 
       <para>Once it's installed, start it up and do <userinput>C-h
@@ -1777,7 +1777,7 @@
 	quite big!).</para>
 
       <para>The best way to learn Emacs Lisp is to download the <ulink
-	  URL="ftp://prep.ai.mit.edu:pub/gnu/elisp-manual-19-2.4.tar.gz">Emacs
+	  URL="ftp://prep.ai.mit.edu/pub/gnu/elisp-manual-19-2.4.tar.gz">Emacs
 	  Tutorial</ulink></para>
 
       <para>However, there's no need to actually know any Lisp to get
Index: books/faq/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.273
diff -u -r1.273 book.sgml
--- en_US.ISO8859-1/books/faq/book.sgml	2001/10/17 06:49:04	1.273
+++ en_US.ISO8859-1/books/faq/book.sgml	2001/10/22 22:08:00
@@ -41,13 +41,13 @@
         construction. If you are interested in helping with this project,
         send email to the &a.doc;.  The latest version of this
         document is always available from the <ulink
-        URL="http://www.FreeBSD.org/">FreeBSD World Wide Web
+        URL="../../../../index.html">FreeBSD World Wide Web
         server</ulink>. It may also be downloaded as one large <ulink
         URL="book.html">HTML</ulink> file with HTTP or as plain text,
         postscript, PDF, etc. from the <ulink
         URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP
         server</ulink>. You may also want to <ulink
-        URL="http://www.FreeBSD.org/search/search.html">Search the
+        URL="../../../../search/index.html">Search the
         FAQ</ulink>.</para>
     </abstract>
   </bookinfo>
@@ -82,14 +82,14 @@
            Berkeley's <quote>Net/2</quote> to the i386, known as <quote>386BSD</quote>, though very
            little of the 386BSD code remains.  A fuller description of
            what FreeBSD is and how it can work for you may be found on
-           the <ulink URL="http://www.FreeBSD.org/">FreeBSD home
+           the <ulink URL="../../../../index.html">FreeBSD home
            page</ulink>.</para>
 
          <para>FreeBSD is used by companies, Internet Service Providers,
            researchers, computer professionals, students and home users
            all over the world in their work, education and recreation.
            See some of them in the <ulink
-           URL="http://www.FreeBSD.org/gallery/gallery.html">FreeBSD
+           URL="../../../../gallery/index.html">FreeBSD
            Gallery</ulink>.</para>
 
          <para>For more detailed information on FreeBSD, please see the
@@ -117,16 +117,16 @@
             Software and one that we enthusiastically support.</para>
 
           <para>That code in our source tree which falls under the <ulink
-            url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public
+            url="../../../../copyright/COPYING">GNU General Public
               License (GPL)</ulink> or <ulink
-            url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library
+            url="../../../../copyright/COPYING.LIB">GNU Library
               General Public License (LGPL)</ulink> comes with slightly more
             strings attached, though at least on the side of enforced access
             rather than the usual opposite.  Due to the additional complexities
             that can evolve in the commercial use of GPL software, we do,
             however, endeavor to replace such software with submissions under
             the more relaxed <ulink
-            url="http://www.FreeBSD.org/copyright/freebsd-license.html">
+            url="../../../../copyright/freebsd-license.html">
               FreeBSD copyright</ulink> whenever possible.</para>
         </answer>
       </qandaentry>
@@ -229,7 +229,7 @@
             treated with contempt.</para>
 
           <para>Every day, <ulink
-            URL="http://www.FreeBSD.org/releases/snapshots.html">snapshot
+            URL="../../../../releases/snapshots.html">snapshot
             </ulink> releases are made based on the current state of the
             -CURRENT and -STABLE branches. Nowadays, distributions of the
             occasional snapshot are now being made available. The goals
@@ -289,7 +289,7 @@
         <answer>
           <para>Back when FreeBSD 2.0.5 was released, we decided to
             branch FreeBSD development into two parts.  One branch was
-            named <ulink URL="../handbook/stable.html">-STABLE</ulink>,
+            named <ulink URL="../handbook/current-stable.html#STABLE">-STABLE</ulink>,
             with the intention that only well-tested bug fixes and small
             incremental enhancements would be made to it (for Internet
             Service Providers and other commercial enterprises for whom
@@ -378,9 +378,9 @@
           <para>The key decisions concerning the FreeBSD project, such as
             the overall direction of the project and who is allowed to add
             code to the source tree, are made by a <ulink
-            URL="../handbook/staff.html#STAFF-CORE">core team</ulink> of
+            URL="../../articles/contributors/staff-core.html">core team</ulink> of
             9 people. There is a much larger team of more than 200 <ulink
-            URL="../handbook/staff-committers.html">committers</ulink> who
+            URL="../../articles/contributors/staff-committers.html">committers</ulink> who
             are authorized to make changes directly to the FreeBSD source
             tree.</para>
 
@@ -456,7 +456,7 @@
 
         <answer>
           <para>You can find full information in the <ulink
-            URL="http://www.FreeBSD.org/y2kbug.html">FreeBSD Y2K
+            URL="../../../../y2kbug.html">FreeBSD Y2K
             page</ulink>.</para>
         </answer>
       </qandaentry>
@@ -548,7 +548,7 @@
           <para>The Problem Report database of all user change requests
             may be queried (or submitted to) by using our web-based PR
             <ulink
-            URL="http://www.FreeBSD.org/send-pr.html">submission</ulink>
+            URL="../../../../send-pr.html">submission</ulink>
             and <ulink
             URL="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
             query</ulink>
@@ -847,11 +847,11 @@
 
           <para>For example, the split HTML version of the FAQ, compressed
             using &man.gzip.1;, can be found in the
-            <filename>en_US.ISO8859-1/books/faq/book.html-split.tar.gz</filename>
+            <filename>doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</filename>
             file.  To download and uncompress that file you would have to do
             this.</para>
 
-          <screen>&prompt.root; <userinput>fetch ftp://ftp.freebsd.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</userinput>
+          <screen>&prompt.root; <userinput>fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</userinput>
 &prompt.root; <userinput>gzip -d book.html-split.tar.gz</userinput>
 &prompt.root; <userinput>tar xvf book.html-split.tar</userinput></screen>
 
@@ -936,12 +936,12 @@
           <itemizedlist>
             <listitem>
               <para>The <ulink
-                URL="http://www.FreeBSD.org/">FreeBSD Home Page</ulink>.</para>
+                URL="../../../../index.html">FreeBSD Home Page</ulink>.</para>
             </listitem>
 
             <listitem>
               <para><anchor id="pao">If you have a laptop, be sure and see
-                <ulink URL="http://www.jp.FreeBSD.org/PAO/">Tatsumi
+                <ulink URL="http://www.jp.FreeBSD.org/FAO/">Tatsumi
                 Hosokawa's Mobile Computing page</ulink> in Japan.</para>
             </listitem>
 
@@ -977,7 +977,7 @@
 	<firstname>Nik</firstname>
 	<surname>Clayton</surname>
 	<affiliation>
-	  <address><email>nik@freebsd.org</email></address>
+	  <address><email>nik@FreeBSD.org</email></address>
 	</affiliation>
       </author>
     </chapterinfo>
@@ -1182,7 +1182,7 @@
 
         <answer>
           <para>Have a look at
-            <ulink URL="http://www.FreeBSD.org/tutorials/multi-os/">
+            <ulink URL="../../articles/multi-os/index.html">
             The multi-OS page</ulink>.</para>
         </answer>
       </qandaentry>
@@ -1352,7 +1352,7 @@
             <step>
               <para>Download <filename>boot1</filename> and
                 <filename>boot2</filename> from <ulink
-                  url="http://people.freebsd.org/~bmah/ThinkPad/">http://people.freebsd.org/~bmah/ThinkPad/</ulink>.
+                  url="http://people.FreeBSD.org/~bmah/ThinkPad/">http://people.FreeBSD.org/~bmah/ThinkPad/</ulink>.
                 Put these files somewhere you will be able to retrieve them
                 later.</para>
             </step>
@@ -2160,10 +2160,10 @@
           <para>We <emphasis>strongly</emphasis> recommend that you use
             binary snapshots to do this. 4-STABLE snapshots are available at
             <ulink
-            URL="ftp://releng4.FreeBSD.org/">releng4.FreeBSD.org</ulink>.</para>
+            URL="ftp://releng4.FreeBSD.org/">ftp://releng4.FreeBSD.org/</ulink>.</para>
 
           <para>If you wish to upgrade using source, please see the <ulink
-            URL="http://www.FreeBSD.org/handbook/cutting-edge.html">FreeBSD
+            URL="../handbook/cutting-edge.html">FreeBSD
             Handbook</ulink> for more information.</para>
 
           <caution>
@@ -2486,7 +2486,7 @@
 
         <answer>
           <para>There is a list of these in the <ulink
-            URL="../handbook/install-hw.html#INSTALL-MISC">Miscellaneous
+            URL="../handbook/install.html#INSTALL-MISC">Miscellaneous
             devices</ulink> section of the handbook.</para>
 
           <para>Some unnamed clone cards have also been known to work,
@@ -3009,7 +3009,7 @@
 
         <answer>
           <para>See the <ulink
-            URL="../handbook/install-hw.html#INSTALL-NICS">
+            URL="../handbook/install.html#INSTALL-NICS">
             Ethernet cards</ulink> section of the handbook for a more
             complete list.</para>
         </answer>
@@ -4367,7 +4367,7 @@
           interest in FreeBSD can have very positive effects on FreeBSD's
           long-term viability). We encourage commercial software vendors to
           send their entries here for inclusion. See <ulink
-          URL="http://www.FreeBSD.org/commercial/commercial.html">the
+          URL="../../../../commercial/index.html">the
           Vendors page</ulink> for a longer list.</para>
       </note>
 
@@ -4379,9 +4379,9 @@
         <answer>
 	  <itemizedlist>
   	    <listitem>
-	      <para><ulink url="http://www.freebsdmall.com">The FreeBSD Mall</ulink>
+	      <para><ulink url="http://www.freebsdmall.com/">The FreeBSD Mall</ulink>
                 offers a FreeBSD native version of <ulink
-                url="http://www.vistasource.com">VistaSource</ulink>
+                url="http://www.vistasource.com/">VistaSource</ulink>
                 ApplixWare 5.</para>
 	
 	      <para>ApplixWare is a rich full-featured, commercial
@@ -4397,14 +4397,14 @@
   	    </listitem>
 	    <listitem>
 	      <para>The Linux version of <ulink
-	        url="http://www.sun.com/staroffice">StarOffice</ulink>
+	        url="http://www.sun.com/staroffice/">StarOffice</ulink>
 	        works flawlessly on FreeBSD.  The easiest way to
 	        install the Linux version of StarOffice is through the
 	        <ulink
 	        url="../handbook/ports.html">FreeBSD
 	        Ports collection</ulink>.  Future versions of the
 	        open-source <ulink
-	        url="http://www.openoffice.org">OpenOffice</ulink>
+	        url="http://www.openoffice.org/">OpenOffice</ulink>
 	        suite should work as well.</para>
 	    </listitem>
 	  </itemizedlist>
@@ -4424,7 +4424,7 @@
 
 	    <note>
 	      <para>The Open Motif distribution only allows redistribution
-		if it is running on an <ulink url="http://www.opensource.org">
+		if it is running on an <ulink url="http://www.opensource.org/">
 		  open source</ulink> operating system.</para>
 	    </note>
 	  </para>
@@ -4578,7 +4578,7 @@
             source X11 desktop which is similar to CDE in many respects.
             You might also like the look and feel of <ulink
             URL="http://www.xfce.org/">xfce</ulink>. KDE and xfce are both
-            in the <ulink URL="http://www.FreeBSD.org/ports/">ports
+            in the <ulink URL="../../../../ports/index.html">ports
             system</ulink>.</para>
         </answer>
       </qandaentry>
@@ -4678,11 +4678,11 @@
 
         <answer>
           <para>Yes! See the <ulink
-            URL="http://www.FreeBSD.org/commercial/software_bycat.html#CATEGORY_DATABASE">
+            URL="../../../../commercial/software_bycat.html#CATEGORY_DATABASE">
             Commercial Vendors</ulink> section of FreeBSD's Web site.</para>
 
           <para>Also see the <ulink
-            URL="http://www.FreeBSD.org/ports/databases.html">
+            URL="../../../../ports/databases.html">
             Databases</ulink> section of the Ports collection.</para>
         </answer>
       </qandaentry>
@@ -4727,7 +4727,7 @@
 
         <answer>
           <para>Please take a look at
-            <ulink URL="http://www.FreeBSD.org/ports/">the ports
+            <ulink URL="../../../../ports/index.html">the ports
             page</ulink> for info on software packages ported to FreeBSD.
             The list currently tops 3400 and is growing daily, so come back
             to check often or subscribe to the
@@ -4926,7 +4926,7 @@
 
         <answer>
           <para>Yes. Please see <ulink
-            URL="http://www.FreeBSD.org/java/">
+            URL="../../../../java/index.html">
             http://www.FreeBSD.org/java/</ulink>.</para>
         </answer>
       </qandaentry>
@@ -4939,7 +4939,7 @@
         <answer>
           <para>If you are running a FreeBSD version that lags
             significantly behind -CURRENT or -STABLE, you may need a ports
-            upgrade kit from <ulink URL="http://www.FreeBSD.org/ports/">
+            upgrade kit from <ulink URL="../../../../ports/index.html">
             http://www.FreeBSD.org/ports/</ulink>. If you are up to date,
             then someone might have committed a change to the port which
             works for -CURRENT but which broke the port for -STABLE. Please
@@ -5284,7 +5284,7 @@
 
         <answer>
           <para>See the Disk Formatting Tutorial at <ulink
-            URL="../../articles/formatting-media/">
+            URL="../../articles/formatting-media/index.html">
             www.FreeBSD.org</ulink>.</para>
         </answer>
       </qandaentry>
@@ -5518,8 +5518,8 @@
               <listitem>
                 <para>A read-only NTFS driver exists for FreeBSD. For more
                   information, see this tutorial by Mark Ovens at <ulink
-                  URL="http://ukug.uk.freebsd.org/~mark/ntfs_install.html">
-                  http://ukug.uk.freebsd.org/~mark/ntfs_install.html</ulink>.
+                  URL="http://ukug.uk.FreeBSD.org/~mark/ntfs_install.html">
+                  http://ukug.uk.FreeBSD.org/~mark/ntfs_install.html</ulink>.
                   </para>
               </listitem>
             </varlistentry>
@@ -5905,7 +5905,7 @@
 	    only hope of getting one of these to work is to check if the
 	    <filename>ports/print/pnm2ppa</filename> port supports it.
 	    From <ulink
-	    url="http://www.freebsd.org/cgi/url.cgi?ports/print/pnm2ppa/pkg-descr">its
+	    url="http://www.FreeBSD.org/cgi/url.cgi?ports/print/pnm2ppa/pkg-descr">its
 	    package description</ulink>:</para>
 
 	  <blockquote>
@@ -6845,7 +6845,7 @@
               <para>This point and others are often discussed on the
                 mailing lists, particularly freebsd-security.  Please search
                 the archives <ulink
-                url="http://www.FreeBSD.org/search/">here</ulink> for an
+                url="../../../../search/index.html">here</ulink> for an
                 extensive discussion.  Some people are hopeful that
                 securelevel will soon go away in favor of a more
                 fine-grained mechanism, but things are still hazy in this
@@ -6922,7 +6922,7 @@
           <para>Enabling <varname>vfs.usermount</varname>, however, has
             negative security implications.  A better way to access MSDOS
             formatted media is to use the <ulink
-            URL="http://www.freebsd.org/cgi/ports.cgi?query=%5Emtools-&amp;stype=name">mtools</ulink> package in the ports collection.</para>
+            URL="http://www.FreeBSD.org/cgi/ports.cgi?query=%5Emtools-&amp;stype=name">mtools</ulink> package in the ports collection.</para>
         </answer>
       </qandaentry>
 
@@ -6949,8 +6949,8 @@
             on both disks with &man.boot0cfg.8;, so that you can
             dual boot to the old or new system after the copying
             is done.  See the <ulink
-            url="http://www.freebsd.org/tutorials/formatting-media/index.html">
-            formatting-media tutorial</ulink> for details on this
+            url="../../articles/formatting-media/index.html">
+            formatting-media article</ulink> for details on this
             process.</para>
 
           <para>Now you have the new disk set up, and are ready
@@ -8191,7 +8191,7 @@
 
           <para>More detailed information about setting this up can be
             found in the <ulink
-            URL="http://www.FreeBSD.org/tutorials/ppp/index.html">
+            URL="../ppp-primer/index.html">
             Pedantic PPP Primer</ulink> by Steve Sims.</para>
 
           <para>If you are using kernel-mode ppp, or have an Ethernet
@@ -8808,7 +8808,7 @@
           <para>See the <link linkend="service-redirect">FAQ about
             redirecting services</link>, the &man.natd.8; manual, or one of
             the several port redirecting utilities in the <ulink
-            url="../ports/">ports collection</ulink> for a correct way to do
+            url="../../../../ports/index.html">ports collection</ulink> for a correct way to do
             this.</para>
         </answer>
       </qandaentry>
@@ -11699,7 +11699,7 @@
 
         <answer>
           <para>Please take a look at <ulink
-            URL="../handbook/contrib.html">The Handbook entry on how to
+            URL="../../articles/contributing/index.html">The contributing to FreeBSD article on how to
             submit code</ulink>.</para>
 
           <para>And thanks for the thought!</para>
Index: books/fdp-primer/overview/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml	2001/10/02 06:00:27	1.10
+++ en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml	2001/10/22 22:08:00
@@ -122,7 +122,7 @@
          <listitem>
            <para>This is the main FreeBSD presence on the World Wide Web,
 	    visible at <ulink
-	      url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>
+	      url="../../../../index.html">http://www.FreeBSD.org/</ulink>
 	    and many mirrors around the world.  The web site is many people's
 	    first exposure to FreeBSD.</para>
 	</listitem>
Index: books/fdp-primer/see-also/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v
retrieving revision 1.7
diff -u -r1.7 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml	2001/10/02 05:24:37	1.7
+++ en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml	2001/10/22 22:08:00
@@ -43,12 +43,12 @@
 
     <itemizedlist>
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/docproj/">The FreeBSD
+	<para><ulink url="../../../../docproj/index.html">The FreeBSD
 	    Documentation Project web pages</ulink></para>
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/handbook/">The FreeBSD Handbook</ulink></para>
+	<para><ulink url="../handbook/index.html">The FreeBSD Handbook</ulink></para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -102,7 +102,7 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://docbook.sourceforge.net">The DocBook Open
+	<para><ulink url="http://docbook.sourceforge.net/">The DocBook Open
 	    Repository</ulink> contains DSSSL stylesheets and other resources
 	  for people using DocBook.</para>
       </listitem>
Index: books/fdp-primer/sgml-markup/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v
retrieving revision 1.32
diff -u -r1.32 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml	2001/10/10 11:47:13	1.32
+++ en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml	2001/10/22 22:08:00
@@ -705,7 +705,7 @@
 
       <para>The FreeBSD extensions are not (currently) in the ports
 	collection.  They are stored in the FreeBSD CVS tree, as <ulink
-	url="http://www.freebsd.org/cgi/cvsweb.cgi/doc/share/sgml/freebsd.dtd">doc/share/sgml/freebsd.dtd</ulink>.</para>
+	url="http://www.FreeBSD.org/cgi/cvsweb.cgi/doc/share/sgml/freebsd.dtd">doc/share/sgml/freebsd.dtd</ulink>.</para>
     </sect2>
 
     <sect2>
@@ -751,11 +751,11 @@
 	best suited to information that can be broken up into several
 	chapters, possibly with appendices and similar content as well.</para>
 
-      <para>The <ulink url="http://www.FreeBSD.org/tutorials/">FreeBSD
+      <para>The <ulink url="../../../../docs.html">FreeBSD
 	  tutorials</ulink> are all marked up as articles, while this
-	document, the <ulink url="http://www.FreeBSD.org/FAQ/">FreeBSD
+	document, the <ulink url="../faq/index.html">FreeBSD
 	  FAQ</ulink>, and the <ulink
-	  url="http://www.FreeBSD.org/handbook/">FreeBSD Handbook</ulink> are
+	  url="../handbook/index.html">FreeBSD Handbook</ulink> are
 	all marked up as books.</para>
 
       <sect3>
@@ -2184,7 +2184,7 @@
 	  by hand.</para>
 
 	<para>The best example of what follows in practice is the
-	  <filename>en_US.ISO8859-1/articles/vm-design/</filename> document.
+	  <filename>doc/en_US.ISO8859-1/articles/vm-design/</filename> document.
 	  If you're unsure of the description that follows, take a look at the
 	  files in that directory to see how everything hangs togther.
 	  Experiment with creating different formatted versions of the
@@ -2572,13 +2572,13 @@
 	  <para>Use:</para>
 
 	  <programlisting><![ CDATA [<para>Of course, you could stop reading this document and
-  go to the <ulink url="http://www.FreeBSD.org/">FreeBSD
+  go to the <ulink url="../../../../index.html">FreeBSD
   home page</ulink> instead.</para>]]></programlisting>
 
 	  <para>Appearance:</para>
 
 	  <para>Of course, you could stop reading this document and go to the
-	    <ulink url="http://www.FreeBSD.org/">FreeBSD home page</ulink>
+	    <ulink url="../../../../index.html">FreeBSD home page</ulink>
 	    instead.</para>
 	</example>
       </sect3>
Index: books/fdp-primer/the-website/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v
retrieving revision 1.6
diff -u -r1.6 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml	2001/10/02 05:28:57	1.6
+++ en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml	2001/10/22 22:08:00
@@ -53,8 +53,8 @@
     <para>Setup a CVS repository. You need the directories www, doc and
       ports in the CVS tree (plus the CVSROOT of course).  Please read the
       CVSup introduction <ulink
-	url="http://www.freebsd.org/handbook/synching.html#CVSUP">
-	http://www.freebsd.org/handbook/synching.html#CVSUP</ulink> how to
+	url="../handbook/synching.html#CVSUP">
+	http://www.FreeBSD.org/handbook/synching.html#CVSUP</ulink> how to
       mirror a CVS tree or parts of a CVS tree.</para>
     
     <para>The essential cvsup collections are: <literal>www</literal>,
Index: books/fdp-primer/translations/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v
retrieving revision 1.11
diff -u -r1.11 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml	2001/10/10 11:47:19	1.11
+++ en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml	2001/10/22 22:08:00
@@ -171,7 +171,7 @@
 
       <answer>
 	<para>The <ulink
-	    url="http://www.FreeBSD.org/docproj/translations.html">Documentation
+	    url="../../../../docproj/translations.html">Documentation
 	    Project translations page</ulink> lists the translation efforts
 	  that are currently known about. If others are already working
 	  on translating documentation to your language, please don't
Index: books/fdp-primer/writing-style/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v
retrieving revision 1.21
diff -u -r1.21 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml	2001/10/10 11:47:22	1.21
+++ en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml	2001/10/22 22:08:00
@@ -142,7 +142,7 @@
   </variablelist>
 
   <para>For more information about writing style, see <ulink
-      url="http://www.bartleby.com/141/index.html">Elements of
+      url="http://www.bartleby.com/141/">Elements of
       Style</ulink>, by William Strunk.</para>
 
   <sect1>
Index: books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- en_US.ISO8859-1/books/handbook/Makefile	2001/09/18 03:59:36	1.50
+++ en_US.ISO8859-1/books/handbook/Makefile	2001/10/22 22:08:00
@@ -96,6 +96,13 @@
 IMAGES+= install/disk-layout.eps
 IMAGES+= install/edit-inetd-conf.scr
 
+# Images from the cross-document image library
+IMAGES_LIB=  callouts/1.png
+IMAGES_LIB+= callouts/2.png
+IMAGES_LIB+= callouts/3.png
+IMAGES_LIB+= callouts/4.png
+IMAGES_LIB+= callouts/5.png
+
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
@@ -143,11 +150,13 @@
 # limits in pdftex.  Until we split the Handbook up, build the PDF 
 # version using ps2pdf instead of pdftex.
 
+PS2PDF?=	${PREFIX}/bin/ps2pdf
+
 book.tex-pdf:
-	touch book.tex-pdf
+	${TOUCH} book.tex-pdf
 
 book.pdf: book.ps
-	ps2pdf book.ps book.pdf
+	${PS2PDF} book.ps book.pdf
 
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
Index: books/handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/book.sgml,v
retrieving revision 1.117
diff -u -r1.117 book.sgml
--- en_US.ISO8859-1/books/handbook/book.sgml	2001/10/04 09:40:29	1.117
+++ en_US.ISO8859-1/books/handbook/book.sgml	2001/10/22 22:08:00
@@ -81,17 +81,17 @@
 	that do exist need to be updated.  If you are interested in helping
 	with this project, send email to the &a.doc;.  The latest version of
 	this document is always available from the <ulink
-	  URL="http://www.FreeBSD.org/">FreeBSD web site</ulink>.
+	  url="../../../../index.html">FreeBSD web site</ulink>.
 	It may also be downloaded in a variety of formats and compression
 	options from the <ulink 
-          url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
+          url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP 
           server</ulink> or one of the numerous <link
 	  linkend="mirrors-ftp">mirror sites</link>.  If you would prefer
 	  to have a hard copy of the handbook, you can purchase one at the
 	  <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.  You
 	  may also want to <ulink
-	  URL="http://www.FreeBSD.org/search.html">search the
+	  url="../../../../search/index.html">search the
 	  handbook</ulink>.</para>
     </abstract>
   </bookinfo>
Index: books/handbook/advanced-networking/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v
retrieving revision 1.108
diff -u -r1.108 chapter.sgml
--- en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml	2001/10/17 20:16:03	1.108
+++ en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml	2001/10/22 22:08:00
@@ -1680,13 +1680,13 @@
 	  url="http://www.freebsd-support.de/i4b/">homepage of
 	  isdn4bsd</ulink> which also has pointers to hints, erratas and
 	much more documentation such as the <ulink
-	  url="http://people.freebsd.org/~hm/">isdn4bsd
+	  url="http://people.FreeBSD.org/~hm/">isdn4bsd
 	  handbook</ulink>.</para>
 
       <para>In case you are interested in adding support for a
 	different ISDN protocol, a currently unsupported ISDN PC card or
 	otherwise enhancing <application>isdn4bsd</application>, please
-	get in touch with <email>hm@freebsd.org</email>.</para>
+	get in touch with <email>hm@FreeBSD.org</email>.</para>
 
       <para>For questions regarding the installation, configuration
 	and troubleshooting <application>isdn4bsd</application>, a
@@ -1749,7 +1749,7 @@
 	serial card in your computer.</para>
 	  
       <para>You should read the <ulink
-	url="http://www.FreeBSD.org/tutorials">FreeBSD Serial
+	url="../../articles/serial-uart/index.html">FreeBSD Serial
 	Hardware</ulink> tutorial for a detailed understanding of
 	serial devices, and the differences between asynchronous and
 	synchronous serial ports.</para>
@@ -1772,7 +1772,7 @@
       <para>The choice of sync/TA v.s. stand-alone router is largely a
 	religious issue.  There has been some discussion of this in
 	the mailing lists.  I suggest you search the <ulink
-	url="http://www.FreeBSD.org/search.html">archives</ulink> for
+	url="../../../../search/index.html">archives</ulink> for
 	the complete discussion.</para>
     </sect2>
     
@@ -3481,7 +3481,7 @@
 
       <para>
         Currently, BIND is maintained by the <ulink 
-        url="http://www.isc.org">
+        url="http://www.isc.org/">
         Internet Software Consortium (www.isc.org)</ulink>
       </para>
     </sect2>
@@ -4275,8 +4275,8 @@
 
       <para>
         It is a good idea to subscribe to <ulink 
-        url="http://www.cert.org">CERT</ulink> and
-        <ulink url="http://www.FreeBSD.org/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</ulink>
+        url="http://www.cert.org/">CERT</ulink> and
+        <ulink url="../handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</ulink>
         to stay up to date with the current Internet and FreeBSD security 
         issues.
       </para>
Index: books/handbook/bibliography/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v
retrieving revision 1.34
diff -u -r1.34 chapter.sgml
--- en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml	2001/09/25 00:08:24	1.34
+++ en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml	2001/10/22 22:08:00
@@ -22,7 +22,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="http://jdli.tw.freebsd.org/publication/book/freebsd2/index.htm">Using FreeBSD</ulink> (in Chinese).</para>
+	    url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">Using FreeBSD</ulink> (in Chinese).</para>
       </listitem>
       
       <listitem>
@@ -82,7 +82,7 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.freebsd-corp-net-guide.com">The
+	<para><ulink url="http://www.freebsd-corp-net-guide.com/">The
 	  FreeBSD Corporate Networker's Guide</ulink>, published by
 	  <ulink url="http://www.awl.com/aw/">Addison-Wesley</ulink>.</para>
       </listitem>
Index: books/handbook/contrib/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml,v
retrieving revision 1.468
diff -u -r1.468 chapter.sgml
--- en_US.ISO8859-1/books/handbook/contrib/chapter.sgml	2001/08/11 20:15:56	1.468
+++ en_US.ISO8859-1/books/handbook/contrib/chapter.sgml	2001/10/22 22:08:00
@@ -189,7 +189,7 @@
 	  
       <para>If you find a bug or are submitting a specific change, please
 	report it using the &man.send-pr.1; program or its <ulink
-	  url="http://www.FreeBSD.org/send-pr.html">WEB-based
+	  url="../../../../send-pr.html">WEB-based
 	  equivalent</ulink>.  Try to fill-in each field of the bug report.
 	Unless they exceed 65KB, include any patches directly in the report.
 	If the patch is suitable to be applied to the source tree put
@@ -198,7 +198,7 @@
 	because cut-and-paste turns tabs into spaces and makes them unusable.
 	Consider compressing patches and using &man.uuencode.1; if they exceed
 	20KB.  Upload very large submissions to <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/">ftp.FreeBSD.org:/pub/FreeBSD/incoming/</ulink>.</para>
+	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/">ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/</ulink>.</para>
 	  
       <para>After filing a report, you should receive confirmation along with
 	a tracking number.  Keep this tracking number so that you can update
@@ -414,7 +414,7 @@
 
 	<para>More information about the FreeBSD Foundation can be
 	  found in <ulink
-	  url="http://people.freebsd.org/~jdp/foundation/announcement.html">The
+	  url="http://people.FreeBSD.org/~jdp/foundation/announcement.html">The
 	  FreeBSD Foundation -- an Introduction</ulink>.  To contact
 	  the Foundation by email, write to
 	  <email>bod@FreeBSDFoundation.org</email>.</para>
Index: books/handbook/cutting-edge/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.93
diff -u -r1.93 chapter.sgml
--- en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	2001/10/10 00:58:03	1.93
+++ en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	2001/10/22 22:08:00
@@ -345,7 +345,7 @@
   	    support them for many years.  For a complete description
   	    of the current security policy for old releases of
   	    FreeBSD, please see <ulink
-  	    url="http://www.FreeBSD.org">http://www.FreeBSD.org/security</ulink></para>
+  	    url="../../../../security/index.html">http://www.FreeBSD.org/security/</ulink></para>
 	  </footnote>
 	  , and tracking an entire development branch just
 	  for security reasons is likely to bring in a lot of unwanted
Index: books/handbook/disks/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v
retrieving revision 1.66
diff -u -r1.66 chapter.sgml
--- en_US.ISO8859-1/books/handbook/disks/chapter.sgml	2001/10/13 00:21:23	1.66
+++ en_US.ISO8859-1/books/handbook/disks/chapter.sgml	2001/10/22 22:08:00
@@ -998,7 +998,7 @@
       
 	  <para>The next consideration was how to attach them as part of
 	    the filesystem.  I did a little research on <ulink
-	      url="http://www.vinumvm.org">&man.vinum.8;</ulink> and FreeBSD's
+	      url="http://www.vinumvm.org/">&man.vinum.8;</ulink> and FreeBSD's
 	      &man.ccd.4;.  In this particular configuration, &man.ccd.4;
 	    appeared to be a better choice mainly because it has fewer
 	    parts.  Less parts tends to indicate less chance of breakage.
Index: books/handbook/eresources/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v
retrieving revision 1.72
diff -u -r1.72 chapter.sgml
--- en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	2001/10/17 06:49:05	1.72
+++ en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	2001/10/22 22:08:00
@@ -41,7 +41,7 @@
       the project.</para>
 
     <para>Archives are kept for all of the mailing lists and can be searched
-      using the <ulink url="http://www.FreeBSD.org/search.html">FreeBSD World
+      using the <ulink url="../../../../search/index.html">FreeBSD World
 	Wide Web server</ulink>.  The keyword searchable archive offers an
       excellent way of finding answers to frequently asked questions and
       should be consulted before posting a question.</para>
@@ -392,7 +392,7 @@
 
 	    <row>
 	      <entry>freebsd-www</entry>
-	      <entry>Maintainers of <ulink url="http://www.FreeBSD.org">www.freebsd.org</ulink></entry>
+	      <entry>Maintainers of <ulink url="../../../../index.html">www.FreeBSD.org</ulink></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -692,7 +692,7 @@
 	      touch a part of the system where a bug may adversely affect
 	      the integrity of the system.</para>
 
-<!-- I can't actually find a charter for this, but there's this email: http://www.freebsd.org/cgi/getmsg.cgi?fetch=223347+225804+/usr/local/www/db/text/2000/cvs-all/20001210.cvs-all -->
+<!-- I can't actually find a charter for this, but there's this email: http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=223347+225804+/usr/local/www/db/text/2000/cvs-all/20001210.cvs-all -->
 	  </listitem>
 	</varlistentry>
 
@@ -721,7 +721,7 @@
 	      Whenever possible, bugs should be submitted using the
 		&man.send-pr.1;
 	      command or the <ulink
-		url="http://www.FreeBSD.org/send-pr.html">WEB
+		url="../../../../send-pr.html">WEB
 		interface</ulink> to it.</para>
 	  </listitem>
 	</varlistentry>
@@ -1259,7 +1259,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>
+	    url="../../../../index.html">http://www.FreeBSD.org/</ulink>
 	  &mdash; Central Server.</para>
       </listitem>
       
Index: books/handbook/install/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v
retrieving revision 1.128
diff -u -r1.128 chapter.sgml
--- en_US.ISO8859-1/books/handbook/install/chapter.sgml	2001/10/18 20:48:57	1.128
+++ en_US.ISO8859-1/books/handbook/install/chapter.sgml	2001/10/22 22:08:00
@@ -451,10 +451,10 @@
       <para>Information about all the releases, including the errata for each
 	release, can be found on the 
 	<ulink
-	url="http://www.FreeBSD.org/releases/index.html">release
+	url="../../../../releases/index.html">release
 	information</ulink> section of the 
 	<ulink
-	  url="http://www.FreeBSD.org/">FreeBSD web site</ulink>.</para>
+	  url="../../../../index.html">FreeBSD web site</ulink>.</para>
     </sect2>
 
     <sect2 id="install-floppies">
@@ -694,7 +694,7 @@
 BIOS drive C: is disk3
 BIOS 639kB/64512kB available memory
 FreeBSD/i386 bootstrap loader, Revision 0.8
-(jkh@bento.freebsd.org, Mon Nov 20 11:41:23 GMT 2000)
+(jkh@bento.FreeBSD.org, Mon Nov 20 11:41:23 GMT 2000)
 |
 Hit [Enter] to boot immediately, or any other key for command prompt.
 Booting [kernel] in 9 seconds... _</screen>
@@ -2559,7 +2559,7 @@
 
  For more information on the ports collection & the latest ports,
  visit: 
-     http://www.freebsd.org/ports  
+     http://www.FreeBSD.org/ports  
 
                               [ Yes ]     No</screen>
 
@@ -2784,7 +2784,7 @@
 
       <para>For detailed information on Local Area Networks and
 	configuring FreeBSD as a gateway/router refer to the tutorial
-	<ulink url="http://www.FreeBSD.org/tutorials/ppp/index.html">
+	<ulink url="../ppp-primer/index.html">
 	PPP- Pendantic PPP Primer</ulink>.</para>
 
       <screen>                      User Confirmation Requested 
@@ -3199,7 +3199,7 @@
 
       <para>More information about security profiles can be found in the
 	<ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/install.html#SECURITY-PROFILES">
+	url="../faq/install.html#SECURITY-PROFILES">
 	  FreeBSD FAQ</ulink>.</para>
 
       <screen>                       User Confirmation Requested
@@ -5035,7 +5035,7 @@
 	ftp.FreeBSD.org</ulink>. Each distribution is in its own directory; 
 	for example, the <emphasis>bin</emphasis> distribution can be 
 	found in the <ulink
-	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/bin">&rel.current;/bin</ulink> directory.</para>
+	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/bin/">&rel.current;/bin/</ulink> directory.</para>
     
 	<para>For as many distributions you wish to install from an MS-DOS
 	  partition (and you have the free space for), install each one
@@ -5122,7 +5122,7 @@
 	  specific to your modem, as the PPP dialer provides only a very
 	  simple terminal emulator. Please refer
 	  to the user-ppp <link linkend="userppp">handbook</link> and <ulink
-	  url="../FAQ/ppp.html">FAQ</ulink> entries for further
+	  url="../faq/ppp.html">FAQ</ulink> entries for further
 	  information.  If you have problems, logging can be directed to
 	  the screen using the command <command>set log local
 	  ...</command>.</para>
Index: books/handbook/introduction/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v
retrieving revision 1.62
diff -u -r1.62 chapter.sgml
--- en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	2001/10/14 00:19:32	1.62
+++ en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	2001/10/22 22:08:00
@@ -58,8 +58,8 @@
       read about <link linkend="history">the history of FreeBSD</link>,
       or the <link linkend="relnotes">current release</link>.  If you
       are interested in contributing something to the Project (code,
-      hardware, unmarked bills), see the <ulink url="
-	http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributing/article.html">Contributing to FreeBSD</ulink> article.</para>
+      hardware, unmarked bills), see the <ulink
+	url="../../articles/contributing/index.html">Contributing to FreeBSD</ulink> article.</para>
 
     <sect2>
       <title>What Can FreeBSD Do?</title>
@@ -587,7 +587,7 @@
       <para>Long-term development projects continue to take place in the
 	5.0-CURRENT (trunk) branch, and SNAPshot releases of 5.0 on
 	CDROM (and, of course, on the net) are continually made available
-	from <ulink url="ftp://current.freebsd.org/pub/FreeBSD/snapshots">
+	from <ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">
 	the snapshot server</ulink> as work progresses.</para>
     </sect2>
       
@@ -685,7 +685,7 @@
 	  </indexterm>
 	  <listitem>
 	    <para>The central source tree for FreeBSD is maintained by
-	      <ulink url="http://www.cyclic.com/CVS/index_html">CVS</ulink>
+	      <ulink url="http://www.cvshome.org/">CVS</ulink>
 	      (Concurrent Versions System), a freely available source code
 	      control tool that comes bundled with FreeBSD.  The primary
 	      <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS
@@ -774,7 +774,7 @@
 	      such things are discussed.</para>
 	  
 	    <para><citetitle><ulink
-	      url="../../article/contributors/article.html">The
+	      url="../../articles/contributors/article.html">The
 	      FreeBSD Contributors List</ulink></citetitle> is a long
 	      and growing one, so why not join it by contributing
 	      something back to FreeBSD today?</para>
@@ -782,7 +782,7 @@
 	    <para>Providing code is not the only way of contributing to
 	      the project; for a more complete list of things that need
 	      doing, please refer to the <ulink
-	      url="http://www.FreeBSD.org">FreeBSD Project web
+	      url="../../../../index.html">FreeBSD Project web
 	      site</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -888,7 +888,7 @@
     
       <para>You can also view the master (and most frequently updated)
         copies at <ulink
-	url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>.</para>
+	url="../../../../index.html">http://www.FreeBSD.org/</ulink>.</para>
     </sect2>
   </sect1>
 </chapter>
Index: books/handbook/kernelconfig/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v
retrieving revision 1.65
diff -u -r1.65 chapter.sgml
--- en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	2001/10/08 20:30:48	1.65
+++ en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	2001/10/22 22:08:00
@@ -421,7 +421,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    http://www.freebsd.org/handbook/kernelconfig-config.html
+#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
Index: books/handbook/l10n/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml,v
retrieving revision 1.70
diff -u -r1.70 chapter.sgml
--- en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	2001/10/08 20:30:48	1.70
+++ en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	2001/10/22 22:08:00
@@ -166,7 +166,7 @@
 	implementation, users may be required to compile an application
 	with wide or multibyte characters support, or configure it correctly.
 	To be able to input and process wide or multibyte characters, the <ulink 
-	url="/ports/">FreeBSD Ports collection</ulink> has provided
+	url="../../../../ports/index.html">FreeBSD Ports collection</ulink> has provided
 	each language with different programs.  Refer to the I18N
 	documentation in the respective FreeBSD Port.</para>
 
@@ -889,7 +889,7 @@
       <title>Traditional Chinese Localization for Taiwan</title>
       <indexterm><primary>Traditional Chinese localization</primary></indexterm>
       <para>The FreeBSD-Taiwan Project has an I18N/L10N tutorial for
-	FreeBSD at <ulink url="http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/index.html">http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/index.html</ulink>
+	FreeBSD at <ulink url="http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/">http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/</ulink>
 	using many <port>chinese/*</port> applications.
 	The editor for the <literal>zh-L10N-tut</literal> is Clive Lin
 	<email>Clive@CirX.org</email>.  You can also cvsup the following
@@ -959,7 +959,7 @@
 
       <para>Some FreeBSD contributors have translated parts of FreeBSD to
 	other languages.  They are available through links on the <ulink
-	url="../">main site</ulink> or in
+	url="../../../../index.html">main site</ulink> or in
 	<filename>/usr/share/doc</filename>.</para>
     </sect2>
   </sect1>
Index: books/handbook/linuxemu/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v
retrieving revision 1.61
diff -u -r1.61 chapter.sgml
--- en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	2001/10/18 19:50:39	1.61
+++ en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	2001/10/22 22:08:01
@@ -161,7 +161,7 @@
 
 	<para>This is by far the easiest method to use when installing the
 	  runtime libraries.  It is just like installing any other port
-	  from the <ulink url="/usr/ports/">ports collection</ulink>.
+	  from the <ulink url="file://localhost/usr/ports/">ports collection</ulink>.
 	  Simply do the following:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base</userinput>
@@ -1139,7 +1139,7 @@
       <sect3 id="install-via-ftp">
         <title>Installation via FTP</title> <para>Get the diskimages
         kern.flp and mfsroot.flp and put them on floppy disks (I got
-        mine from ftp7.de.freebsd.org. Please choose the appropriate
+        mine from ftp7.de.FreeBSD.org. Please choose the appropriate
         mirror).</para>
 
         <screen>&prompt.root; <userinput>dd if=kern.flp of=/dev/fd0</userinput> 
@@ -1309,7 +1309,7 @@
         are not out of date):</para>
 
       <itemizedlist>
-        <listitem><para>ftp7.de.freebsd.org/pub/FreeBSD/distfiles/rpm</para></listitem>
+        <listitem><para>ftp7.de.FreeBSD.org/pub/FreeBSD/distfiles/rpm</para></listitem>
         <listitem><para>ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS</para></listitem>
       </itemizedlist>
 
Index: books/handbook/mail/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v
retrieving revision 1.40
diff -u -r1.40 chapter.sgml
--- en_US.ISO8859-1/books/handbook/mail/chapter.sgml	2001/10/17 06:49:06	1.40
+++ en_US.ISO8859-1/books/handbook/mail/chapter.sgml	2001/10/22 22:08:01
@@ -174,7 +174,7 @@
       <procedure>
         <step>
 	  <para>Get a POP or IMAP daemon from the <ulink
-	    url="/ports/mail.html">ports collection</ulink> and install
+	    url="../../../../ports/mail.html">ports collection</ulink> and install
 	    it on your system.</para>
 	</step>
 
Index: books/handbook/mirrors/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v
retrieving revision 1.166
diff -u -r1.166 chapter.sgml
--- en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	2001/10/14 23:01:25	1.166
+++ en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	2001/10/22 22:08:01
@@ -1562,7 +1562,7 @@
     <para>If you did not find a mirror near to you or the mirror is
       incomplete, try  <ulink url="http://ftpsearch.ntnu.no/">FTP
 	search</ulink> at <ulink
-	url="http://ftpsearch.ntnu.no/ftpsearch/">http://ftpsearch.ntnu.no/ftpsearch</ulink>.
+	url="http://ftpsearch.ntnu.no/ftpsearch/">http://ftpsearch.ntnu.no/ftpsearch/</ulink>.
       FTP search is a great free archie server in Trondheim, Norway.</para>
   </sect2></sect1>
 
@@ -2936,7 +2936,7 @@
 
 	    <listitem>
 	      <para>cvsup2.ca.FreeBSD.org (maintainer
-		<email>hostmaster@ca.freebsd.org</email>)</para>
+		<email>hostmaster@ca.FreeBSD.org</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -3062,7 +3062,7 @@
 
 	    <listitem>
 	      <para>cvsup5.de.FreeBSD.org (maintainer
-		<email>rse@freebsd.org</email>)</para>
+		<email>rse@FreeBSD.org</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -3388,7 +3388,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.tw.FreeBSD.org (maintainer
-		<email>jdli@freebsd.csie.nctu.edu.tw</email>)</para>
+		<email>jdli@FreeBSD.csie.nctu.edu.tw</email>)</para>
 	    </listitem>
 
 	    <listitem>
Index: books/handbook/pgpkeys/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v
retrieving revision 1.88
diff -u -r1.88 chapter.sgml
--- en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	2001/10/06 19:48:50	1.88
+++ en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	2001/10/22 22:08:01
@@ -11,7 +11,7 @@
   <para>In case you need to verify a signature or send encrypted email
     to one of the officers or developers a number of keys are provided
     here for your convenience.  A complete keyring of FreeBSD.org
-    users is available for download from <ulink url="http://www.FreeBSD.org/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
+    users is available for download from <ulink url="../../../../doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
   
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
Index: books/handbook/ports/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v
retrieving revision 1.145
diff -u -r1.145 chapter.sgml
--- en_US.ISO8859-1/books/handbook/ports/chapter.sgml	2001/10/16 19:15:12	1.145
+++ en_US.ISO8859-1/books/handbook/ports/chapter.sgml	2001/10/22 22:08:01
@@ -200,7 +200,7 @@
     </itemizedlist>
 
     <para>To keep track of updated ports, subscribe to the
-      <email>freebsd-ports@freebsd.org</email> mailing list.</para>
+      <email>freebsd-ports@FreeBSD.org</email> mailing list.</para>
 
     <para>The remainder of this chapter will explain how to use packages and
       ports to install and manage third party software on FreeBSD.</para>
@@ -220,7 +220,7 @@
       <listitem>
 	<para>The FreeBSD web site maintains an up-to-date searchable list of
 	  all the available applications, at
-	  <ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>.
+	  <ulink url="../../../../ports/index.html">http://www.FreeBSD.org/ports/</ulink>.
 	  The name space is divided in to categories, and you may either
 	  search for an application by name (if you know it), or you can list
 	  all the applications available in a category.</para>
@@ -281,9 +281,9 @@
       <example>
         <title>Downloading a Package and then Installing It Locally</title>
 
-        <screen>&prompt.root; <userinput>ftp -a <replaceable>ftp2.freebsd.org</replaceable></userinput>
-Connected to ftp2.freebsd.org.
-220 ftp2.freebsd.org FTP server (Version 6.00LS) ready.
+        <screen>&prompt.root; <userinput>ftp -a <replaceable>ftp2.FreeBSD.org</replaceable></userinput>
+Connected to ftp2.FreeBSD.org.
+220 ftp2.FreeBSD.org FTP server (Version 6.00LS) ready.
 331 Guest login ok, send your email address as password.
 230-
 230-     This machine is in Vienna, VA, USA, hosted by Verio.
@@ -507,7 +507,7 @@
       <para>Before we get into that however, you will need to choose a
         port to install.  There are a few ways to do this, with the
 	easiest method being the <ulink
-	url="http://www.FreeBSD.org/ports/">ports listing on the FreeBSD
+	url="../../../../ports/index.html">ports listing on the FreeBSD
 	web site</ulink>.  You can browse through the ports listed there
 	or use the search function on the site.  Each port also includes
 	a description so you can read a bit about each port before
@@ -1288,7 +1288,7 @@
       <orderedlist>
         <listitem>
 	  <para>Fix it!  The <ulink
-	    url="http://www.FreeBSD.org/porters-handbook/index.html">Porter's
+	    url="../porters-handbook/index.html">Porter's
 	    Handbook</ulink> includes detailed information on the
 	    "Ports" infrastructure so that you can fix the occasional
 	    broken port or even submit your own!</para>
Index: books/handbook/ppp-and-slip/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v
retrieving revision 1.65
diff -u -r1.65 chapter.sgml
--- en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	2001/10/17 06:49:06	1.65
+++ en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	2001/10/22 22:08:01
@@ -2346,7 +2346,7 @@
 	  system for this yet, please see the tutorial for configuring
 	  dialup services; if you have a World-Wide Web browser available,
 	  browse the list of tutorials at <ulink
-	  url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>.
+	  url="../../../../index.html">http://www.FreeBSD.org/</ulink>.
 	  You may also want to check the manual pages for &man.sio.4; for
 	  information on the serial port device driver and &man.ttys.5;,
 	  &man.gettytab.5;, &man.getty.8;, &amp; &man.init.8; for
Index: books/handbook/security/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
retrieving revision 1.93
diff -u -r1.93 chapter.sgml
--- en_US.ISO8859-1/books/handbook/security/chapter.sgml	2001/10/20 07:24:47	1.93
+++ en_US.ISO8859-1/books/handbook/security/chapter.sgml	2001/10/22 22:08:01
@@ -2717,7 +2717,7 @@
     layer and socket layer communication.  This section should
     explain how to use them.  For implementation details, please
     refer to <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ipv6.html">The
+    url="../developers-handbook/ipv6.html">The
     Developers' Handbook</ulink>.</para>
 
     <para>The current IPsec implementation supports both transport mode
@@ -3382,7 +3382,7 @@
 
     <sect2>
       <title>Further Reading</title>
-      <para><ulink url="http://www.openssh.com">OpenSSH</ulink></para>
+      <para><ulink url="http://www.openssh.com/">OpenSSH</ulink></para>
       <para>&man.ssh.1; &man.scp.1; &man.ssh-keygen.1; 
         &man.ssh-agent.1; &man.ssh-add.1;</para>
       <para>&man.sshd.8; &man.sftp-server.8;</para>
Index: books/handbook/serialcomms/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v
retrieving revision 1.50
diff -u -r1.50 chapter.sgml
--- en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml	2001/10/16 19:33:03	1.50
+++ en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml	2001/10/22 22:08:01
@@ -2035,7 +2035,7 @@
 		  use as the serial console.  The only use of this
 		  flag is to designate the unit for kernel remote
 		  debugging.  See <ulink
-		  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/">The
+		  url="../developers-handbook/index.html">The
 		  Developer's Handbook</ulink> for more information on
 		  remote debugging.</para>
 		
Index: books/porters-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.175
diff -u -r1.175 book.sgml
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	2001/10/19 08:14:21	1.175
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	2001/10/22 22:08:01
@@ -321,7 +321,7 @@
           directory or the <filename>pkgname.tgz</filename> package, so delete
           them now.  Next, simply include the output of <command>shar `find
             port_dir`</command> in a bug report and send it with the
-            &man.send-pr.1; program (see <ulink url="../handbook/contrib-how.html#CONTRIB-GENERAL">Bug
+            &man.send-pr.1; program (see <ulink url="../../articles/contributing/contrib-how.html#CONTRIB-GENERAL">Bug
             Reports and General Commentary</ulink> for more information about
             &man.send-pr.1;.  If the uncompressed port is larger than 20KB,
           you should compress it into a tarfile and use &man.uuencode.1;
@@ -1062,7 +1062,7 @@
           --><emphasis>:-)</emphasis></para>
 
         <para>For a detailed description of the responsibilities of maintainers,
-          refer to the <ulink url="../handbook/policies.html#POLICIES-MAINTAINER">MAINTAINER on
+          refer to the <ulink url="../developers-handbook/policies.html#POLICIES-MAINTAINER">MAINTAINER on
             Makefiles</ulink> section.</para>
       </sect1>
 
@@ -2356,7 +2356,7 @@
         the porting process.You should check your own port against this list,
         but you can also check ports in the PR database that others have
         submitted.  Submit any comments on ports you check as described in
-        <ulink url="../handbook/contrib-how.html#CONTRIB-GENERAL">Bug Reports and General
+        <ulink url="../../articles/contributing/contrib-how.html#CONTRIB-GENERAL">Bug Reports and General
           Commentary</ulink>.  Checking ports in the PR database will both make
         it faster for us to commit them, and prove that you know what you are
         doing.</para>
Index: books/ppp-primer/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml,v
retrieving revision 1.13
diff -u -r1.13 book.sgml
--- en_US.ISO8859-1/books/ppp-primer/book.sgml	2001/08/30 11:25:50	1.13
+++ en_US.ISO8859-1/books/ppp-primer/book.sgml	2001/10/22 22:08:01
@@ -1040,15 +1040,15 @@
 </listitem>
 
 <listitem>
-<para>The IBM Network (<ulink URL="http://www.ibm.net">http://www.ibm.net</ulink>)</para>
+<para>The IBM Network (<ulink URL="http://www.ibm.net/">http://www.ibm.net/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>AT&amp;T WorldNet (<ulink URL="http://att.com/worldnet">http://att.com/worldnet</ulink>)</para>
+<para>AT&amp;T WorldNet (<ulink URL="http://att.com/worldnet/">http://att.com/worldnet/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>Erol's (<ulink URL="http://www.erols.com">http://www.erols.com</ulink>)</para>
+<para>Erol's (<ulink URL="http://www.erols.com/">http://www.erols.com/</ulink>)</para>
 </listitem>
 
 </itemizedlist>
@@ -1415,7 +1415,7 @@
 they need to be properly configured.  Note that this section does not
 explain how to configure the Windows workstations for Dial-Up
 networking.  If you need a good explanation of that procedure, I
-recommend <ulink URL="http://www.aladdin.co.uk/techweb">http://www.aladdin.co.uk/techweb</ulink>.</para>
+recommend <ulink URL="http://www.aladdin.co.uk/techweb/">http://www.aladdin.co.uk/techweb/</ulink>.</para>
   
 
 <sect1>
@@ -1580,7 +1580,7 @@
 Configuration" and "Bindings" tabs are not necessary.</para>
   
 <para>If you wish to use the Windows Internet Naming Service ("WINS")
-your attention is invited to <ulink URL="http://www.localnet.org">http://www.localnet.org</ulink> for
+your attention is invited to <ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> for
 more information about WINS settings, specifically regarding sharing
 files transparently across the Internet.</para>
   
@@ -1778,7 +1778,7 @@
 "Routing" tabs are not used.</para>
   
 <para>If you wish to use the Windows Internet Naming Service ("WINS")
-your attention is invited to <ulink URL="http://www.localnet.org">http://www.localnet.org</ulink> for
+your attention is invited to <ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> for
 more information about WINS settings, specifically regarding sharing
 files transparently across the Internet.</para>
   
@@ -1813,7 +1813,7 @@
 requires that the Microsoft TCP/IP-32 driver diskette has been
 installed on the workstation.  The TCP/IP drivers are not included
 with the WfW CD or diskettes; if you need a copy they're available at
-<ulink URL="ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip">ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip</ulink>.</para>
+<ulink URL="ftp://ftp.microsoft.com/peropsys/windows/public/tcpip/">ftp://ftp.microsoft.com/peropsys/windows/public/tcpip/</ulink>.</para>
   
 <para>Once the TCP/IP drivers have been loaded, perform the following
 steps:</para>

=========================== alternate fix ============================

Index: en_US.ISO8859-1/articles/committers-guide/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v
retrieving revision 1.85
diff -u -r1.85 article.sgml
--- en_US.ISO8859-1/articles/committers-guide/article.sgml	2001/10/16 11:52:49	1.85
+++ en_US.ISO8859-1/articles/committers-guide/article.sgml	2001/10/22 22:00:16
@@ -158,7 +158,7 @@
 
     <para>CVS reference information, tutorials, and FAQs can also be found at:
       <ulink
-	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>, 
+	url="http://www.cvshome.org/docs/">http://www.cvshome.org/docs/</ulink>, 
       and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
         chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
       useful.</para>
@@ -766,7 +766,7 @@
           properly (tabs often look wrong in diffs because of the extra
           character in front of each line).</para>
 
-        <para><ulink url="http://people.FreeBSD.org/~eivind/cdiff">http://people.FreeBSD.org/~eivind/cdiff</ulink></para>
+        <para><ulink url="&url.people.server;/~eivind/cdiff">&url.people.server;/~eivind/cdiff</ulink></para>
 
         <para>Simply use it instead of &man.more.1; or &man.less.1;:</para>
 
@@ -815,7 +815,7 @@
     <itemizedlist>
       <listitem>
 	<para>Add yourself to the <quote>Developers</quote> section of
-	  the <ulink url="../contributors">Contributors List</ulink>
+	  the <ulink url="&url.top.articles;/contributors/index.html">Contributors List</ulink>
 	  and remove yourself from the <quote>Additional
 	  Contributors</quote> section.</para>
 
@@ -832,7 +832,7 @@
 
       <listitem>
 	<para>If you have a PGP or GnuPG key, you may want to add it to
-	  <filename>doc/en_US.ISO8859-1/books/handbook/pgpkeys</filename>.
+	  <filename>&url.doc.enUS;/books/handbook/pgpkeys</filename>.
 	  </para>
       </listitem>
 
@@ -949,11 +949,11 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/support.html">http://www.FreeBSD.org/support.html</ulink></para>
+	<para><ulink url="&url.top.level;/support.html">&url.home.page;/support.html</ulink></para>
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/send-pr.html">http://www.FreeBSD.org/send-pr.html</ulink></para>
+	<para><ulink url="&url.top.level;/send-pr.html">&url.home.page;/send-pr.html</ulink></para>
       </listitem>
 
       <listitem>
@@ -1089,7 +1089,7 @@
 	
 	<listitem>
 	  <para>Nik oversees the
-	    <ulink url="http://www.FreeBSD.org/docproj/index.html">Doc. Project</ulink>.
+	    <ulink url="&url.top.level;/docproj/index.html">Doc. Project</ulink>.
 	    As well as writing documentation he put together the
 	    infrastructure under <filename>doc/share/mk</filename> and the
 	    stylesheets and related code under
@@ -1098,7 +1098,7 @@
 	    <email>doc@FreeBSD.org</email> mailing list.  Committers
 	    interested in contributing to the documentation should familiarise
 	    themself with the
-	    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/fdp-primer/index.html">Documentation Project Primer</ulink>.</para>
+	    <ulink url="&url.top.books;/fdp-primer/index.html">Documentation Project Primer</ulink>.</para>
 	</listitem>
       </varlistentry>
       
@@ -1526,7 +1526,7 @@
 	    <filename>Makefile</filename> for any package or subtree
 	    which is being actively maintained by one or more people;
 	    see <ulink
-	    url="http://www.FreeBSD.org/handbook/policies.html">http://www.FreeBSD.org/handbook/policies.html</ulink>
+	    url="&url.top.books;/developers-handbook/policies.html">&url.home.page;/&url.doc.enUS;/books/developers-handbook/policies.html</ulink>
 	    for documentation on this.  Where sections of code have
 	    several maintainers, commits to affected areas by one
 	    maintainer need to be reviewed by at least one other
@@ -1540,7 +1540,7 @@
 	    someone who manages an overall category of FreeBSD
 	    evolution, such as internationalization or networking.
 	    See <ulink
-	    url="../contributors/staff-who.html">http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html</ulink> for more information on this.</para>
+	    url="&url.top.articles;/contributors/staff-who.html">&url.home.page;/&url.doc.enUS;/articles/contributors/staff-who.html</ulink> for more information on this.</para>
 	</listitem>
 	
 	<listitem>
@@ -1814,7 +1814,7 @@
 	    </screen>
 
 	    <para>The 
-	      <ulink url="http://www.FreeBSD.org/porters-handbook/index.html">Porters
+	      <ulink url="&url.top.books;/porters-handbook/index.html">Porters
 	      Handbook</ulink> contains more detailed
 	      instructions.</para>
 
@@ -1825,7 +1825,7 @@
 	    <para>If the port came from a submitter who has not
 	      contributed to the project before, add that person's
 	      name to the <ulink
-	      url="../contributors/contrib-additional.html">Additional
+	      url="&url.top.articles;/contributors/contrib-additional.html">Additional
 	      Contributors</ulink> section of the FreeBSD Contributors
 	      List.</para>
 
Index: en_US.ISO8859-1/articles/console-server/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/console-server/article.sgml,v
retrieving revision 1.3
diff -u -r1.3 article.sgml
--- en_US.ISO8859-1/articles/console-server/article.sgml	2001/10/16 13:18:28	1.3
+++ en_US.ISO8859-1/articles/console-server/article.sgml	2001/10/21 03:54:04
@@ -82,7 +82,7 @@
       pointed out that you <em>can</em> get KVM switches that also do
       serial consoles or Sun-compatible KVM switching as well as PCs,
       but they are expensive.  See <a
-      href="http://www.avocent.com">Avocent</a> for example.]</p>
+      href="http://www.avocent.com/">Avocent</a> for example.]</p>
 
     <p>You might be tempted to do without a console terminal, but when
       things go pear-shaped you <em>really</em> need to see what is on
@@ -122,7 +122,7 @@
       terminal server software may not support that.)  Also there is
       no logging or replay of console messages.  But with a bit of
       work, and the addition of some software such as <a
-      href="http://www.conserver.com">conserver</a> (described below),
+      href="http://www.conserver.com/">conserver</a> (described below),
       this can be made to work pretty well.</p>
 
     <p>A possibility suggested by Bron Gondwana is similar to the
@@ -131,7 +131,7 @@
       the "next" server, creating a ring of console connections (in
       some sort of order).  This can be made to work reasonably well
       with the aid of the <a
-      href="http://www.conserver.com">conserver</a> software, but can
+      href="http://www.conserver.com/">conserver</a> software, but can
       be a bit confusing otherwise (i.e. remembering which port is
       connected to which console).  And you are stuck if you need to
       use serial ports for other things (such as modems) or you have
@@ -141,8 +141,8 @@
       buy an off-the-shelf solution.  These vary in price and
       capability.  See, for example, <a
       href="http://www.lightwavecom.com/">Lightwave</a>, <a
-      href="http://www.perle.com">Perle</a>, <a
-      href="http://www.avocent.com">Avocent</a> or <a
+      href="http://www.perle.com/">Perle</a>, <a
+      href="http://www.avocent.com/">Avocent</a> or <a
       href="http://www.blackbox.com/faxbacks/23000/23362.PDF">Black
       Box</a>.  These solutions can be quite expensive - typically
       $USD100 - $USD400 per port.</p>
@@ -162,12 +162,12 @@
         enough.</p></li>
 
       <li><p>A PC Unix system.  We used <a
-        href="http://www.freebsd.org">FreeBSD 4.3</a> as that is used
+        href="../../../../index.html">FreeBSD 4.3</a> as that is used
         for other tasks within our office.</p></li>
 
       <li><p>A multi-port serial card.  We chose the <a
         href="http://www.stallion.com/html/products/easyio.html">EasyIO-PCI</a>
-        8-port card from <a href="http://www.stallion.com">Stallion
+        8-port card from <a href="http://www.stallion.com/">Stallion
         Technologies</a>.  This cost us about $AUD740, or under
         $100/port, from <a href="http://www.ht.com.au/">Harris
         Technologies</a> (which has lots of stuff but is by no means
@@ -275,7 +275,7 @@
       config file with the appropriate entries.  See the
       <samp>stl(4)</samp> man page and the appropriate section of the
       <a
-      href="http://www.au.freebsd.org/handbook/kernelconfig.html">FreeBSD
+      href="../../../../doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">FreeBSD
       Handbook</a>.</p>
 
     <h4>Building World</h4>
@@ -993,7 +993,7 @@
     <h2><a name="freebsd">Using a Serial Console on FreeBSD</a></h2>
 
     <p>The procedure for doing this is described in detail in the <a
-      href="http://www.freebsd.org/handbook/serialconsole-setup.html">FreeBSD
+      href="../../../../doc/en_US.ISO8859-1/books/handbook/serialconsole-setup.html">FreeBSD
       Handbook</a>.  This is a quick summary.</p>
 
     <h4>Check the kernel configuration</h4>
@@ -1089,7 +1089,7 @@
     <p>As shipped with FreeBSD, the 8.5 version does not authenticate
       against FreeBSD servers using MD5 passwords.  There is a patch
       in the FreeBSD GNATS system (<a
-      href="http://www.freebsd.org/cgi/query-pr.cgi?pr=28432">ports/28432</a>)
+      href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28432">ports/28432</a>)
       that fixes this problem.  Kevin has indicated this patch will be
       included in future versions of conserver from him.  There are a
       couple of other problems with the 8.5 version as well.</p>
@@ -1138,7 +1138,7 @@
       href="ftp://ftp.conserver.com/conserver/conserver-7.0.2.tar.gz">FTP</a>
       the conserver 7.0.2 source tarball.</p>
 
-    <p><a href="http://www.stallion.com">Stallion Technologies</a> homepage.</p>
+    <p><a href="http://www.stallion.com/">Stallion Technologies</a> homepage.</p>
 
     <p>David Harris' <a
       href="http://www.conserver.com/consoles/msock.html">Minor Scroll
@@ -1155,7 +1155,7 @@
       similar console server</a> based on the <samp>screen</samp>
       program and an old SunOs host.</p>
 
-    <p>The <a href="http://www.realweasel.com">Real Weasel</a> company
+    <p>The <a href="http://www.realweasel.com/">Real Weasel</a> company
       makes a ISA or PCI video card that looks like a PC video card
       but actually talks to a serial port.  This can be used to
       implement serial consoles on PC hardware for operating systems
Index: en_US.ISO8859-1/articles/contributing/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributing/article.sgml,v
retrieving revision 1.471
diff -u -r1.471 article.sgml
--- en_US.ISO8859-1/articles/contributing/article.sgml	2001/10/15 13:28:21	1.471
+++ en_US.ISO8859-1/articles/contributing/article.sgml	2001/10/22 22:01:34
@@ -169,7 +169,7 @@
 
       <indexterm><primary>problem reports database</primary></indexterm>
       <para>The <ulink
-	  url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">FreeBSD PR
+	  url="&url.cgi.server;/cgi/query-pr-summary.cgi">FreeBSD PR
 	  list</ulink> shows all the current active problem reports and
 	requests for enhancement that have been submitted by FreeBSD users.
 	Look through the open PRs, and see if anything there takes your
@@ -199,13 +199,13 @@
 	an interest in such things (and a tolerance for a
 	<emphasis>high</emphasis> volume of mail!) may subscribe to the
 	hackers mailing list by sending mail to &a.majordomo;.  See <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">The
+	url="&url.top.books;/handbook/eresources.html#ERESOURCES-MAIL">The
 	FreeBSD Handbook</ulink> for more information
 	about this and other mailing lists.</para>
 	  
       <para>If you find a bug or are submitting a specific change, please
 	report it using the &man.send-pr.1; program or its <ulink
-	  url="http://www.FreeBSD.org/send-pr.html">WEB-based
+	  url="&url.top.level;/send-pr.html">WEB-based
 	  equivalent</ulink>.  Try to fill-in each field of the bug report.
 	Unless they exceed 65KB, include any patches directly in the report.
 	If the patch is suitable to be applied to the source tree put
@@ -214,7 +214,7 @@
 	because cut-and-paste turns tabs into spaces and makes them unusable.
 	Consider compressing patches and using &man.uuencode.1; if they exceed
 	20KB.  Upload very large submissions to <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/">ftp.FreeBSD.org:/pub/FreeBSD/incoming/</ulink>.</para>
+	  url="&url.ftp.server;/pub/FreeBSD/incoming/">ftp.FreeBSD.org:/pub/FreeBSD/incoming/</ulink>.</para>
 	  
       <para>After filing a report, you should receive confirmation along with
 	a tracking number.  Keep this tracking number so that you can update
@@ -250,7 +250,7 @@
 	on-going release of FreeBSD known as <quote>FreeBSD-current</quote>
 	which is made available in a variety of ways for the convenience of
 	developers working actively on the system. See <ulink url="
-	http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html">The
+	&url.top.books;/handbook/current-stable.html">The
 	FreeBSD Handbook</ulink> for more
 	information about getting and using FreeBSD-current.</para>
 	  
Index: en_US.ISO8859-1/articles/contributors/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributors/article.sgml,v
retrieving revision 1.34
diff -u -r1.34 article.sgml
--- en_US.ISO8859-1/articles/contributors/article.sgml	2001/10/20 18:39:29	1.34
+++ en_US.ISO8859-1/articles/contributors/article.sgml	2001/10/21 03:54:06
@@ -259,7 +259,7 @@
 	  <listitem>
 	    <para><ulink url="http://www.osd.bsdi.com/">BSDi</ulink> (formerly Walnut Creek CDROM)
 	      has donated almost more than we can say (see the History
-	      section of the <ulink url="/handbook">FreeBSD Handbook</ulink> for more details).
+	      section of the <ulink url="&url.top.books;/handbook/index.html">FreeBSD Handbook</ulink> for more details).
 	      In particular, we would like to thank them for the original
 	      hardware used for <hostid
 		role="fqdn">freefall.FreeBSD.org</hostid>, our primary
@@ -1478,7 +1478,7 @@
 
     <title>The FreeBSD Documentation Project</title>
     
-    <para>The <ulink url="http://www.FreeBSD.org/docproj/docproj.html">FreeBSD
+    <para>The <ulink url="&url.top.level;/docproj/index.html">FreeBSD
 	Documentation Project</ulink> is responsible for a number of different
       services, each service being run by an individual and his
       <emphasis>deputies</emphasis> (if any):</para>
@@ -1605,7 +1605,7 @@
     <variablelist>
       <varlistentry>
 	<term><ulink
-	    url="http://www.FreeBSD.org/docproj/docproj.html">Documentation
+	    url="&url.top.level;/docproj/index.html">Documentation
 	    Project Manager</ulink></term>
 
 	<listitem>
@@ -1663,7 +1663,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/security/">Security
+	<term><ulink url="&url.top.level;/security/index.html">Security
 	    Officer</ulink></term>
 
 	<listitem>
@@ -1672,7 +1672,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/support.html#cvs">Source
+	<term><ulink url="&url.top.level;/support.html#cvs">Source
 	    Repository Managers</ulink></term>
 
 	<listitem>
@@ -1683,7 +1683,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/ports/">Ports
+	<term><ulink url="&url.top.level;/ports/index.html">Ports
 	    Manager</ulink></term>
 
 	<listitem>
@@ -1708,7 +1708,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><ulink url="http://www.FreeBSD.org/support.html#gnats">GNATS
+	<term><ulink url="&url.top.level;/support.html#gnats">GNATS
 	    Administrator</ulink></term>
 	      
 	<listitem>
Index: en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v
retrieving revision 1.2
diff -u -r1.2 article.sgml
--- en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	2001/10/15 13:21:52	1.2
+++ en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	2001/10/18 08:31:55
@@ -51,7 +51,7 @@
     <title>Introduction</title>
 
       <para>If you have visited
-	<ulink url="http://www.polstra.com">John Polstra's site</ulink>
+	<ulink url="http://www.polstra.com/">John Polstra's site</ulink>
         and read
         <ulink url="http://www.polstra.com/projects/freeware/CVSup/faq.html">his
 FAQ</ulink>,
Index: en_US.ISO8859-1/articles/dialup-firewall/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v
retrieving revision 1.18
diff -u -r1.18 article.sgml
--- en_US.ISO8859-1/articles/dialup-firewall/article.sgml	2001/10/16 11:52:58	1.18
+++ en_US.ISO8859-1/articles/dialup-firewall/article.sgml	2001/10/21 03:54:06
@@ -50,7 +50,7 @@
     <para>The first thing you will need to do is recompile your kernel
       If you need more information on how to recompile the kernel,
       then the best place to start is the <ulink
-	URL="http://www.freebsd.org/handbook/kernelconfig.html">kernel
+	URL="&url.top.books;/handbook/kernelconfig.html">kernel
 	configuration section in the Handbook</ulink>. You need to add the
       following options into your kernel configuration file:</para>
 
Index: en_US.ISO8859-1/articles/explaining-bsd/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml,v
retrieving revision 1.5
diff -u -r1.5 article.sgml
--- en_US.ISO8859-1/articles/explaining-bsd/article.sgml	2001/10/16 11:52:59	1.5
+++ en_US.ISO8859-1/articles/explaining-bsd/article.sgml	2001/10/21 04:46:20
@@ -28,9 +28,9 @@
 	  Operating System Counter</ulink>, as of April 1999 31.3% of the
 	world's network connected machines run Linux.  14.6% run BSD UNIX.
 	Some of the world's largest web operations, such as <ulink
-          url="http://www.yahoo.com">Yahoo!</ulink>, run BSD.  The world's
+          url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD.  The world's
 	busiest FTP server, <ulink
-          url="ftp://ftp.cdrom.com">ftp.cdrom.com</ulink>, uses BSD to
+          url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, uses BSD to
 	transfer 1.4 TB of data a day.    Clearly this is not a niche
 	market: BSD is a well-kept secret.</para>
 
@@ -145,23 +145,23 @@
       CSRG members, William F. Jolitz, wrote the remaining code and released
       it in early 1992 as <emphasis>386BSD</emphasis>.  At the same time,
       another group of ex-CSRG members formed a commercial company called
-      <ulink url="http://www.bsdi.com">Berkeley Software Design Inc.</ulink>
+      <ulink url="http://www.bsdi.com/">Berkeley Software Design Inc.</ulink>
       and released a beta version of an operating system called
-      <ulink url="http://www.bsdi.com">BSD/386</ulink>, which was based on
+      <ulink url="http://www.bsdi.com/">BSD/386</ulink>, which was based on
       the same sources.  The name of the operating system has since changed
       to BSD/OS.</para>
 
     <para>386BSD never became a stable operating system.  Instead, two other
       projects split off from it in 1993:
-      <ulink url="http://www.NetBSD.org">NetBSD</ulink> and
-      <ulink url="http://www.FreeBSD.org">FreeBSD</ulink>.  The two projects
+      <ulink url="http://www.NetBSD.org/">NetBSD</ulink> and
+      <ulink url="&url.top.level;/index.html">FreeBSD</ulink>.  The two projects
       originally diverged due to differences in patience waiting for
       improvements to 386BSD: the NetBSD people started early in the year,
       and the first version of FreeBSD was not ready until the end of the
       year.  In the meantime, the code base had diverged sufficiently to
       make it difficult to merge.  In addition, the projects had different
       aims, as we will see below.  In 1996, a further project,
-      <ulink url="http://www.OpenBSD.org">OpenBSD</ulink>, split off from
+      <ulink url="http://www.OpenBSD.org/">OpenBSD</ulink>, split off from
       NetBSD.</para>
   </sect1>
   
@@ -191,7 +191,7 @@
 
       <listitem>
 	<para>In 1992, AT&amp;T sued
-	  <ulink url="http://www.bsdi.com">BSDI</ulink>,
+	  <ulink url="http://www.bsdi.com/">BSDI</ulink>,
 	  the vendor of BSD/386, alleging that the product contained
 	  AT&amp;T-copyrighted code.  The case was settled out of court in
 	  1994, but the spectre of the litigation continues to haunt people.
@@ -245,7 +245,7 @@
       <para>The BSD kernels are developed and updated following the Open
 	Source development model.  Each project maintains a publicly
 	accessible <emphasis>source tree</emphasis> under the
-	<ulink url="http://www.sourcegear.com/CVS">Concurrent Versions
+	<ulink url="http://www.sourcegear.com/CVS/">Concurrent Versions
 	  System</ulink> (CVS), which contains all source files for the
 	project, including documentation and other incidental files.  CVS
 	allows users to <quote>check out</quote> (in other words, to
@@ -436,7 +436,7 @@
 	<listitem>
 	  <para><ulink url="http://www.apple.com/macosx/server/">Mac OS
 	      X</ulink> is the latest version of the operating system for
-	    <ulink url="http://www.apple.com">Apple Computer Inc.'s</ulink>
+	    <ulink url="http://www.apple.com/">Apple Computer Inc.'s</ulink>
 	      Macintosh line.  Unlike the rest of the operating system, the
 	      kernel is open source.  As part of this development, key Apple
 	      developers have commit access to the FreeBSD source tree.</para>
@@ -528,7 +528,7 @@
 
       <para>In addition, each of the projects has a list of consultants for
 	hire:
-	<ulink url="http://www.freebsd.org/commercial/consulting_bycat.html">FreeBSD</ulink>,
+	<ulink url="&url.top.level;/commercial/consulting_bycat.html">FreeBSD</ulink>,
 	<ulink url="http://www.netbsd.org/gallery/consultants.html">NetBSD</ulink>,
 	and <ulink url="http://www.openbsd.org/support.html">OpenBSD</ulink>.</para>
     </sect2>
Index: en_US.ISO8859-1/articles/filtering-bridges/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v
retrieving revision 1.3
diff -u -r1.3 article.sgml
--- en_US.ISO8859-1/articles/filtering-bridges/article.sgml	2001/10/16 11:52:59	1.3
+++ en_US.ISO8859-1/articles/filtering-bridges/article.sgml	2001/10/21 03:54:07
@@ -102,7 +102,7 @@
 
     <para>For instructions on how to build and install a new kernel, refer to
       the
-      <ulink url="http://www.FreeBSD.org/handbook/kernelconfig-building.html">Building and Installing a Custom Kernel</ulink> section of the handbook</para>
+      <ulink url="&url.top.books;/handbook/kernelconfig-building.html">Building and Installing a Custom Kernel</ulink> section of the handbook</para>
   </sect1>
 
   <sect1 id="filtering-bridges-finalprep">
Index: en_US.ISO8859-1/articles/fonts/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/fonts/article.sgml,v
retrieving revision 1.18
diff -u -r1.18 article.sgml
--- en_US.ISO8859-1/articles/fonts/article.sgml	2001/10/16 11:52:59	1.18
+++ en_US.ISO8859-1/articles/fonts/article.sgml	2001/10/21 03:54:07
@@ -24,7 +24,7 @@
 
 <!-- The section "Setting a virtual console to 80x60 line mode" was
      updated to reflect changes in FreeBSD system configuration
-     files by Mark Ovens <mark@ukug.uk.freebsd.org> 27/5/00
+     files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
  -->
 
 <article>
@@ -662,7 +662,7 @@
 	    metric (<filename>.afm</filename>) file.</para>
 
 	  <para>Currently available at <ulink
-	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf</ulink>.
+	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/</ulink>.
 	    Note: These files are postscript programs and must be
 	    downloaded to disk by holding down the
 	    <keycap>Shift</keycap> key when clicking on the link.
@@ -850,7 +850,7 @@
       <listitem>
         <para>The freetype module is included with XFree86 4.x.  For
         more information please see the <ulink
-        url="http://www.freebsd.org/handbook/x-fonts.html">FreeBSD
+        url="&url.top.books;/handbook/x-fonts.html">FreeBSD
         Handbook</ulink> or the <ulink
         url="http://www.xfree86.org/4.0.2/fonts.html">XFree86 4.0.2
         Fonts</ulink> page.</para>
@@ -871,15 +871,15 @@
       <listitem>
 	<para><command>xfstt</command> is another font server for X11,
 	  available under <ulink url="
-	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts">
-	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts</ulink>.</para>
+	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts/">
+	    ftp://sunsite.unc.edu/pub/Linux/X11/fonts/</ulink>.</para>
       </listitem>
 
       <listitem>
 	<para>A program called <command>ttf2bdf</command> can produce
 	  BDF files suitable for use in an X environment from TrueType
 	  files.  Linux binaries are said to be available from <ulink
-	    url="ftp://crl.nmsu.edu/CLR/multiling/General">ftp://crl.nmsu.edu/CLR/multiling/General/</ulink>.</para>
+	    url="ftp://crl.nmsu.edu/CLR/multiling/General/">ftp://crl.nmsu.edu/CLR/multiling/General/</ulink>.</para>
       </listitem>
 
       <listitem>
@@ -912,7 +912,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="ftp://ftp.winsite.com">ftp://ftp.winsite.com</ulink>
+	    url="ftp://ftp.winsite.com/">ftp://ftp.winsite.com/</ulink>
 	  (Formerly CICA)</para>
       </listitem>
 
@@ -928,12 +928,12 @@
 
       <listitem>
 	<para><ulink
-	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html</ulink></para>
+	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/</ulink></para>
       </listitem>
 
       <listitem>
 	<para><ulink
-	    url="http://www.esselte.com/letraset/index.html">http://www.esselte.com/letraset/index.html</ulink></para>
+	    url="http://www.esselte.com/letraset/">http://www.esselte.com/letraset/</ulink></para>
       </listitem>
 
       <listitem>
Index: en_US.ISO8859-1/articles/ipsec-must/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml,v
retrieving revision 1.9
diff -u -r1.9 article.sgml
--- en_US.ISO8859-1/articles/ipsec-must/article.sgml	2001/10/16 11:53:00	1.9
+++ en_US.ISO8859-1/articles/ipsec-must/article.sgml	2001/10/21 03:54:08
@@ -183,7 +183,7 @@
 
     <para>A comprehensive guide on running IPsec on FreeBSD is
       provided in <ulink
-      url="../../books/handbook/ipsec.html">FreeBSD
+      url="&url.top.books;/handbook/ipsec.html">FreeBSD
       Handbook</ulink>.</para>
   </sect1>
 
Index: en_US.ISO8859-1/articles/multi-os/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/multi-os/article.sgml,v
retrieving revision 1.19
diff -u -r1.19 article.sgml
--- en_US.ISO8859-1/articles/multi-os/article.sgml	2001/10/16 11:53:00	1.19
+++ en_US.ISO8859-1/articles/multi-os/article.sgml	2001/10/22 22:01:29
@@ -48,7 +48,7 @@
       completely occupied by DOS, you might find the FIPS utility
       (included on the FreeBSD CDROM in the
       <filename>\TOOLS</filename> directory or via <ulink
-	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>)
+	URL="&url.ftp.server;/pub/FreeBSD/tools/">ftp</ulink>)
       useful.  It lets you repartition your hard disk without
       destroying the data already on it.  There is also a commercial
       program available called Partition Magic, which lets you size
@@ -105,7 +105,7 @@
 	    selecting the OS with your arrow keys.  It is included on
 	    the FreeBSD CD in the <filename>\TOOLS</filename>
 	    directory, and via <ulink
-	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>.</para>
+	      URL="&url.ftp.server;/pub/FreeBSD/tools/">ftp</ulink>.</para>
 	</listitem>
       </varlistentry>
 
@@ -277,7 +277,7 @@
       previous boot manager.  Boot Easy can be reinstalled by using
       the BOOTINST.EXE utility included in the \TOOLS directory on the
       CDROM, and via <ulink
-	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>.
+	URL="&url.ftp.server;/pub/FreeBSD/tools/">ftp</ulink>.
       You can also re-start the installation process and go to the
       partition editor.  From there, mark the FreeBSD partition as
       bootable, select Boot Manager, and then type W to (W)rite out
@@ -344,13 +344,14 @@
 	mini-HOWTO</ulink> might be interesting as well.  The <ulink
 	URL="http://www.in.net/~jkatz/win95/Linux-HOWTO.html">Linux-HOWTO</ulink>
       is also helpful.</para>
-
+<![ IGNORE [
+<!-- dead link -->
     <para>The <ulink
 	URL="http://www.dorsai.org/~dcl/publications/NTLDR_Hacking">NT
 	Loader Hacking Guide</ulink> provides good information on
       multibooting Windows NT, '95, and DOS with other operating
       systems.</para>
-
+]]>
     <para>And Hale Landis's "How It Works" document pack contains some
       good info on all sorts of disk geometry and booting related
       topics.  You can find it at
Index: en_US.ISO8859-1/articles/new-users/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/new-users/article.sgml,v
retrieving revision 1.28
diff -u -r1.28 article.sgml
--- en_US.ISO8859-1/articles/new-users/article.sgml	2001/10/16 11:53:00	1.28
+++ en_US.ISO8859-1/articles/new-users/article.sgml	2001/10/21 04:46:40
@@ -689,7 +689,7 @@
       <command>lp</command> or <command>lpr</command> should send a
       file to the printer.  Whether or not the file actually prints
       depends on configuring it, which is covered in the <ulink
-      URL="../../books/handbook/handbook.html">FreeBSD
+      URL="&url.top.books;/handbook/index.html">FreeBSD
       handbook.</ulink></para>
   </sect1>
 
@@ -792,7 +792,7 @@
       edit files, so you can get everything up and running.  There is
       a great deal of information in the FreeBSD handbook (which is
       probably on your hard drive) and <ulink
-      URL="http://www.FreeBSD.org/">FreeBSD's web site</ulink>.  A
+      URL="&url.top.level;/index.html">FreeBSD's web site</ulink>.  A
       wide variety of packages and ports are on the CDROM as well as
       the web site.  The handbook tells you more about how to use them
       (get the package if it exists, with <command>pkg_add
@@ -882,7 +882,7 @@
       space after the slash.)</para>
 
     <para>You might want to get the most recent version of Netscape
-      from their <ulink URL="ftp://ftp.netscape.com">FTP site</ulink>.
+      from their <ulink URL="ftp://ftp.netscape.com/">FTP site</ulink>.
       (Netscape requires the X Window System.) There is now a FreeBSD
       version, so look around carefully.  Just use <command>gunzip
       <replaceable>filename</replaceable></command> and <command>tar
Index: en_US.ISO8859-1/articles/programming-tools/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/programming-tools/article.sgml,v
retrieving revision 1.17
diff -u -r1.17 article.sgml
--- en_US.ISO8859-1/articles/programming-tools/article.sgml	2001/09/02 23:53:58	1.17
+++ en_US.ISO8859-1/articles/programming-tools/article.sgml	2001/10/18 08:31:54
@@ -11,7 +11,7 @@
     <title>This document has moved!</title>
 
     <para>This document has been integrated into the <ulink
-      url="../../books/developers-handbook/">Developer's
+      url="&url.top.books;/developers-handbook/index.html">Developer's
       Handbook</ulink>.  Please update your bookmarks.</para>
   </sect1>
 </article>
Index: en_US.ISO8859-1/articles/pxe/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pxe/article.sgml,v
retrieving revision 1.8
diff -u -r1.8 article.sgml
--- en_US.ISO8859-1/articles/pxe/article.sgml	2001/10/16 11:53:00	1.8
+++ en_US.ISO8859-1/articles/pxe/article.sgml	2001/10/22 22:01:31
@@ -80,7 +80,7 @@
     <procedure>
       <step>
         <para>Install DHCP : Install isc-dhcp-2.0 you can use this config file 
-          <ulink url="http://people.freebsd.org/~alfred/pxe/dhcpd.conf">
+          <ulink url="&url.people.server;/~alfred/pxe/dhcpd.conf">
           dhcpd.conf</ulink>, stick it in /usr/local/etc/</para>
       </step>
       
@@ -133,7 +133,7 @@
     <procedure>
       <step>
         <para>Download bootfiles : Download the 
-          <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/i386/kern.flp">
+          <ulink url="&url.ftp.server;/pub/FreeBSD/snapshots/i386/kern.flp">
           kern.flp</ulink> and 
           <ulink url="ftp://ftp.FreeBSD.opg/pub/FreeBSD/snapshots/i386/mfsroot.flp"> 
           mfsroot.flp</ulink> floppy images.</para>
@@ -176,7 +176,7 @@
         <para>Make a special <filename>loader.rc</filename> to and install it 
           in <filename>/usr/tftpboot/boot/loader.rc</filename> so that it 
           does not prompt for the second disk, here is 
-          <ulink url="http://people.FreeBSD.org/~alfred/pxe/loader.rc">
+          <ulink url="&url.people.server;/~alfred/pxe/loader.rc">
           mine</ulink>.</para>
       </step>
       
@@ -197,7 +197,7 @@
       <step>
         <para>Make your sysinstall script <filename>install.cfg</filename>, you
           can use 
-          <ulink url="http://people.FreeBSD.org/~alfred/pxe/install.cfg">
+          <ulink url="&url.people.server;/~alfred/pxe/install.cfg">
           mine</ulink> as a template, but you must edit it.</para>
       </step>
       
Index: en_US.ISO8859-1/articles/serial-uart/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml,v
retrieving revision 1.2
diff -u -r1.2 article.sgml
--- en_US.ISO8859-1/articles/serial-uart/article.sgml	2001/10/16 11:53:01	1.2
+++ en_US.ISO8859-1/articles/serial-uart/article.sgml	2001/10/21 03:54:11
@@ -2035,7 +2035,7 @@
 	      
         <para>If you do not already have a custom kernel
 	  configuration file set up, refer to <ulink
-	  url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">Kernel
+	  url="&url.top.books;/handbook/kernelconfig.html">Kernel
 	  Configuration</ulink> chapter of the FreeBSD Handbook for
 	  general procedures.  The following are the specifics for the
 	  Boca 16 board and assume you are using the kernel name
Index: en_US.ISO8859-1/books/corp-net-guide/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v
retrieving revision 1.3
diff -u -r1.3 book.sgml
--- en_US.ISO8859-1/books/corp-net-guide/book.sgml	2001/06/24 21:01:54	1.3
+++ en_US.ISO8859-1/books/corp-net-guide/book.sgml	2001/10/18 08:31:55
@@ -26,7 +26,7 @@
 	distributed without the publisher's express written
 	<email>Chanda.Leary-Coutu@awl.com</email>.
 	The other chapters of
-	<ulink url="http://www.awl.com/cseng/titles/0-201-70481-1">the
+	<ulink url="http://cseng.aw.com/book/0,,0201704811,00.html">the
 	  book</ulink> covers topics such as system administration,
 	fileserving, and e-mail delivery.  More information about this book is
 	available from the publisher, with whom you can also sign up to
@@ -571,7 +571,7 @@
 	    play.  I prefer using these devices because they are much cheaper
 	    and more reliable than a standalone PC running printserver
 	    software.  For example, Castelle
-	    <ulink url="http://www.castelle.com">http://www.castelle.com</ulink>
+	    <ulink url="http://www.castelle.com/">http://www.castelle.com/</ulink>
 	    sells the LANpress 1P/10BT printserver for about $170.00.  Using
 	    these devices a FreeBSD UNIX server can have dozens of print spools
 	    accepting print jobs and then route them back out over the network
@@ -684,7 +684,7 @@
 
 	  <step>
 	    <para>Obtain the <filename>TCP16.EXE</filename> file from
-	      <ulink url="ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe">ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe</ulink>.</para>
+	      <ulink url="ftp://ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe">ftp://ftp3.novell.com/pub/updates/eol/nweol/tcp16.exe</ulink>.</para>
 	  </step>
 
 	  <step>
@@ -2131,7 +2131,7 @@
 
 	  <para>The better solution is to use a simple filter that converts
 	    incoming text from UNIX style to DOS style.  The following filter
-	    posted on questions@freebsd.org and the sample
+	    posted on questions@FreeBSD.org and the sample
 	    <filename>/etc/printcap</filename> entry can be used to do
 	    this:</para>
 
Index: en_US.ISO8859-1/books/developers-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v
retrieving revision 1.29
diff -u -r1.29 book.sgml
--- en_US.ISO8859-1/books/developers-handbook/book.sgml	2001/10/17 08:53:34	1.29
+++ en_US.ISO8859-1/books/developers-handbook/book.sgml	2001/10/22 22:01:37
@@ -38,12 +38,12 @@
 	helping with this project, send email to the &a.doc;.</para>
 
       <para>The latest version of this document is always available
-        from the <ulink URL="http://www.FreeBSD.org/">FreeBSD World
+        from the <ulink URL="&url.top.level;/index.html">FreeBSD World
         Wide Web server</ulink>.  It may also be downloaded in a
         variety of formats and compression options from the <ulink
-        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP
+        url="&url.ftp.server;/pub/FreeBSD/doc/">FreeBSD FTP
         server</ulink> or one of the numerous <ulink
-        url="http://www.freebsd.org/handbook/mirrors-ftp.html">mirror
+        url="&url.top.books;/handbook/mirrors-ftp.html">mirror
         sites</ulink>.</para>
     </abstract>
   </bookinfo>
Index: en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml,v
retrieving revision 1.9
diff -u -r1.9 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml	2001/09/02 09:02:29	1.9
+++ en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml	2001/10/18 08:31:55
@@ -353,11 +353,11 @@
       <listitem><simpara><ulink
 	url="http://www.daemonnews.org/200010/blueprints.html">Dynamic
 	Kernel Linker (KLD) Facility Programming Tutorial</ulink> -
-	<ulink url="http://www.daemonnews.org">Daemonnews</ulink> October 2000</simpara></listitem>
+	<ulink url="http://www.daemonnews.org/">Daemonnews</ulink> October 2000</simpara></listitem>
       <listitem><simpara><ulink
 	url="http://www.daemonnews.org/200007/newbus-intro.html">How
 	to Write Kernel Drivers with NEWBUS</ulink> - <ulink
-	url="http://www.daemonnews.org">Daemonnews</ulink> July
+	url="http://www.daemonnews.org/">Daemonnews</ulink> July
 	2000</simpara></listitem>
     </itemizedlist>
     </para>
Index: en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml,v
retrieving revision 1.4
diff -u -r1.4 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml	2001/07/17 22:20:45	1.4
+++ en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml	2001/10/18 08:31:55
@@ -15,7 +15,7 @@
 
     <para>This section should explain IPv6 and IPsec related implementation
     internals.  These functionalities are derived from <ulink
-    url="http://www.kame.net">KAME project</ulink></para>
+    url="http://www.kame.net/">KAME project</ulink></para>
 
     <sect2 id="ipv6details">
       <title>IPv6</title>
Index: en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v
retrieving revision 1.34
diff -u -r1.34 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml	2001/07/19 22:06:06	1.34
+++ en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml	2001/10/18 08:31:56
@@ -25,7 +25,7 @@
       <filename>/etc/fstab</filename>. Dumps to non-swap devices,
       tapes for example, are currently not supported. Config your
       kernel using <command>config <option>-g</option></command>.  See
-      <ulink url="http://www.FreeBSD.org/handbook">The FreeBSD
+      <ulink url="&url.top.books;/handbook/index.html">The FreeBSD
       Handbook</ulink> for details on configuring the FreeBSD
       kernel.</para>
 
@@ -315,7 +315,7 @@
       <programlisting>options DDB</programlisting>
 
       to your config file, and rebuild.  (See <ulink
-	url="http://www.FreeBSD.org/handbook">The FreeBSD Handbook</ulink> for details on
+	url="&url.top.books;/handbook/index.html">The FreeBSD Handbook</ulink> for details on
       configuring the FreeBSD kernel.</para>
 
     <note>
Index: en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v
retrieving revision 1.2
diff -u -r1.2 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml	2001/09/13 00:30:04	1.2
+++ en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml	2001/10/22 22:00:46
@@ -47,10 +47,10 @@
 	
 	<para> Michael C. Wu will be maintaining an I18N works in progress
 	  homepage at <ulink
-	  url="http://www.FreeBSD.org/~keichii/i18n/index.html">http://www.FreeBSD.org/~keichii/i18n/index.html</ulink>
+	  url="&url.people.server;/~keichii/i18n/">&url.people.server;/~keichii/i18n/</ulink>
 	  Please also read the BSDCon2000 I18N paper and presentations
 	  by Clive Lin, Chia-Liang Kao, and Michael C. Wu at <ulink
-	  url="http://www.FreeBSD.org/~keichii/papers/">http://www.FreeBSD.org/~keichii/papers/</ulink></para>
+	  url="&url.people.server;/~keichii/papers/">&url.people.server;/~keichii/papers/</ulink></para>
       </sect2>
 
       <sect2>
@@ -80,4 +80,4 @@
 	<programlisting><envar>setenv LD_PRELOAD /usr/lib/libxpg4.so</envar></programlisting>
       </sect2>
     </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
Index: en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml,v
retrieving revision 1.3
diff -u -r1.3 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml	2001/04/09 08:26:38	1.3
+++ en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml	2001/10/18 08:31:55
@@ -205,7 +205,7 @@
       
     <para>Additional Resources
     <itemizedlist>
-      <listitem><simpara><ulink url="http://www.pcisig.org">PCI
+      <listitem><simpara><ulink url="http://www.pcisig.org/">PCI
 	Special Interest Group</ulink></simpara></listitem>
 
       <listitem><simpara>PCI System Architecture, Fourth Edition by
Index: en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v
retrieving revision 1.22
diff -u -r1.22 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml	2001/10/17 08:53:34	1.22
+++ en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml	2001/10/21 05:22:52
@@ -249,7 +249,7 @@
 
       <listitem>
         <para>Any encumbered file requires specific approval from the 
-	  <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> before it is added to the
+	  <ulink url="&url.top.articles;/contributors/staff-core.html">Core team</ulink> before it is added to the
 	  CVS repository.</para>
       </listitem>
 
@@ -280,9 +280,9 @@
 
           <listitem>
             <para>Should always be in <filename>LINT</filename>, but the 
-	      <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> decides per case if it
+	      <ulink url="&url.top.articles;/contributors/staff-core.html">Core team</ulink> decides per case if it
 	      should be commented out or not.  The 
-	      <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> can, of course, change
+	      <ulink url="&url.top.articles;/contributors/staff-core.html">Core team</ulink> can, of course, change
 	      their minds later on.</para>
           </listitem>
 
@@ -299,13 +299,13 @@
         <orderedlist>
           <listitem>
             <indexterm><primary>core team</primary></indexterm>
-            <para>The <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html">Core team</ulink> decides if
+            <para>The <ulink url="&url.top.articles;/contributors/staff-core.html">Core team</ulink> decides if
               the code should be part of <command>make world</command>.</para>
           </listitem>
          
           <listitem>
             <indexterm><primary>release engineer</primary></indexterm>
-            <para>The <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html">Release Engineer</ulink>
+            <para>The <ulink url="&url.top.articles;/contributors/staff-who.html">Release Engineer</ulink>
               decides if it goes in to the release.</para>
           </listitem>
         </orderedlist>
Index: en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml,v
retrieving revision 1.11
diff -u -r1.11 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml	2001/08/28 12:50:03	1.11
+++ en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml	2001/10/18 08:31:55
@@ -440,7 +440,7 @@
       auditing, access control lists, fine grained privileges,
       information labeling, and mandatory access control.</para>
       <para>This is a work in progress and is the focus of the <ulink
-      url="http://www.trustedbsd.org">TrustedBSD</ulink> project.  Some
+      url="http://www.trustedbsd.org/">TrustedBSD</ulink> project.  Some
       of the initial work has been committed to FreeBSD-current
       (cap_set_proc(3)).</para>
 
Index: en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml	2001/09/02 09:24:05	1.10
+++ en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml	2001/10/22 22:01:40
@@ -106,7 +106,7 @@
 
       <para>Here is a list of interpreters that are available as
 	<ulink
-	  URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/">FreeBSD
+	  URL="&url.ftp.server;/pub/FreeBSD/ports/packages/">FreeBSD
 	  packages</ulink>, with a brief discussion of some of the
 	more popular interpreted languages.</para>
 
@@ -133,12 +133,12 @@
 	      for Visual Basic.</para>
 
 	    <para>The <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/bwbasic-2.10.tgz">Bywater
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/bwbasic-2.10.tgz">Bywater
 		Basic Interpreter</ulink> and the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/pbasic-2.0.tgz">Phil
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/pbasic-2.0.tgz">Phil
 		Cockroft's Basic Interpreter</ulink> (formerly Rabbit
 	      Basic) are available as <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/">FreeBSD
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/">FreeBSD
 		packages</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -159,7 +159,7 @@
 	      language, but can be rather large and unwieldy.</para>
 
 	    <para>FreeBSD has <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/gcl-2.0.tgz">GNU
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/gcl-2.0.tgz">GNU
 		Common Lisp</ulink> available as a package.</para>
 	  </listitem>
 	</varlistentry>
@@ -187,11 +187,11 @@
 	      abstraction to be used in research work.</para>
 
 	    <para>FreeBSD has packages of the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/elk-3.0.tgz">Elk
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/elk-3.0.tgz">Elk
 		Scheme Interpreter</ulink>, the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/mit-scheme-7.3.tgz">MIT
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/mit-scheme-7.3.tgz">MIT
 		Scheme Interpreter</ulink> and the <ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/scm-4e1.tgz">SCM
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/scm-4e1.tgz">SCM
 		Scheme Interpreter</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -201,7 +201,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/icon-9.0.tgz">The
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/icon-9.0.tgz">The
 		Icon Programming Language</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -211,7 +211,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/ucblogo-3.3.tgz">Brian
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/ucblogo-3.3.tgz">Brian
 		Harvey's LOGO Interpreter</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -221,7 +221,7 @@
 
 	  <listitem>
 	    <para><ulink
-		URL="ftp://ftp.FreeBSD.org:pub/FreeBSD/packages/lang/python-1.2">The
+		URL="&url.ftp.server;/pub/FreeBSD/ports/packages/lang/python-1.2.tgz">The
 		Python Object-Oriented Programming
 		Language</ulink></para>
 	  </listitem>
@@ -1367,7 +1367,7 @@
 
       <para>Finally, if you find its text-based command-prompt style
 	off-putting, there's a graphical front-end for it <ulink
-	  URL="../../../../ports/devel.html">xxgdb</ulink> in the ports
+	  URL="&url.top.level;/ports/devel.html">xxgdb</ulink> in the ports
 	collection.</para>
 
       <para>This section is intended to be an introduction to using
@@ -1694,7 +1694,7 @@
       <para>And doubtless many more that I've overlooked.</para>
 
       <para>Emacs can be installed on FreeBSD using <ulink
-	  URL="../../ports/editors.html">the Emacs
+	  URL="&url.top.level;/ports/editors.html">the Emacs
 	  port</ulink>.</para>
 
       <para>Once it's installed, start it up and do <userinput>C-h
@@ -1777,7 +1777,7 @@
 	quite big!).</para>
 
       <para>The best way to learn Emacs Lisp is to download the <ulink
-	  URL="ftp://prep.ai.mit.edu:pub/gnu/elisp-manual-19-2.4.tar.gz">Emacs
+	  URL="ftp://prep.ai.mit.edu/pub/gnu/elisp-manual-19-2.4.tar.gz">Emacs
 	  Tutorial</ulink></para>
 
       <para>However, there's no need to actually know any Lisp to get
Index: en_US.ISO8859-1/books/faq/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.273
diff -u -r1.273 book.sgml
--- en_US.ISO8859-1/books/faq/book.sgml	2001/10/17 06:49:04	1.273
+++ en_US.ISO8859-1/books/faq/book.sgml	2001/10/22 22:01:46
@@ -41,13 +41,13 @@
         construction. If you are interested in helping with this project,
         send email to the &a.doc;.  The latest version of this
         document is always available from the <ulink
-        URL="http://www.FreeBSD.org/">FreeBSD World Wide Web
+        URL="&url.top.level;/index.html">FreeBSD World Wide Web
         server</ulink>. It may also be downloaded as one large <ulink
         URL="book.html">HTML</ulink> file with HTTP or as plain text,
         postscript, PDF, etc. from the <ulink
-        URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP
+        URL="&url.ftp.server;/pub/FreeBSD/doc/">FreeBSD FTP
         server</ulink>. You may also want to <ulink
-        URL="http://www.FreeBSD.org/search/search.html">Search the
+        URL="&url.top.level;/search/index.html">Search the
         FAQ</ulink>.</para>
     </abstract>
   </bookinfo>
@@ -82,18 +82,18 @@
            Berkeley's <quote>Net/2</quote> to the i386, known as <quote>386BSD</quote>, though very
            little of the 386BSD code remains.  A fuller description of
            what FreeBSD is and how it can work for you may be found on
-           the <ulink URL="http://www.FreeBSD.org/">FreeBSD home
+           the <ulink URL="&url.top.level;/index.html">FreeBSD home
            page</ulink>.</para>
 
          <para>FreeBSD is used by companies, Internet Service Providers,
            researchers, computer professionals, students and home users
            all over the world in their work, education and recreation.
            See some of them in the <ulink
-           URL="http://www.FreeBSD.org/gallery/gallery.html">FreeBSD
+           URL="&url.top.level;/gallery/index.html">FreeBSD
            Gallery</ulink>.</para>
 
          <para>For more detailed information on FreeBSD, please see the
-           <ulink URL="../handbook/index.html">FreeBSD
+           <ulink URL="&url.top.books;/handbook/index.html">FreeBSD
            Handbook</ulink>.</para>
        </answer>
       </qandaentry>
@@ -117,16 +117,16 @@
             Software and one that we enthusiastically support.</para>
 
           <para>That code in our source tree which falls under the <ulink
-            url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public
+            url="&url.top.level;/copyright/COPYING">GNU General Public
               License (GPL)</ulink> or <ulink
-            url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library
+            url="&url.top.level;/copyright/COPYING.LIB">GNU Library
               General Public License (LGPL)</ulink> comes with slightly more
             strings attached, though at least on the side of enforced access
             rather than the usual opposite.  Due to the additional complexities
             that can evolve in the commercial use of GPL software, we do,
             however, endeavor to replace such software with submissions under
             the more relaxed <ulink
-            url="http://www.FreeBSD.org/copyright/freebsd-license.html">
+            url="&url.top.level;/copyright/freebsd-license.html">
               FreeBSD copyright</ulink> whenever possible.</para>
         </answer>
       </qandaentry>
@@ -175,7 +175,7 @@
 
         <answer>
           <para>Version <ulink
-            URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
+            URL="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
             is the latest <emphasis>STABLE</emphasis> version; it was
             released in &rel.current.date;. This is also the latest
             <emphasis>RELEASE</emphasis> version.</para>
@@ -206,14 +206,14 @@
 
         <answer>
           <para><ulink
-            URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
+            URL="&url.top.books;/handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
             is the development version of the operating system, which will
             in due course become 5.0-RELEASE.  As such, it is really only
             of interest to developers working on the system and die-hard
             hobbyists.  See the <ulink
-            URL="../handbook/cutting-edge.html#CURRENT">relevant
+            URL="&url.top.books;/handbook/cutting-edge.html#CURRENT">relevant
             section</ulink> in the <ulink
-            URL="../handbook/index.html">handbook</ulink> for details on
+            URL="&url.top.books;/handbook/index.html">handbook</ulink> for details on
             running -CURRENT.</para>
 
           <para>If you are not familiar with the operating system or are
@@ -229,7 +229,7 @@
             treated with contempt.</para>
 
           <para>Every day, <ulink
-            URL="http://www.FreeBSD.org/releases/snapshots.html">snapshot
+            URL="&url.top.level;/releases/snapshots.html">snapshot
             </ulink> releases are made based on the current state of the
             -CURRENT and -STABLE branches. Nowadays, distributions of the
             occasional snapshot are now being made available. The goals
@@ -289,13 +289,13 @@
         <answer>
           <para>Back when FreeBSD 2.0.5 was released, we decided to
             branch FreeBSD development into two parts.  One branch was
-            named <ulink URL="../handbook/stable.html">-STABLE</ulink>,
+            named <ulink URL="&url.top.books;/handbook/current-stable.html#STABLE">-STABLE</ulink>,
             with the intention that only well-tested bug fixes and small
             incremental enhancements would be made to it (for Internet
             Service Providers and other commercial enterprises for whom
             sudden shifts or experimental features are quite
             undesirable).  The other branch was <ulink
-            URL="../handbook/cutting-edge.html#CURRENT">-CURRENT</ulink>,
+            URL="&url.top.books;/handbook/cutting-edge.html#CURRENT">-CURRENT</ulink>,
             which essentially has been one unbroken line leading towards
             5.0-RELEASE (and beyond) since 2.0 was released. If a little
             ASCII art would help, this is how it looks:</para>
@@ -378,9 +378,9 @@
           <para>The key decisions concerning the FreeBSD project, such as
             the overall direction of the project and who is allowed to add
             code to the source tree, are made by a <ulink
-            URL="../handbook/staff.html#STAFF-CORE">core team</ulink> of
+            URL="&url.top.articles;/contributors/staff-core.html">core team</ulink> of
             9 people. There is a much larger team of more than 200 <ulink
-            URL="../handbook/staff-committers.html">committers</ulink> who
+            URL="&url.top.articles;/contributors/staff-committers.html">committers</ulink> who
             are authorized to make changes directly to the FreeBSD source
             tree.</para>
 
@@ -399,20 +399,20 @@
         <answer>
           <para>Every significant release of FreeBSD is available via
             anonymous FTP from the <ulink
-            URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/">
+            URL="&url.ftp.server;/pub/FreeBSD/">
             FreeBSD FTP site</ulink>:</para>
 
           <itemizedlist>
             <listitem>
               <para>For the current 3.X-STABLE release, 3.5.1-RELEASE, see
                 the <ulink
-                URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.5.1-RELEASE/">3.5.1-RELEASE directory</ulink>.</para>
+                URL="&url.ftp.server;/pub/FreeBSD/releases/i386/3.5.1-RELEASE/">3.5.1-RELEASE directory</ulink>.</para>
             </listitem>
 
             <listitem>
               <para>The current 4-STABLE release, &rel.current;-RELEASE can be
                 found in the <ulink
-                URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
+                URL="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
             </listitem>
 
             <listitem>
@@ -432,7 +432,7 @@
           </itemizedlist>
 
 	  <para>Information about obtaining FreeBSD on CD, DVD, and other
-	    media can be found in <ulink url="../handbook/mirrors.html">the
+	    media can be found in <ulink url="&url.top.books;/handbook/mirrors.html">the
 	      Handbook</ulink>.</para>
         </answer>
       </qandaentry>
@@ -444,7 +444,7 @@
 
         <answer>
           <para>You can find full information in the <ulink
-            URL="../handbook/eresources.html#ERESOURCES-MAIL">Handbook
+            URL="&url.top.books;/handbook/eresources.html#ERESOURCES-MAIL">Handbook
             entry on mailing-lists</ulink>.</para>
         </answer>
       </qandaentry>
@@ -456,7 +456,7 @@
 
         <answer>
           <para>You can find full information in the <ulink
-            URL="http://www.FreeBSD.org/y2kbug.html">FreeBSD Y2K
+            URL="&url.top.level;/y2kbug.html">FreeBSD Y2K
             page</ulink>.</para>
         </answer>
       </qandaentry>
@@ -468,7 +468,7 @@
 
         <answer>
           <para>You can find full information in the <ulink
-            URL="../handbook/eresources-news.html">Handbook entry on
+            URL="&url.top.books;/handbook/eresources-news.html">Handbook entry on
             newsgroups</ulink>.</para>
         </answer>
       </qandaentry>
@@ -548,9 +548,9 @@
           <para>The Problem Report database of all user change requests
             may be queried (or submitted to) by using our web-based PR
             <ulink
-            URL="http://www.FreeBSD.org/send-pr.html">submission</ulink>
+            URL="&url.top.level;/send-pr.html">submission</ulink>
             and <ulink
-            URL="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
+            URL="&url.cgi.server;/cgi/query-pr-summary.cgi?query">
             query</ulink>
             interfaces.  The &man.send-pr.1; command can
             also be used to submit problem reports and change requests via
@@ -568,7 +568,7 @@
           <para>Yes.  The documentation is available in a number of different
             formats and compression schemes on the FreeBSD FTP site, in the
             <ulink
-            URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">/pub/FreeBSD/doc/</ulink> directory.</para>
+            URL="&url.ftp.server;/pub/FreeBSD/doc/">/pub/FreeBSD/doc/</ulink> directory.</para>
 
           <para>The documentation is categorised in a number of different
             ways.  These include:</para>
@@ -820,7 +820,7 @@
           <para>Knowing this, you can use the following command to install the
             English PDF FAQ package.</para>
 
-          <screen>&prompt.root; <userinput>pkg_add ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/packages/faq.en_US.ISO8859-1.pdf.tgz</userinput></screen>
+          <screen>&prompt.root; <userinput>pkg_add &url.ftp.server;/pub/FreeBSD/doc/packages/faq.en_US.ISO8859-1.pdf.tgz</userinput></screen>
 
           <para>Having done that, you can use &man.pkg.info.1; to determine
             where the file has been installed.</para>
@@ -847,11 +847,11 @@
 
           <para>For example, the split HTML version of the FAQ, compressed
             using &man.gzip.1;, can be found in the
-            <filename>en_US.ISO8859-1/books/faq/book.html-split.tar.gz</filename>
+            <filename>doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</filename>
             file.  To download and uncompress that file you would have to do
             this.</para>
 
-          <screen>&prompt.root; <userinput>fetch ftp://ftp.freebsd.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</userinput>
+          <screen>&prompt.root; <userinput>fetch &url.ftp.server;/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.gz</userinput>
 &prompt.root; <userinput>gzip -d book.html-split.tar.gz</userinput>
 &prompt.root; <userinput>tar xvf book.html-split.tar</userinput></screen>
 
@@ -894,7 +894,7 @@
                 copy of the web site sources using your favorite ftp mirror
                 tool.  Keep in mind that you have to build these sources before
                 publishing them.  Simply start at
-                <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/www">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/www</ulink>.</para>
+                <ulink URL="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/www">&url.ftp.server;/pub/FreeBSD/FreeBSD-current/www</ulink>.</para>
             </listitem>
           </itemizedlist>
         </answer>
@@ -936,33 +936,33 @@
           <itemizedlist>
             <listitem>
               <para>The <ulink
-                URL="http://www.FreeBSD.org/">FreeBSD Home Page</ulink>.</para>
+                URL="&url.top.level;/index.html">FreeBSD Home Page</ulink>.</para>
             </listitem>
 
             <listitem>
               <para><anchor id="pao">If you have a laptop, be sure and see
-                <ulink URL="http://www.jp.FreeBSD.org/PAO/">Tatsumi
+                <ulink URL="http://www.jp.FreeBSD.org/FAO/">Tatsumi
                 Hosokawa's Mobile Computing page</ulink> in Japan.</para>
             </listitem>
 
             <listitem>
               <para><anchor id="smp">For information on SMP (Symmetric
                 MultiProcessing), please see the <ulink
-                URL="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">SMP support page</ulink>.</para>
+                URL="&url.people.server;/~fsmp/SMP/SMP.html">SMP support page</ulink>.</para>
             </listitem>
 
             <listitem>
               <para><anchor id="multimedia">For information on FreeBSD
                 multimedia applications, please see the <ulink
-                URL="http://people.FreeBSD.org/~faulkner/multimedia/mm.html">multimedia</ulink>
+                URL="&url.people.server;/~faulkner/multimedia/mm.html">multimedia</ulink>
                 page.  If you are interested specifically in the <ulink
-                URL="http://people.FreeBSD.org/~ahasty/Bt848.html">Bt848</ulink>
+                URL="&url.people.server;/~ahasty/Bt848.html">Bt848</ulink>
                 video capture chip, then follow that link.</para>
             </listitem>
           </itemizedlist>
 
           <para>The FreeBSD handbook also has a fairly complete <ulink
-            URL="../handbook/bibliography.html">bibliography</ulink>
+            URL="&url.top.books;/handbook/bibliography.html">bibliography</ulink>
             section which is worth reading if you are looking for actual
             books to buy.</para>
         </answer>
@@ -977,7 +977,7 @@
 	<firstname>Nik</firstname>
 	<surname>Clayton</surname>
 	<affiliation>
-	  <address><email>nik@freebsd.org</email></address>
+	  <address><email>nik@FreeBSD.org</email></address>
 	</affiliation>
       </author>
     </chapterinfo>
@@ -1031,7 +1031,7 @@
 
           <para>Full instructions on this procedure and a little bit more
             about installation issues in general can be found in the
-            <ulink URL="../handbook/install.html">Handbook entry on
+            <ulink URL="&url.top.books;/handbook/install.html">Handbook entry on
             installing FreeBSD</ulink>.</para>
 
         </answer>
@@ -1082,7 +1082,7 @@
                 <quote>raw</quote>, using the low-level tools (e.g.
                 <command>fdimage</command> or <command>rawrite</command>)
                 described in the <ulink
-                URL="../handbook/install.html">installation guide to
+                URL="&url.top.books;/handbook/install.html">installation guide to
                 FreeBSD</ulink>.</para>
             </listitem>
           </itemizedlist>
@@ -1096,7 +1096,7 @@
 
         <answer>
           <para>Installation instructions can be found in the
-            <ulink URL="../handbook/install.html">Handbook entry on installing FreeBSD</ulink>.</para>
+            <ulink URL="&url.top.books;/handbook/install.html">Handbook entry on installing FreeBSD</ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -1182,7 +1182,7 @@
 
         <answer>
           <para>Have a look at
-            <ulink URL="http://www.FreeBSD.org/tutorials/multi-os/">
+            <ulink URL="&url.top.articles;/multi-os/index.html">
             The multi-OS page</ulink>.</para>
         </answer>
       </qandaentry>
@@ -1324,7 +1324,7 @@
 
 	  <para>It has been reported that later IBM BIOS revisions may have
 	    reintroduced the bug.  <ulink
-					  url="http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=200565+208320+/usr/local/www/db/text/2001/freebsd-mobile/20010429.freebsd-mobile">This message</ulink>
+					  url="&url.cgi.server;/cgi/getmsg.cgi?fetch=200565+208320+/usr/local/www/db/text/2001/freebsd-mobile/20010429.freebsd-mobile">This message</ulink>
 	    from Jacques Vidrine to the &a.mobile; describes a procedure
             which may work if your newer IBM laptop does not boot FreeBSD
             properly, and you can upgrade or downgrade the BIOS..</para>
@@ -1352,7 +1352,7 @@
             <step>
               <para>Download <filename>boot1</filename> and
                 <filename>boot2</filename> from <ulink
-                  url="http://people.freebsd.org/~bmah/ThinkPad/">http://people.freebsd.org/~bmah/ThinkPad/</ulink>.
+                  url="&url.people.server;/~bmah/ThinkPad/">&url.people.server;/~bmah/ThinkPad/</ulink>.
                 Put these files somewhere you will be able to retrieve them
                 later.</para>
             </step>
@@ -1940,7 +1940,7 @@
               </listitem>
 
               <listitem>
-                <para><ulink URL="../handbook/kernelconfig.html">Rebuild
+                <para><ulink URL="&url.top.books;/handbook/kernelconfig.html">Rebuild
                   your kernel,</ulink> modify the wd configuration lines to
                   read:</para>
 
@@ -2160,10 +2160,10 @@
           <para>We <emphasis>strongly</emphasis> recommend that you use
             binary snapshots to do this. 4-STABLE snapshots are available at
             <ulink
-            URL="ftp://releng4.FreeBSD.org/">releng4.FreeBSD.org</ulink>.</para>
+            URL="ftp://releng4.FreeBSD.org/">ftp://releng4.FreeBSD.org/</ulink>.</para>
 
           <para>If you wish to upgrade using source, please see the <ulink
-            URL="http://www.FreeBSD.org/handbook/cutting-edge.html">FreeBSD
+            URL="&url.top.books;/handbook/cutting-edge.html">FreeBSD
             Handbook</ulink> for more information.</para>
 
           <caution>
@@ -2278,7 +2278,7 @@
                <para>The security profile is not a silver bullet!  Even if you use the
                  extreme setting, you need to keep up with security
                  issues by reading an appropriate <ulink
-                 url="../handbook/eresources.html#ERESOURCES-MAIL">mailing
+                 url="&url.top.books;/handbook/eresources.html#ERESOURCES-MAIL">mailing
                  list</ulink>, using good passwords and passphrases, and
                  generally adhering to good security practices.  It simply
                  sets up the desired security to convenience ratio out of
@@ -2354,7 +2354,7 @@
 
         <answer>
           <para>See the complete list in the <ulink
-            URL="../handbook/install.html#INSTALL-HW">Handbook</ulink>.</para>
+            URL="&url.top.books;/handbook/install.html#INSTALL-HW">Handbook</ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -2486,7 +2486,7 @@
 
         <answer>
           <para>There is a list of these in the <ulink
-            URL="../handbook/install-hw.html#INSTALL-MISC">Miscellaneous
+            URL="&url.top.books;/handbook/install.html#INSTALL-MISC">Miscellaneous
             devices</ulink> section of the handbook.</para>
 
           <para>Some unnamed clone cards have also been known to work,
@@ -2656,7 +2656,7 @@
           <programlisting>device psm0 at atkbdc? irq 12</programlisting>
 
           <para>See the <ulink
-            URL="../handbook/kernelconfig.html">Handbook entry on
+            URL="&url.top.books;/handbook/kernelconfig.html">Handbook entry on
             configuring the kernel</ulink> if you have no experience with
             building kernels.</para>
 
@@ -3009,7 +3009,7 @@
 
         <answer>
           <para>See the <ulink
-            URL="../handbook/install-hw.html#INSTALL-NICS">
+            URL="&url.top.books;/handbook/install.html#INSTALL-NICS">
             Ethernet cards</ulink> section of the handbook for a more
             complete list.</para>
         </answer>
@@ -3049,7 +3049,7 @@
 
         <answer>
           <para>See the <ulink
-            URL="../handbook/install.html#INSTALL-MISC">Handbook</ulink>
+            URL="&url.top.books;/handbook/install.html#INSTALL-MISC">Handbook</ulink>
             for the list of other devices supported.</para>
 
         </answer>
@@ -3098,11 +3098,11 @@
           <para>The newer AIC789x series Adaptec chips are supported under
             the CAM SCSI framework which made it's debut in 3.0. Patches
             against 2.2-STABLE are in <ulink
-            URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/">
-            ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/</ulink>.
+            URL="&url.ftp.server;/pub/FreeBSD/development/cam/">
+            &url.ftp.server;/pub/FreeBSD/development/cam/</ulink>.
             A CAM-enhanced boot floppy is available at <ulink
-            URL="http://people.FreeBSD.org/~abial/cam-boot/">
-            http://people.FreeBSD.org/~abial/cam-boot/</ulink>.
+            URL="&url.people.server;/~abial/cam-boot/">
+            &url.people.server;/~abial/cam-boot/</ulink>.
             In both cases read the README before beginning.</para>
         </answer>
       </qandaentry>
@@ -3386,7 +3386,7 @@
             address range clash :), by bumping the kernel option
             <literal>EISA_SLOTS</literal> to a value of 12. Configure and
             compile a kernel, as described in the <ulink
-            URL="../handbook/kernelconfig.html">Handbook entry on
+            URL="&url.top.books;/handbook/kernelconfig.html">Handbook entry on
             configuring the kernel</ulink>.</para>
 
           <para>Of course, this does present you with a chicken-and-egg
@@ -4367,7 +4367,7 @@
           interest in FreeBSD can have very positive effects on FreeBSD's
           long-term viability). We encourage commercial software vendors to
           send their entries here for inclusion. See <ulink
-          URL="http://www.FreeBSD.org/commercial/commercial.html">the
+          URL="&url.top.level;/commercial/index.html">the
           Vendors page</ulink> for a longer list.</para>
       </note>
 
@@ -4379,9 +4379,9 @@
         <answer>
 	  <itemizedlist>
   	    <listitem>
-	      <para><ulink url="http://www.freebsdmall.com">The FreeBSD Mall</ulink>
+	      <para><ulink url="http://www.freebsdmall.com/">The FreeBSD Mall</ulink>
                 offers a FreeBSD native version of <ulink
-                url="http://www.vistasource.com">VistaSource</ulink>
+                url="http://www.vistasource.com/">VistaSource</ulink>
                 ApplixWare 5.</para>
 	
 	      <para>ApplixWare is a rich full-featured, commercial
@@ -4397,14 +4397,14 @@
   	    </listitem>
 	    <listitem>
 	      <para>The Linux version of <ulink
-	        url="http://www.sun.com/staroffice">StarOffice</ulink>
+	        url="http://www.sun.com/staroffice/">StarOffice</ulink>
 	        works flawlessly on FreeBSD.  The easiest way to
 	        install the Linux version of StarOffice is through the
 	        <ulink
-	        url="../handbook/ports.html">FreeBSD
+	        url="&url.top.books;/handbook/ports.html">FreeBSD
 	        Ports collection</ulink>.  Future versions of the
 	        open-source <ulink
-	        url="http://www.openoffice.org">OpenOffice</ulink>
+	        url="http://www.openoffice.org/">OpenOffice</ulink>
 	        suite should work as well.</para>
 	    </listitem>
 	  </itemizedlist>
@@ -4419,12 +4419,12 @@
 	  <para>The Open Group has released the source code to Motif 2.1.30.
 	    You can install the <literal>open-motif</literal> package, or
 	    compile it from ports.  Refer to
-	    <ulink url="../handbook/ports.html">the ports section of the
+	    <ulink url="&url.top.books;/handbook/ports.html">the ports section of the
 	      Handbook</ulink> for more information on how to do this.
 
 	    <note>
 	      <para>The Open Motif distribution only allows redistribution
-		if it is running on an <ulink url="http://www.opensource.org">
+		if it is running on an <ulink url="http://www.opensource.org/">
 		  open source</ulink> operating system.</para>
 	    </note>
 	  </para>
@@ -4578,7 +4578,7 @@
             source X11 desktop which is similar to CDE in many respects.
             You might also like the look and feel of <ulink
             URL="http://www.xfce.org/">xfce</ulink>. KDE and xfce are both
-            in the <ulink URL="http://www.FreeBSD.org/ports/">ports
+            in the <ulink URL="&url.top.level;/ports/index.html">ports
             system</ulink>.</para>
         </answer>
       </qandaentry>
@@ -4678,11 +4678,11 @@
 
         <answer>
           <para>Yes! See the <ulink
-            URL="http://www.FreeBSD.org/commercial/software_bycat.html#CATEGORY_DATABASE">
+            URL="&url.top.level;/commercial/software_bycat.html#CATEGORY_DATABASE">
             Commercial Vendors</ulink> section of FreeBSD's Web site.</para>
 
           <para>Also see the <ulink
-            URL="http://www.FreeBSD.org/ports/databases.html">
+            URL="&url.top.level;/ports/databases.html">
             Databases</ulink> section of the Ports collection.</para>
         </answer>
       </qandaentry>
@@ -4727,7 +4727,7 @@
 
         <answer>
           <para>Please take a look at
-            <ulink URL="http://www.FreeBSD.org/ports/">the ports
+            <ulink URL="&url.top.level;/ports/index.html">the ports
             page</ulink> for info on software packages ported to FreeBSD.
             The list currently tops 3400 and is growing daily, so come back
             to check often or subscribe to the
@@ -4765,8 +4765,8 @@
                 <term>for 2.2.8-RELEASE/2.2.8-STABLE</term>
                 <listitem>
                   <para><ulink
-                    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/</ulink></para>
+                    URL="&url.ftp.server;/pub/FreeBSD/ports/i386/packages-2.2.8/">
+                    &url.ftp.server;/pub/FreeBSD/ports/i386/packages-2.2.8/</ulink></para>
                 </listitem>
               </varlistentry>
 
@@ -4774,8 +4774,8 @@
                 <term>for 3.X-RELEASE/3.X-STABLE</term>
                 <listitem>
                   <para><ulink
-                    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/</ulink></para>
+                    URL="&url.ftp.server;/pub/FreeBSD/ports/i386/packages-3-stable/">
+                    &url.ftp.server;/pub/FreeBSD/ports/i386/packages-3-stable/</ulink></para>
                 </listitem>
               </varlistentry>
 
@@ -4783,8 +4783,8 @@
                 <term>for 4.X-RELEASE/4-STABLE</term>
                 <listitem>
                   <para><ulink
-                    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
+                    URL="&url.ftp.server;/pub/FreeBSD/ports/i386/packages-4-stable/">
+                    &url.ftp.server;/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
 
                 </listitem>
               </varlistentry>
@@ -4793,8 +4793,8 @@
                 <term>for 5.X-CURRENT</term>
                 <listitem>
                   <para><ulink
-                    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-current/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-current</ulink></para>
+                    URL="&url.ftp.server;/pub/FreeBSD/ports/i386/packages-5-current/">
+                    &url.ftp.server;/pub/FreeBSD/ports/i386/packages-5-current</ulink></para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -4805,7 +4805,7 @@
             new ones are constantly being added. It is always a good idea
             to check back periodically to see which packages are available
             at the <ulink
-            URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
+            URL="&url.ftp.server;/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
             master site.</para>
         </answer>
       </qandaentry>
@@ -4926,8 +4926,8 @@
 
         <answer>
           <para>Yes. Please see <ulink
-            URL="http://www.FreeBSD.org/java/">
-            http://www.FreeBSD.org/java/</ulink>.</para>
+            URL="&url.top.level;/java/index.html">
+            &url.home.page;/java/</ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -4939,8 +4939,8 @@
         <answer>
           <para>If you are running a FreeBSD version that lags
             significantly behind -CURRENT or -STABLE, you may need a ports
-            upgrade kit from <ulink URL="http://www.FreeBSD.org/ports/">
-            http://www.FreeBSD.org/ports/</ulink>. If you are up to date,
+            upgrade kit from <ulink URL="&url.top.level;/ports/index.html">
+            &url.home.page;/ports/</ulink>. If you are up to date,
             then someone might have committed a change to the port which
             works for -CURRENT but which broke the port for -STABLE. Please
             submit a bug report on this with the
@@ -5046,7 +5046,7 @@
 
         <answer>
           <para>Not at all! Check out the <ulink
-            URL="../handbook/kernelconfig.html">
+            URL="&url.top.books;/handbook/kernelconfig.html">
             kernel config section of the Handbook</ulink>.</para>
 
             <note>
@@ -5284,7 +5284,7 @@
 
         <answer>
           <para>See the Disk Formatting Tutorial at <ulink
-            URL="../../articles/formatting-media/">
+            URL="&url.top.articles;/formatting-media/index.html">
             www.FreeBSD.org</ulink>.</para>
         </answer>
       </qandaentry>
@@ -5518,8 +5518,8 @@
               <listitem>
                 <para>A read-only NTFS driver exists for FreeBSD. For more
                   information, see this tutorial by Mark Ovens at <ulink
-                  URL="http://ukug.uk.freebsd.org/~mark/ntfs_install.html">
-                  http://ukug.uk.freebsd.org/~mark/ntfs_install.html</ulink>.
+                  URL="http://ukug.uk.FreeBSD.org/~mark/ntfs_install.html">
+                  http://ukug.uk.FreeBSD.org/~mark/ntfs_install.html</ulink>.
                   </para>
               </listitem>
             </varlistentry>
@@ -5895,7 +5895,7 @@
         <answer>
           <para>Please have a look at the Handbook entry on printing. It
             should cover most of your problem. See the <ulink
-            URL="../handbook/printing.html">
+            URL="&url.top.books;/handbook/printing.html">
             Handbook entry on printing</ulink>.</para>
 
 	  <para>Some printers require a host-based driver to do any kind of
@@ -5905,7 +5905,7 @@
 	    only hope of getting one of these to work is to check if the
 	    <filename>ports/print/pnm2ppa</filename> port supports it.
 	    From <ulink
-	    url="http://www.freebsd.org/cgi/url.cgi?ports/print/pnm2ppa/pkg-descr">its
+	    url="&url.cgi.server;/cgi/url.cgi?ports/print/pnm2ppa/pkg-descr">its
 	    package description</ulink>:</para>
 
 	  <blockquote>
@@ -6845,7 +6845,7 @@
               <para>This point and others are often discussed on the
                 mailing lists, particularly freebsd-security.  Please search
                 the archives <ulink
-                url="http://www.FreeBSD.org/search/">here</ulink> for an
+                url="&url.top.level;/search/index.html">here</ulink> for an
                 extensive discussion.  Some people are hopeful that
                 securelevel will soon go away in favor of a more
                 fine-grained mechanism, but things are still hazy in this
@@ -6922,7 +6922,7 @@
           <para>Enabling <varname>vfs.usermount</varname>, however, has
             negative security implications.  A better way to access MSDOS
             formatted media is to use the <ulink
-            URL="http://www.freebsd.org/cgi/ports.cgi?query=%5Emtools-&amp;stype=name">mtools</ulink> package in the ports collection.</para>
+            URL="&url.cgi.server;/cgi/ports.cgi?query=%5Emtools-&amp;stype=name">mtools</ulink> package in the ports collection.</para>
         </answer>
       </qandaentry>
 
@@ -6949,8 +6949,8 @@
             on both disks with &man.boot0cfg.8;, so that you can
             dual boot to the old or new system after the copying
             is done.  See the <ulink
-            url="http://www.freebsd.org/tutorials/formatting-media/index.html">
-            formatting-media tutorial</ulink> for details on this
+            url="&url.top.articles;/formatting-media/index.html">
+            formatting-media article</ulink> for details on this
             process.</para>
 
           <para>Now you have the new disk set up, and are ready
@@ -7690,7 +7690,7 @@
         </question><answer>
 
           <para>There are two schools of thought on how to start <ulink
-            URL="http://www.FreeBSD.org/cgi/man.cgi?manpath=xfree86&amp;query=xdm">
+            URL="&url.cgi.server;/cgi/man.cgi?manpath=xfree86&amp;query=xdm">
             xdm</ulink>. One school starts xdm from
             <filename>/etc/ttys</filename> (see &man.ttys.5;)
             using the supplied example, while the other simply runs xdm
@@ -8128,7 +8128,7 @@
             <para><quote>Diskless booting</quote> means that the FreeBSD
               box is booted over a network, and reads the necessary files
               from a server instead of its hard disk. For full details,
-              please read <ulink URL="../handbook/diskless.html">the
+              please read <ulink URL="&url.top.books;/handbook/diskless.html">the
               Handbook entry on diskless booting</ulink></para>
         </answer>
       </qandaentry>
@@ -8191,7 +8191,7 @@
 
           <para>More detailed information about setting this up can be
             found in the <ulink
-            URL="http://www.FreeBSD.org/tutorials/ppp/index.html">
+            URL="&url.top.books;/ppp-primer/index.html">
             Pedantic PPP Primer</ulink> by Steve Sims.</para>
 
           <para>If you are using kernel-mode ppp, or have an Ethernet
@@ -8228,7 +8228,7 @@
             with outgoing connections.</para>
 
           <para>For more information on how to use these, please see the
-            <ulink url="../handbook/ppp-and-slip.html">Handbook chapter on
+            <ulink url="&url.top.books;/handbook/ppp-and-slip.html">Handbook chapter on
             PPP and SLIP</ulink>.</para>
 
           <para>If you only have access to the Internet through a
@@ -8392,7 +8392,7 @@
             it mildly) and can sometimes cause problems with network
             intensive applications like NFS.</para>
 
-          <para>See <ulink URL="../handbook/nfs.html">
+          <para>See <ulink URL="&url.top.books;/handbook/nfs.html">
             the Handbook entry on NFS</ulink> for more information on
             this topic.</para>
         </answer>
@@ -8696,7 +8696,7 @@
             in <filename>/etc/rc.conf</filename>.</para>
 
           <para>For further information on configuring a FreeBSD firewall,
-            see the <ulink URL="../handbook/firewalls.html">
+            see the <ulink URL="&url.top.books;/handbook/firewalls.html">
             Handbook section</ulink>.</para>
         </answer>
       </qandaentry>
@@ -8808,7 +8808,7 @@
           <para>See the <link linkend="service-redirect">FAQ about
             redirecting services</link>, the &man.natd.8; manual, or one of
             the several port redirecting utilities in the <ulink
-            url="../ports/">ports collection</ulink> for a correct way to do
+            url="&url.top.level;/ports/index.html">ports collection</ulink> for a correct way to do
             this.</para>
         </answer>
       </qandaentry>
@@ -8899,7 +8899,7 @@
           <screen>&prompt.root; <userinput>sh MAKEDEV bpf0</userinput></screen>
 
           <para>Please see the <ulink
-            URL="../handbook/kernelconfig-nodes.html">
+            URL="&url.top.books;/handbook/kernelconfig-nodes.html">
             handbook's entry on device nodes</ulink> for more information
             on creating devices.</para>
         </answer>
@@ -8991,7 +8991,7 @@
           <para>You should first read the
             &man.ppp.8;
             man page and the <ulink
-            URL="../handbook/ppp-and-slip.html#USERPPP">
+            URL="&url.top.books;/handbook/ppp-and-slip.html#USERPPP">
             ppp section of the handbook</ulink>.  Enable logging with
             the command</para>
 
@@ -9016,7 +9016,7 @@
 
           <para>If your version of ppp does not understand the
             <command>set log</command> command, you should download the
-            <ulink URL="http://people.FreeBSD.org/~brian/">
+            <ulink URL="&url.people.server;/~brian/">
             latest version</ulink>. It will build on FreeBSD version
             2.1.5 and higher.</para>
         </answer>
@@ -9087,7 +9087,7 @@
 
           <para>from <filename>ppp.conf</filename>.  If this is the case,
             go back to the <ulink
-            URL="../handbook/ppp-and-slip.html#USERPPP-FINAL">
+            URL="&url.top.books;/handbook/ppp-and-slip.html#USERPPP-FINAL">
             Final system configuration</ulink> section of the
             handbook.</para>
         </answer>
@@ -9117,7 +9117,7 @@
 add 0 0 HISADDR</programlisting>
 
           <para>Refer to the <ulink
-            URL="../handbook/ppp-and-slip.html#USERPPP-DYNAMICIP">
+            URL="&url.top.books;/handbook/ppp-and-slip.html#USERPPP-DYNAMICIP">
             PPP and Dynamic IP addresses</ulink> section of the handbook
             for further details.</para>
         </answer>
@@ -11101,7 +11101,7 @@
         </question>
 
         <answer>
-          <para>See the <ulink url="../fdp-primer/translations.html">
+          <para>See the <ulink url="&url.top.books;/fdp-primer/translations.html">
             Translation FAQ</ulink> in the FreeBSD Documentation Project
             Primer.</para>
         </answer>
@@ -11142,7 +11142,7 @@
         </question>
 
         <answer>
-          <para><ulink URL="http://www.FreeBSD.org/cgi/ports.cgi?^sup">
+          <para><ulink URL="&url.cgi.server;/cgi/ports.cgi?^sup">
             SUP</ulink> stands for Software Update Protocol, and was
             developed by CMU for keeping their development trees in sync.
             We used it to keep remote sites in sync with our central
@@ -11150,7 +11150,7 @@
 
           <para>SUP is not bandwidth friendly, and has been retired.
             The current recommended method to keep your sources up to
-            date is <ulink URL="../handbook/synching.html#CVSUP">
+            date is <ulink URL="&url.top.books;/handbook/synching.html#CVSUP">
             Handbook entry on CVSup</ulink></para>
         </answer>
       </qandaentry>
@@ -11301,7 +11301,7 @@
             long argument about whether &man.sleep.1; should take
             fractional second arguments, &a.phk; posted a long
             message entitled <quote><ulink
-            url="http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=506636+517178+/usr/local/www/db/text/1999/freebsd-hackers/19991003.freebsd-hackers">A bike
+            url="&url.cgi.server;/cgi/getmsg.cgi?fetch=506636+517178+/usr/local/www/db/text/1999/freebsd-hackers/19991003.freebsd-hackers">A bike
             shed (any colour will do) on greener grass...</ulink></quote>.
             The appropriate portions of that message are quoted
             below.</para>
@@ -11484,7 +11484,7 @@
         <answer>
           <para>There are currently three active/semi-active branches
             in the FreeBSD <ulink
-            URL="http://www.FreeBSD.org/cgi/cvsweb.cgi">
+            URL="&url.cgi.server;/cgi/cvsweb.cgi">
             CVS Repository</ulink> (the RELENG_2 branch is probably
             only changed twice a year, which is why there are only three
             active branches of development):</para>
@@ -11546,7 +11546,7 @@
 
           <para>Second, you have to have the whole CVS repository at
             hand.  To get this you can use <ulink
-            URL="../handbook/synching.html#CVSUP">CVSUP</ulink> but in
+            URL="&url.top.books;/handbook/synching.html#CVSUP">CVSUP</ulink> but in
             your supfile set the release name to cvs and remove any tag or
             date fields:</para>
 
@@ -11665,7 +11665,7 @@
         <answer>
           <para>Yes, you can do this <literal>without</literal>
             downloading the whole source tree by using the <ulink
-            URL="../handbook/synching.html#CTM">CTM facility</ulink>.</para>
+            URL="&url.top.books;/handbook/synching.html#CTM">CTM facility</ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -11699,7 +11699,7 @@
 
         <answer>
           <para>Please take a look at <ulink
-            URL="../handbook/contrib.html">The Handbook entry on how to
+            URL="&url.top.articles;/contributing/index.html">The contributing to FreeBSD article on how to
             submit code</ulink>.</para>
 
           <para>And thanks for the thought!</para>
Index: en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml,v
retrieving revision 1.6
diff -u -r1.6 appendix.sgml
--- en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml	2001/10/02 05:28:55	1.6
+++ en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml	2001/10/21 05:26:01
@@ -44,7 +44,7 @@
     source for this and other documents, available in the
     <application>CVSup</application> <literal>doc</literal> collection, or
     available online starting at <ulink
-      url="http://www.FreeBSD.org/cgi/cvsweb.cgi/doc/">http://www.FreeBSD.org/cgi/cvsweb.cgi/doc/</ulink>.</para>
+      url="&url.cgi.server;/cgi/cvsweb.cgi/doc/">&url.cgi.server;/cgi/cvsweb.cgi/doc/</ulink>.</para>
 
   <para>To avoid confusion, these examples use the standard DocBook 3.1 DTD
     rather than the FreeBSD extension.  They also use the stock stylesheets
Index: en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml	2001/10/02 06:00:27	1.10
+++ en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml	2001/10/21 05:28:16
@@ -122,7 +122,7 @@
          <listitem>
            <para>This is the main FreeBSD presence on the World Wide Web,
 	    visible at <ulink
-	      url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>
+	      url="&url.top.level;/index.html">&url.home.page;/</ulink>
 	    and many mirrors around the world.  The web site is many people's
 	    first exposure to FreeBSD.</para>
 	</listitem>
@@ -190,11 +190,11 @@
 
 	<para>If you have the CVS repository locally then as a minimum you
 	  will need to checkout the <filename>doc/share</filename>, and
-	  <filename>doc/en_US.ISO8859-1/share</filename>
+	  <filename>&url.doc.enUS;/share</filename>
 	  directories.</para>
 
 	<screen>&prompt.user; <userinput>cvs checkout doc/share</userinput>
-&prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/share</userinput></screen>
+&prompt.user; <userinput>cvs checkout &url.doc.enUS;/share</userinput></screen>
 
 	<para>If you have plenty of disk space then you could check out
 	  everything.</para>
@@ -217,7 +217,7 @@
 	    <para>Check out the <filename>articles</filename>
 	      directory.</para>
 
-	    <screen>&prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/articles</userinput></screen>
+	    <screen>&prompt.user; <userinput>cvs checkout &url.doc.enUS;/articles</userinput></screen>
 	  </step>
 
 	  <step>
@@ -225,16 +225,16 @@
 	      case, you have decided that your new article belongs in a
 	      directory called <filename>vpn-w2k</filename>.</para>
 
-	    <screen>&prompt.user; <userinput>cd doc/en_US.ISO8859-1/articles</userinput>
+	    <screen>&prompt.user; <userinput>cd &url.doc.enUS;/articles</userinput>
 &prompt.user; <userinput>cp -r committers-guide vpn-w2k</userinput></screen>
 	  </step>
 	</procedure>
 
 	<para>If you wanted to edit an existing document, such as the the FAQ,
-	  which is in <filename>doc/en_US.ISO8859-1/books/faq</filename> you
+	  which is in <filename>&url.doc.enUS;/books/faq</filename> you
 	  would check it out of the repository like this.</para>
 
-	<screen>&prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/books/faq</userinput></screen>
+	<screen>&prompt.user; <userinput>cvs checkout &url.doc.enUS;/books/faq</userinput></screen>
       </step>
 
       <step>
Index: en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v
retrieving revision 1.7
diff -u -r1.7 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml	2001/10/02 05:24:37	1.7
+++ en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml	2001/10/18 08:31:57
@@ -43,12 +43,12 @@
 
     <itemizedlist>
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/docproj/">The FreeBSD
+	<para><ulink url="&url.top.level;/docproj/index.html">The FreeBSD
 	    Documentation Project web pages</ulink></para>
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.FreeBSD.org/handbook/">The FreeBSD Handbook</ulink></para>
+	<para><ulink url="&url.top.books;/handbook/index.html">The FreeBSD Handbook</ulink></para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -102,7 +102,7 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://docbook.sourceforge.net">The DocBook Open
+	<para><ulink url="http://docbook.sourceforge.net/">The DocBook Open
 	    Repository</ulink> contains DSSSL stylesheets and other resources
 	  for people using DocBook.</para>
       </listitem>
Index: en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v
retrieving revision 1.32
diff -u -r1.32 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml	2001/10/10 11:47:13	1.32
+++ en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml	2001/10/22 22:00:53
@@ -333,7 +333,7 @@
   There's a new copy of my primer for contributers to the FreeBSD
   Documentation Project available at
 
-    <URL:http://people.FreeBSD.org/~nik/primer/index.html>
+    <URL:&url.people.server;/~nik/primer/index.html>
 
   Comments appreciated.
 
@@ -595,7 +595,7 @@
 	  <para>Use:</para>
 
 	  <programlisting><![ CDATA [<p>More information is available at the
-  <a href="http://www.FreeBSD.org/">FreeBSD web site</a>.</p>]]></programlisting>
+  <a href="&url.home.page;/">FreeBSD web site</a>.</p>]]></programlisting>
 	</example>
 
 	<para>These links will take the user to the top of the chosen
@@ -705,7 +705,7 @@
 
       <para>The FreeBSD extensions are not (currently) in the ports
 	collection.  They are stored in the FreeBSD CVS tree, as <ulink
-	url="http://www.freebsd.org/cgi/cvsweb.cgi/doc/share/sgml/freebsd.dtd">doc/share/sgml/freebsd.dtd</ulink>.</para>
+	url="&url.cgi.server;/cgi/cvsweb.cgi/doc/share/sgml/freebsd.dtd">doc/share/sgml/freebsd.dtd</ulink>.</para>
     </sect2>
 
     <sect2>
@@ -751,11 +751,11 @@
 	best suited to information that can be broken up into several
 	chapters, possibly with appendices and similar content as well.</para>
 
-      <para>The <ulink url="http://www.FreeBSD.org/tutorials/">FreeBSD
+      <para>The <ulink url="&url.top.level;/docs.html">FreeBSD
 	  tutorials</ulink> are all marked up as articles, while this
-	document, the <ulink url="http://www.FreeBSD.org/FAQ/">FreeBSD
+	document, the <ulink url="&url.top.books;/faq/index.html">FreeBSD
 	  FAQ</ulink>, and the <ulink
-	  url="http://www.FreeBSD.org/handbook/">FreeBSD Handbook</ulink> are
+	  url="&url.top.books;/handbook/index.html">FreeBSD Handbook</ulink> are
 	all marked up as books.</para>
 
       <sect3>
@@ -2184,7 +2184,7 @@
 	  by hand.</para>
 
 	<para>The best example of what follows in practice is the
-	  <filename>en_US.ISO8859-1/articles/vm-design/</filename> document.
+	  <filename>&url.doc.enUS;/articles/vm-design/</filename> document.
 	  If you're unsure of the description that follows, take a look at the
 	  files in that directory to see how everything hangs togther.
 	  Experiment with creating different formatted versions of the
@@ -2572,13 +2572,13 @@
 	  <para>Use:</para>
 
 	  <programlisting><![ CDATA [<para>Of course, you could stop reading this document and
-  go to the <ulink url="http://www.FreeBSD.org/">FreeBSD
+  go to the <ulink url="&url.top.level;/index.html">FreeBSD
   home page</ulink> instead.</para>]]></programlisting>
 
 	  <para>Appearance:</para>
 
 	  <para>Of course, you could stop reading this document and go to the
-	    <ulink url="http://www.FreeBSD.org/">FreeBSD home page</ulink>
+	    <ulink url="&url.top.level;/index.html">FreeBSD home page</ulink>
 	    instead.</para>
 	</example>
       </sect3>
Index: en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v
retrieving revision 1.6
diff -u -r1.6 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml	2001/10/02 05:28:57	1.6
+++ en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml	2001/10/18 08:31:57
@@ -53,8 +53,8 @@
     <para>Setup a CVS repository. You need the directories www, doc and
       ports in the CVS tree (plus the CVSROOT of course).  Please read the
       CVSup introduction <ulink
-	url="http://www.freebsd.org/handbook/synching.html#CVSUP">
-	http://www.freebsd.org/handbook/synching.html#CVSUP</ulink> how to
+	url="&url.top.books;/handbook/synching.html#CVSUP">
+	http://www.FreeBSD.org/handbook/synching.html#CVSUP</ulink> how to
       mirror a CVS tree or parts of a CVS tree.</para>
     
     <para>The essential cvsup collections are: <literal>www</literal>,
Index: en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v
retrieving revision 1.11
diff -u -r1.11 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml	2001/10/10 11:47:19	1.11
+++ en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml	2001/10/18 08:31:57
@@ -171,7 +171,7 @@
 
       <answer>
 	<para>The <ulink
-	    url="http://www.FreeBSD.org/docproj/translations.html">Documentation
+	    url="&url.top.level;/docproj/translations.html">Documentation
 	    Project translations page</ulink> lists the translation efforts
 	  that are currently known about. If others are already working
 	  on translating documentation to your language, please don't
Index: en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v
retrieving revision 1.21
diff -u -r1.21 chapter.sgml
--- en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml	2001/10/10 11:47:22	1.21
+++ en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml	2001/10/18 08:31:57
@@ -142,7 +142,7 @@
   </variablelist>
 
   <para>For more information about writing style, see <ulink
-      url="http://www.bartleby.com/141/index.html">Elements of
+      url="http://www.bartleby.com/141/">Elements of
       Style</ulink>, by William Strunk.</para>
 
   <sect1>
Index: en_US.ISO8859-1/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- en_US.ISO8859-1/books/handbook/Makefile	2001/09/18 03:59:36	1.50
+++ en_US.ISO8859-1/books/handbook/Makefile	2001/10/12 22:52:57
@@ -96,6 +96,13 @@
 IMAGES+= install/disk-layout.eps
 IMAGES+= install/edit-inetd-conf.scr
 
+# Images from the cross-document image library
+IMAGES_LIB=  callouts/1.png
+IMAGES_LIB+= callouts/2.png
+IMAGES_LIB+= callouts/3.png
+IMAGES_LIB+= callouts/4.png
+IMAGES_LIB+= callouts/5.png
+
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
@@ -143,11 +150,13 @@
 # limits in pdftex.  Until we split the Handbook up, build the PDF 
 # version using ps2pdf instead of pdftex.
 
+PS2PDF?=	${PREFIX}/bin/ps2pdf
+
 book.tex-pdf:
-	touch book.tex-pdf
+	${TOUCH} book.tex-pdf
 
 book.pdf: book.ps
-	ps2pdf book.ps book.pdf
+	${PS2PDF} book.ps book.pdf
 
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
Index: en_US.ISO8859-1/books/handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/book.sgml,v
retrieving revision 1.117
diff -u -r1.117 book.sgml
--- en_US.ISO8859-1/books/handbook/book.sgml	2001/10/04 09:40:29	1.117
+++ en_US.ISO8859-1/books/handbook/book.sgml	2001/10/22 22:01:49
@@ -81,17 +81,17 @@
 	that do exist need to be updated.  If you are interested in helping
 	with this project, send email to the &a.doc;.  The latest version of
 	this document is always available from the <ulink
-	  URL="http://www.FreeBSD.org/">FreeBSD web site</ulink>.
+	  url="&url.top.level;/index.html">FreeBSD web site</ulink>.
 	It may also be downloaded in a variety of formats and compression
 	options from the <ulink 
-          url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
+          url="&url.ftp.server;/pub/FreeBSD/doc/">FreeBSD FTP 
           server</ulink> or one of the numerous <link
 	  linkend="mirrors-ftp">mirror sites</link>.  If you would prefer
 	  to have a hard copy of the handbook, you can purchase one at the
 	  <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.  You
 	  may also want to <ulink
-	  URL="http://www.FreeBSD.org/search.html">search the
+	  url="&url.top.level;/search/index.html">search the
 	  handbook</ulink>.</para>
     </abstract>
   </bookinfo>
Index: en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v
retrieving revision 1.108
diff -u -r1.108 chapter.sgml
--- en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml	2001/10/17 20:16:03	1.108
+++ en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml	2001/10/22 22:00:58
@@ -1680,13 +1680,13 @@
 	  url="http://www.freebsd-support.de/i4b/">homepage of
 	  isdn4bsd</ulink> which also has pointers to hints, erratas and
 	much more documentation such as the <ulink
-	  url="http://people.freebsd.org/~hm/">isdn4bsd
+	  url="&url.people.server;/~hm/">isdn4bsd
 	  handbook</ulink>.</para>
 
       <para>In case you are interested in adding support for a
 	different ISDN protocol, a currently unsupported ISDN PC card or
 	otherwise enhancing <application>isdn4bsd</application>, please
-	get in touch with <email>hm@freebsd.org</email>.</para>
+	get in touch with <email>hm@FreeBSD.org</email>.</para>
 
       <para>For questions regarding the installation, configuration
 	and troubleshooting <application>isdn4bsd</application>, a
@@ -1749,7 +1749,7 @@
 	serial card in your computer.</para>
 	  
       <para>You should read the <ulink
-	url="http://www.FreeBSD.org/tutorials">FreeBSD Serial
+	url="&url.top.articles;/serial-uart/index.html">FreeBSD Serial
 	Hardware</ulink> tutorial for a detailed understanding of
 	serial devices, and the differences between asynchronous and
 	synchronous serial ports.</para>
@@ -1772,7 +1772,7 @@
       <para>The choice of sync/TA v.s. stand-alone router is largely a
 	religious issue.  There has been some discussion of this in
 	the mailing lists.  I suggest you search the <ulink
-	url="http://www.FreeBSD.org/search.html">archives</ulink> for
+	url="&url.top.level;/search/index.html">archives</ulink> for
 	the complete discussion.</para>
     </sect2>
     
@@ -3481,7 +3481,7 @@
 
       <para>
         Currently, BIND is maintained by the <ulink 
-        url="http://www.isc.org">
+        url="http://www.isc.org/">
         Internet Software Consortium (www.isc.org)</ulink>
       </para>
     </sect2>
@@ -4275,8 +4275,8 @@
 
       <para>
         It is a good idea to subscribe to <ulink 
-        url="http://www.cert.org">CERT</ulink> and
-        <ulink url="http://www.FreeBSD.org/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</ulink>
+        url="http://www.cert.org/">CERT</ulink> and
+        <ulink url="&url.top.books;/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce</ulink>
         to stay up to date with the current Internet and FreeBSD security 
         issues.
       </para>
Index: en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v
retrieving revision 1.34
diff -u -r1.34 chapter.sgml
--- en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml	2001/09/25 00:08:24	1.34
+++ en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml	2001/10/22 22:01:52
@@ -22,7 +22,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="http://jdli.tw.freebsd.org/publication/book/freebsd2/index.htm">Using FreeBSD</ulink> (in Chinese).</para>
+	    url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">Using FreeBSD</ulink> (in Chinese).</para>
       </listitem>
       
       <listitem>
@@ -82,7 +82,7 @@
       </listitem>
 
       <listitem>
-	<para><ulink url="http://www.freebsd-corp-net-guide.com">The
+	<para><ulink url="http://www.freebsd-corp-net-guide.com/">The
 	  FreeBSD Corporate Networker's Guide</ulink>, published by
 	  <ulink url="http://www.awl.com/aw/">Addison-Wesley</ulink>.</para>
       </listitem>
@@ -444,7 +444,7 @@
       
       <listitem>
 	<para><emphasis>The BSD family tree</emphasis>.  1997.  <ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree</ulink> or <ulink url="file:/usr/share/misc/bsd-family-tree">local</ulink> on a FreeBSD-current machine.</para>
+	    url="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree">&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree</ulink> or <ulink url="file:/usr/share/misc/bsd-family-tree">local</ulink> on a FreeBSD-current machine.</para>
       </listitem>
       
       <listitem>
Index: en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml,v
retrieving revision 1.468
diff -u -r1.468 chapter.sgml
--- en_US.ISO8859-1/books/handbook/contrib/chapter.sgml	2001/08/11 20:15:56	1.468
+++ en_US.ISO8859-1/books/handbook/contrib/chapter.sgml	2001/10/22 22:01:55
@@ -154,7 +154,7 @@
 
       <indexterm><primary>problem reports database</primary></indexterm>
       <para>The <ulink
-	  url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">FreeBSD PR
+	  url="&url.cgi.server;/cgi/query-pr-summary.cgi">FreeBSD PR
 	  list</ulink> shows all the current active problem reports and
 	requests for enhancement that have been submitted by FreeBSD users.
 	Look through the open PRs, and see if anything there takes your
@@ -189,7 +189,7 @@
 	  
       <para>If you find a bug or are submitting a specific change, please
 	report it using the &man.send-pr.1; program or its <ulink
-	  url="http://www.FreeBSD.org/send-pr.html">WEB-based
+	  url="&url.top.level;/send-pr.html">WEB-based
 	  equivalent</ulink>.  Try to fill-in each field of the bug report.
 	Unless they exceed 65KB, include any patches directly in the report.
 	If the patch is suitable to be applied to the source tree put
@@ -198,7 +198,7 @@
 	because cut-and-paste turns tabs into spaces and makes them unusable.
 	Consider compressing patches and using &man.uuencode.1; if they exceed
 	20KB.  Upload very large submissions to <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming/">ftp.FreeBSD.org:/pub/FreeBSD/incoming/</ulink>.</para>
+	  url="&url.ftp.server;/pub/FreeBSD/incoming/">&url.ftp.server;/pub/FreeBSD/incoming/</ulink>.</para>
 	  
       <para>After filing a report, you should receive confirmation along with
 	a tracking number.  Keep this tracking number so that you can update
@@ -414,7 +414,7 @@
 
 	<para>More information about the FreeBSD Foundation can be
 	  found in <ulink
-	  url="http://people.freebsd.org/~jdp/foundation/announcement.html">The
+	  url="&url.people.server;/~jdp/foundation/announcement.html">The
 	  FreeBSD Foundation -- an Introduction</ulink>.  To contact
 	  the Foundation by email, write to
 	  <email>bod@FreeBSDFoundation.org</email>.</para>
Index: en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.93
diff -u -r1.93 chapter.sgml
--- en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	2001/10/10 00:58:03	1.93
+++ en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	2001/10/22 22:01:58
@@ -227,7 +227,7 @@
 	      <listitem>
 		<para>Use the <link linkend="cvsup">cvsup</link> program
 		  with <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile">this
+		  url="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile">this
 		  supfile</ulink>.  This is the second most recommended
 		  method, since it allows  you to grab the entire
 		  collection once and then only what has changed from then
@@ -236,7 +236,7 @@
 		  sources up-to-date automatically.  For a fairly easy
 		  interface to this, simply type:</para>
 
-		<blockquote><screen>&prompt.root; <userinput>pkg_add -f ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></screen></blockquote>
+		<blockquote><screen>&prompt.root; <userinput>pkg_add -f &url.ftp.server;/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></screen></blockquote>
 	      </listitem>
               <indexterm>
 	        <primary>-CURRENT</primary>
@@ -247,7 +247,7 @@
 		<para>Use <command>ftp</command>.  The source tree for
 		  &os.current; is always <quote>exported</quote> on:
 		  <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/</ulink>.
+		  url="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/">&url.ftp.server;/pub/FreeBSD/FreeBSD-current/</ulink>.
 		  Our FTP server also allows
 		  compressed/tarred grabbing of whole trees.  e.g. you
 		  see:</para>
@@ -345,7 +345,7 @@
   	    support them for many years.  For a complete description
   	    of the current security policy for old releases of
   	    FreeBSD, please see <ulink
-  	    url="http://www.FreeBSD.org">http://www.FreeBSD.org/security</ulink></para>
+  	    url="&url.top.level;/security/index.html">&url.home.page;/security/</ulink></para>
 	  </footnote>
 	  , and tracking an entire development branch just
 	  for security reasons is likely to bring in a lot of unwanted
@@ -440,7 +440,7 @@
 	      <listitem>
 		<para>Use the <link linkend="cvsup">cvsup</link> program
 		  with <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile">this
+		  url="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile">this
 		  supfile</ulink>.  This is the second most recommended
 		  method, since it allows  you to grab the entire
 		  collection once and then only what has changed from then
@@ -449,7 +449,7 @@
 		  sources up-to-date automatically.  For a fairly easy
 		  interface to this, simply type:</para>
 	      
-		<blockquote><screen>&prompt.root; <userinput>pkg_add -f ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></screen></blockquote>
+		<blockquote><screen>&prompt.root; <userinput>pkg_add -f &url.ftp.server;/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></screen></blockquote>
 	      </listitem>
 
 	      <indexterm>
@@ -460,7 +460,7 @@
 		<para>Use <command>ftp</command>.  The source tree for
 		  &os.stable; is always <quote>exported</quote> on:
 		  <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/</ulink></para>
+		  url="&url.ftp.server;/pub/FreeBSD/FreeBSD-stable/">&url.ftp.server;/pub/FreeBSD/FreeBSD-stable/</ulink></para>
 
 		<para>Our FTP server also allows
 		  compressed/tarred grabbing of whole trees.  e.g. you
Index: en_US.ISO8859-1/books/handbook/disks/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v
retrieving revision 1.66
diff -u -r1.66 chapter.sgml
--- en_US.ISO8859-1/books/handbook/disks/chapter.sgml	2001/10/13 00:21:23	1.66
+++ en_US.ISO8859-1/books/handbook/disks/chapter.sgml	2001/10/18 08:31:57
@@ -998,7 +998,7 @@
       
 	  <para>The next consideration was how to attach them as part of
 	    the filesystem.  I did a little research on <ulink
-	      url="http://www.vinumvm.org">&man.vinum.8;</ulink> and FreeBSD's
+	      url="http://www.vinumvm.org/">&man.vinum.8;</ulink> and FreeBSD's
 	      &man.ccd.4;.  In this particular configuration, &man.ccd.4;
 	    appeared to be a better choice mainly because it has fewer
 	    parts.  Less parts tends to indicate less chance of breakage.
Index: en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v
retrieving revision 1.72
diff -u -r1.72 chapter.sgml
--- en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	2001/10/17 06:49:05	1.72
+++ en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	2001/10/21 05:28:42
@@ -41,7 +41,7 @@
       the project.</para>
 
     <para>Archives are kept for all of the mailing lists and can be searched
-      using the <ulink url="http://www.FreeBSD.org/search.html">FreeBSD World
+      using the <ulink url="&url.top.level;/search/index.html">FreeBSD World
 	Wide Web server</ulink>.  The keyword searchable archive offers an
       excellent way of finding answers to frequently asked questions and
       should be consulted before posting a question.</para>
@@ -392,7 +392,7 @@
 
 	    <row>
 	      <entry>freebsd-www</entry>
-	      <entry>Maintainers of <ulink url="http://www.FreeBSD.org">www.freebsd.org</ulink></entry>
+	      <entry>Maintainers of <ulink url="&url.top.level;/index.html">www.FreeBSD.org</ulink></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -692,7 +692,7 @@
 	      touch a part of the system where a bug may adversely affect
 	      the integrity of the system.</para>
 
-<!-- I can't actually find a charter for this, but there's this email: http://www.freebsd.org/cgi/getmsg.cgi?fetch=223347+225804+/usr/local/www/db/text/2000/cvs-all/20001210.cvs-all -->
+<!-- I can't actually find a charter for this, but there's this email: &url.cgi.server;/cgi/getmsg.cgi?fetch=223347+225804+/usr/local/www/db/text/2000/cvs-all/20001210.cvs-all -->
 	  </listitem>
 	</varlistentry>
 
@@ -721,7 +721,7 @@
 	      Whenever possible, bugs should be submitted using the
 		&man.send-pr.1;
 	      command or the <ulink
-		url="http://www.FreeBSD.org/send-pr.html">WEB
+		url="&url.top.level;/send-pr.html">WEB
 		interface</ulink> to it.</para>
 	  </listitem>
 	</varlistentry>
@@ -1259,7 +1259,7 @@
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>
+	    url="&url.top.level;/index.html">&url.home.page;/</ulink>
 	  &mdash; Central Server.</para>
       </listitem>
       
Index: en_US.ISO8859-1/books/handbook/install/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v
retrieving revision 1.128
diff -u -r1.128 chapter.sgml
--- en_US.ISO8859-1/books/handbook/install/chapter.sgml	2001/10/18 20:48:57	1.128
+++ en_US.ISO8859-1/books/handbook/install/chapter.sgml	2001/10/22 22:02:01
@@ -451,10 +451,10 @@
       <para>Information about all the releases, including the errata for each
 	release, can be found on the 
 	<ulink
-	url="http://www.FreeBSD.org/releases/index.html">release
+	url="&url.top.level;/releases/index.html">release
 	information</ulink> section of the 
 	<ulink
-	  url="http://www.FreeBSD.org/">FreeBSD web site</ulink>.</para>
+	  url="&url.top.level;/index.html">FreeBSD web site</ulink>.</para>
     </sect2>
 
     <sect2 id="install-floppies">
@@ -497,7 +497,7 @@
 	  <para>The boot discs are available on your installation media
 	    in the floppies directory, and
 	    can also be downloaded from the <ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/">
+	    url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/">
 	      floppies directory</ulink>.</para>
 
 	  <para>The floppy images have a <filename>.flp</filename> extension.
@@ -564,7 +564,7 @@
 	    Adjust the command line as necessary, depending on where you have
 	    placed the <filename>.flp</filename> files.  If you do not have
 	    the CDROM, then <command>fdimage</command> can be downloaded from
-	    the <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename>tools</filename> directory</ulink> on the FreeBSD FTP site.</para>
+	    the <ulink url="&url.ftp.server;/pub/FreeBSD/tools/"><filename>tools</filename> directory</ulink> on the FreeBSD FTP site.</para>
 	  
 	  <para>If you are writing the floppies on a Unix system (such as
 	    another FreeBSD system) you can use the &man.dd.1; command to
@@ -694,7 +694,7 @@
 BIOS drive C: is disk3
 BIOS 639kB/64512kB available memory
 FreeBSD/i386 bootstrap loader, Revision 0.8
-(jkh@bento.freebsd.org, Mon Nov 20 11:41:23 GMT 2000)
+(jkh@bento.FreeBSD.org, Mon Nov 20 11:41:23 GMT 2000)
 |
 Hit [Enter] to boot immediately, or any other key for command prompt.
 Booting [kernel] in 9 seconds... _</screen>
@@ -2559,7 +2559,7 @@
 
  For more information on the ports collection & the latest ports,
  visit: 
-     http://www.freebsd.org/ports  
+     http://www.FreeBSD.org/ports  
 
                               [ Yes ]     No</screen>
 
@@ -2784,7 +2784,7 @@
 
       <para>For detailed information on Local Area Networks and
 	configuring FreeBSD as a gateway/router refer to the tutorial
-	<ulink url="http://www.FreeBSD.org/tutorials/ppp/index.html">
+	<ulink url="&url.top.books;/ppp-primer/index.html">
 	PPP- Pendantic PPP Primer</ulink>.</para>
 
       <screen>                      User Confirmation Requested 
@@ -3199,7 +3199,7 @@
 
       <para>More information about security profiles can be found in the
 	<ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/install.html#SECURITY-PROFILES">
+	url="&url.top.books;/faq/install.html#SECURITY-PROFILES">
 	  FreeBSD FAQ</ulink>.</para>
 
       <screen>                       User Confirmation Requested
@@ -4698,10 +4698,10 @@
             read input from a local keyboard.  Enough of that now,
             let's get back to getting these disk images.</para>
 
-	  <para>You will need to get <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/kern.flp">kern.flp</ulink> and
-            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/mfsroot.flp">
+	  <para>You will need to get <ulink url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/kern.flp">kern.flp</ulink> and
+            <ulink url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/mfsroot.flp">
             mfsroot.flp</ulink> from the
-            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/">
+            <ulink url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/">
             floppies directory</ulink>.</para>
 
         </step>
@@ -4738,7 +4738,7 @@
 	    placed the <filename>.flp</filename> files.  If you do not
 	    have the CDROM then <command>fdimage</command> can be
 	    downloaded from the <ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename>tools</filename>
+	    url="&url.ftp.server;/pub/FreeBSD/tools/"><filename>tools</filename>
 	    directory</ulink> on the FreeBSD FTP site.</para>
 
 	  <para>If you are writing the floppies on a Unix system (such
@@ -5031,11 +5031,11 @@
 	
 	<para>If you do not have a CDROM drive, you can download the
 	distribution from <ulink
-	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">
+	url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">
 	ftp.FreeBSD.org</ulink>. Each distribution is in its own directory; 
 	for example, the <emphasis>bin</emphasis> distribution can be 
 	found in the <ulink
-	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/bin">&rel.current;/bin</ulink> directory.</para>
+	url="&url.ftp.server;/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/bin/">&rel.current;/bin/</ulink> directory.</para>
     
 	<para>For as many distributions you wish to install from an MS-DOS
 	  partition (and you have the free space for), install each one
@@ -5122,7 +5122,7 @@
 	  specific to your modem, as the PPP dialer provides only a very
 	  simple terminal emulator. Please refer
 	  to the user-ppp <link linkend="userppp">handbook</link> and <ulink
-	  url="../FAQ/ppp.html">FAQ</ulink> entries for further
+	  url="&url.top.books;/faq/ppp.html">FAQ</ulink> entries for further
 	  information.  If you have problems, logging can be directed to
 	  the screen using the command <command>set log local
 	  ...</command>.</para>
Index: en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v
retrieving revision 1.62
diff -u -r1.62 chapter.sgml
--- en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	2001/10/14 00:19:32	1.62
+++ en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	2001/10/21 05:28:47
@@ -58,8 +58,8 @@
       read about <link linkend="history">the history of FreeBSD</link>,
       or the <link linkend="relnotes">current release</link>.  If you
       are interested in contributing something to the Project (code,
-      hardware, unmarked bills), see the <ulink url="
-	http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributing/article.html">Contributing to FreeBSD</ulink> article.</para>
+      hardware, unmarked bills), see the <ulink
+	url="&url.top.articles;/contributing/index.html">Contributing to FreeBSD</ulink> article.</para>
 
     <sect2>
       <title>What Can FreeBSD Do?</title>
@@ -587,7 +587,7 @@
       <para>Long-term development projects continue to take place in the
 	5.0-CURRENT (trunk) branch, and SNAPshot releases of 5.0 on
 	CDROM (and, of course, on the net) are continually made available
-	from <ulink url="ftp://current.freebsd.org/pub/FreeBSD/snapshots">
+	from <ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">
 	the snapshot server</ulink> as work progresses.</para>
     </sect2>
       
@@ -658,7 +658,7 @@
 	process, FreeBSD being literally built from the contributions
 	of hundreds of people around the world, as can be seen from
 	our our <ulink
-	url="../../articles/contributors/article.html">list of
+	url="&url.top.articles;/contributors/article.html">list of
 	contributors</ulink>.  We are constantly on the lookout for
 	new developers and ideas, and those interested in becoming
 	more closely involved with the project need simply contact us
@@ -685,10 +685,10 @@
 	  </indexterm>
 	  <listitem>
 	    <para>The central source tree for FreeBSD is maintained by
-	      <ulink url="http://www.cyclic.com/CVS/index_html">CVS</ulink>
+	      <ulink url="http://www.cvshome.org/">CVS</ulink>
 	      (Concurrent Versions System), a freely available source code
 	      control tool that comes bundled with FreeBSD.  The primary
-	      <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS
+	      <ulink url="&url.cgi.server;/cgi/cvsweb.cgi">CVS
 	      repository</ulink> resides on a machine in Santa Clara CA, USA
 	      from where it is replicated to numerous mirror machines
 	      throughout the world.  The CVS tree, as well as the <link
@@ -743,7 +743,7 @@
 	      ensuring that some large portion of the system works as
 	      advertised.  For a complete list of FreeBSD developers
 	      and their areas of responsibility, please see the <ulink
-	      url="../../articles/contributors/article.html">Contributors
+	      url="&url.top.articles;/contributors/article.html">Contributors
 	      List</ulink></para>
 
 	    <note>
@@ -774,7 +774,7 @@
 	      such things are discussed.</para>
 	  
 	    <para><citetitle><ulink
-	      url="../../article/contributors/article.html">The
+	      url="&url.top.articles;/contributors/article.html">The
 	      FreeBSD Contributors List</ulink></citetitle> is a long
 	      and growing one, so why not join it by contributing
 	      something back to FreeBSD today?</para>
@@ -782,7 +782,7 @@
 	    <para>Providing code is not the only way of contributing to
 	      the project; for a more complete list of things that need
 	      doing, please refer to the <ulink
-	      url="http://www.FreeBSD.org">FreeBSD Project web
+	      url="&url.top.level;/index.html">FreeBSD Project web
 	      site</ulink>.</para>
 	  </listitem>
 	</varlistentry>
@@ -888,7 +888,7 @@
     
       <para>You can also view the master (and most frequently updated)
         copies at <ulink
-	url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>.</para>
+	url="&url.top.level;/index.html">&url.home.page;/</ulink>.</para>
     </sect2>
   </sect1>
 </chapter>
Index: en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v
retrieving revision 1.65
diff -u -r1.65 chapter.sgml
--- en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	2001/10/08 20:30:48	1.65
+++ en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	2001/10/18 08:31:58
@@ -421,7 +421,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    http://www.freebsd.org/handbook/kernelconfig-config.html
+#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
Index: en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml,v
retrieving revision 1.70
diff -u -r1.70 chapter.sgml
--- en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	2001/10/08 20:30:48	1.70
+++ en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	2001/10/18 08:31:58
@@ -166,7 +166,7 @@
 	implementation, users may be required to compile an application
 	with wide or multibyte characters support, or configure it correctly.
 	To be able to input and process wide or multibyte characters, the <ulink 
-	url="/ports/">FreeBSD Ports collection</ulink> has provided
+	url="&url.top.level;/ports/index.html">FreeBSD Ports collection</ulink> has provided
 	each language with different programs.  Refer to the I18N
 	documentation in the respective FreeBSD Port.</para>
 
@@ -889,7 +889,7 @@
       <title>Traditional Chinese Localization for Taiwan</title>
       <indexterm><primary>Traditional Chinese localization</primary></indexterm>
       <para>The FreeBSD-Taiwan Project has an I18N/L10N tutorial for
-	FreeBSD at <ulink url="http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/index.html">http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/index.html</ulink>
+	FreeBSD at <ulink url="http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/">http://freebsd.sinica.edu.tw/~ncvs/zh-l10n-tut/</ulink>
 	using many <port>chinese/*</port> applications.
 	The editor for the <literal>zh-L10N-tut</literal> is Clive Lin
 	<email>Clive@CirX.org</email>.  You can also cvsup the following
@@ -959,7 +959,7 @@
 
       <para>Some FreeBSD contributors have translated parts of FreeBSD to
 	other languages.  They are available through links on the <ulink
-	url="../">main site</ulink> or in
+	url="&url.top.level;/index.html">main site</ulink> or in
 	<filename>/usr/share/doc</filename>.</para>
     </sect2>
   </sect1>
Index: en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v
retrieving revision 1.61
diff -u -r1.61 chapter.sgml
--- en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	2001/10/18 19:50:39	1.61
+++ en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	2001/10/21 03:54:31
@@ -161,7 +161,7 @@
 
 	<para>This is by far the easiest method to use when installing the
 	  runtime libraries.  It is just like installing any other port
-	  from the <ulink url="/usr/ports/">ports collection</ulink>.
+	  from the <ulink url="file://localhost/usr/ports/">ports collection</ulink>.
 	  Simply do the following:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base</userinput>
@@ -1139,7 +1139,7 @@
       <sect3 id="install-via-ftp">
         <title>Installation via FTP</title> <para>Get the diskimages
         kern.flp and mfsroot.flp and put them on floppy disks (I got
-        mine from ftp7.de.freebsd.org. Please choose the appropriate
+        mine from ftp7.de.FreeBSD.org. Please choose the appropriate
         mirror).</para>
 
         <screen>&prompt.root; <userinput>dd if=kern.flp of=/dev/fd0</userinput> 
@@ -1309,7 +1309,7 @@
         are not out of date):</para>
 
       <itemizedlist>
-        <listitem><para>ftp7.de.freebsd.org/pub/FreeBSD/distfiles/rpm</para></listitem>
+        <listitem><para>ftp7.de.FreeBSD.org/pub/FreeBSD/distfiles/rpm</para></listitem>
         <listitem><para>ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS</para></listitem>
       </itemizedlist>
 
Index: en_US.ISO8859-1/books/handbook/mail/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v
retrieving revision 1.40
diff -u -r1.40 chapter.sgml
--- en_US.ISO8859-1/books/handbook/mail/chapter.sgml	2001/10/17 06:49:06	1.40
+++ en_US.ISO8859-1/books/handbook/mail/chapter.sgml	2001/10/21 03:54:31
@@ -174,7 +174,7 @@
       <procedure>
         <step>
 	  <para>Get a POP or IMAP daemon from the <ulink
-	    url="/ports/mail.html">ports collection</ulink> and install
+	    url="&url.top.level;/ports/mail.html">ports collection</ulink> and install
 	    it on your system.</para>
 	</step>
 
Index: en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v
retrieving revision 1.166
diff -u -r1.166 chapter.sgml
--- en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	2001/10/14 23:01:25	1.166
+++ en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	2001/10/22 22:02:04
@@ -136,7 +136,7 @@
 
       <blockquote>
 	<para><ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp://ftp.FreeBSD.org/pub/FreeBSD/</ulink>.</para>
+	    url="&url.ftp.server;/pub/FreeBSD/">&url.ftp.server;/pub/FreeBSD/</ulink>.</para>
       </blockquote></para>
 
     <para>The <ulink
@@ -1196,7 +1196,7 @@
 
 	  <listitem>
 	    <para><ulink
-		url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVSWeb</ulink> is
+		url="&url.cgi.server;/cgi/cvsweb.cgi">CVSWeb</ulink> is
 	      the FreeBSD Project web interface for CVS.</para>
 	  </listitem>
 	</itemizedlist>
@@ -1261,7 +1261,7 @@
 	  directly from:</para>
 	    
 	<para><ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/ctm/">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/ctm/</ulink></para>
+	  url="&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/usr.sbin/ctm/">&url.ftp.server;/pub/FreeBSD/FreeBSD-current/src/usr.sbin/ctm/</ulink></para>
 
 	<para>The <quote>deltas</quote> you feed
 	  <application>CTM</application> can be had two ways, FTP or
@@ -1270,7 +1270,7 @@
 	  <application>CTM</application>:</para>
 
 	<para><ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/</ulink></para>
+	  url="&url.ftp.server;/pub/FreeBSD/CTM/">&url.ftp.server;/pub/FreeBSD/CTM/</ulink></para>
 
 	<para>or see section <link
 	  linkend="mirrors-ctm">mirrors</link>.</para>
@@ -1503,7 +1503,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para><ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/</ulink></para>
+		  url="&url.ftp.server;/pub/FreeBSD/development/CTM/">&url.ftp.server;/pub/FreeBSD/development/CTM/</ulink></para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -1562,7 +1562,7 @@
     <para>If you did not find a mirror near to you or the mirror is
       incomplete, try  <ulink url="http://ftpsearch.ntnu.no/">FTP
 	search</ulink> at <ulink
-	url="http://ftpsearch.ntnu.no/ftpsearch/">http://ftpsearch.ntnu.no/ftpsearch</ulink>.
+	url="http://ftpsearch.ntnu.no/ftpsearch/">http://ftpsearch.ntnu.no/ftpsearch/</ulink>.
       FTP search is a great free archie server in Trondheim, Norway.</para>
   </sect2></sect1>
 
@@ -1625,7 +1625,7 @@
 	single package which will install it, set up the configuration
 	file and start the transfer via a pointy-clicky type of
 	interface, then get the <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz">cvsupit</ulink>
+	  url="&url.ftp.server;/pub/FreeBSD/development/CVSup/cvsupit.tgz">cvsupit</ulink>
 	package.  Just hand it to &man.pkg.add.1; and it will lead you
 	through the configuration process in a menu-oriented
 	fashion.</para>
@@ -2936,7 +2936,7 @@
 
 	    <listitem>
 	      <para>cvsup2.ca.FreeBSD.org (maintainer
-		<email>hostmaster@ca.freebsd.org</email>)</para>
+		<email>hostmaster@ca.FreeBSD.org</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -3062,7 +3062,7 @@
 
 	    <listitem>
 	      <para>cvsup5.de.FreeBSD.org (maintainer
-		<email>rse@freebsd.org</email>)</para>
+		<email>rse@FreeBSD.org</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -3388,7 +3388,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.tw.FreeBSD.org (maintainer
-		<email>jdli@freebsd.csie.nctu.edu.tw</email>)</para>
+		<email>jdli@FreeBSD.csie.nctu.edu.tw</email>)</para>
 	    </listitem>
 
 	    <listitem>
Index: en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v
retrieving revision 1.88
diff -u -r1.88 chapter.sgml
--- en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	2001/10/06 19:48:50	1.88
+++ en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	2001/10/21 05:28:58
@@ -11,7 +11,7 @@
   <para>In case you need to verify a signature or send encrypted email
     to one of the officers or developers a number of keys are provided
     here for your convenience.  A complete keyring of FreeBSD.org
-    users is available for download from <ulink url="http://www.FreeBSD.org/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
+    users is available for download from <ulink url="&url.top.level;/doc/pgpkeyring.txt">&url.home.page;/doc/pgpkeyring.txt</ulink>.</para>
   
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
Index: en_US.ISO8859-1/books/handbook/ports/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v
retrieving revision 1.145
diff -u -r1.145 chapter.sgml
--- en_US.ISO8859-1/books/handbook/ports/chapter.sgml	2001/10/16 19:15:12	1.145
+++ en_US.ISO8859-1/books/handbook/ports/chapter.sgml	2001/10/22 22:02:23
@@ -200,7 +200,7 @@
     </itemizedlist>
 
     <para>To keep track of updated ports, subscribe to the
-      <email>freebsd-ports@freebsd.org</email> mailing list.</para>
+      <email>freebsd-ports@FreeBSD.org</email> mailing list.</para>
 
     <para>The remainder of this chapter will explain how to use packages and
       ports to install and manage third party software on FreeBSD.</para>
@@ -220,7 +220,7 @@
       <listitem>
 	<para>The FreeBSD web site maintains an up-to-date searchable list of
 	  all the available applications, at
-	  <ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>.
+	  <ulink url="&url.top.level;/ports/index.html">&url.home.page;/ports/</ulink>.
 	  The name space is divided in to categories, and you may either
 	  search for an application by name (if you know it), or you can list
 	  all the applications available in a category.</para>
@@ -281,9 +281,9 @@
       <example>
         <title>Downloading a Package and then Installing It Locally</title>
 
-        <screen>&prompt.root; <userinput>ftp -a <replaceable>ftp2.freebsd.org</replaceable></userinput>
-Connected to ftp2.freebsd.org.
-220 ftp2.freebsd.org FTP server (Version 6.00LS) ready.
+        <screen>&prompt.root; <userinput>ftp -a <replaceable>ftp2.FreeBSD.org</replaceable></userinput>
+Connected to ftp2.FreeBSD.org.
+220 ftp2.FreeBSD.org FTP server (Version 6.00LS) ready.
 331 Guest login ok, send your email address as password.
 230-
 230-     This machine is in Vienna, VA, USA, hosted by Verio.
@@ -322,8 +322,8 @@
 
       <para>Package files are distributed in .tgz format.  You can
           find them at <ulink
-          url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">
-          ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/</ulink>,
+          url="&url.ftp.server;/pub/FreeBSD/ports/packages/">
+          &url.ftp.server;/pub/FreeBSD/ports/packages/</ulink>,
           or on the FreeBSD CDROM distribution.  Every CD on the
           FreeBSD 4-CD set (and PowerPak, etc) contains packages in
           the <filename>/packages</filename> directory.  The layout of
@@ -507,7 +507,7 @@
       <para>Before we get into that however, you will need to choose a
         port to install.  There are a few ways to do this, with the
 	easiest method being the <ulink
-	url="http://www.FreeBSD.org/ports/">ports listing on the FreeBSD
+	url="&url.top.level;/ports/index.html">ports listing on the FreeBSD
 	web site</ulink>.  You can browse through the ports listed there
 	or use the search function on the site.  Each port also includes
 	a description so you can read a bit about each port before
@@ -669,7 +669,7 @@
 
         <screen>&prompt.root; <userinput>make install</userinput>
 &gt;&gt; lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/.
-&gt;&gt; Attempting to fetch from ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/.
+&gt;&gt; Attempting to fetch from &url.ftp.server;/pub/FreeBSD/ports/distfiles/.
 Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 439860 bytes transferred in 18.0 seconds (23.90 kBps)
 ===&gt;  Extracting for lsof-4.57
@@ -973,7 +973,7 @@
 
 	  <screen>&prompt.root; <userinput>cd /usr/ports/<replaceable>directory</replaceable></userinput>
 &prompt.root; <userinput>make MASTER_SITE_OVERRIDE= \
-ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
+&url.ftp.server;/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 	  </answer>
 	</qandaentry>
 
@@ -1288,7 +1288,7 @@
       <orderedlist>
         <listitem>
 	  <para>Fix it!  The <ulink
-	    url="http://www.FreeBSD.org/porters-handbook/index.html">Porter's
+	    url="&url.top.books;/porters-handbook/index.html">Porter's
 	    Handbook</ulink> includes detailed information on the
 	    "Ports" infrastructure so that you can fix the occasional
 	    broken port or even submit your own!</para>
@@ -1311,7 +1311,7 @@
 	  <para>Grab the package from an ftp site near you.  The
 	    <quote>master</quote> package collection is on <hostid
 	    role="fqdn">ftp.FreeBSD.org</hostid> in the <ulink
-	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">packages
+	    URL="&url.ftp.server;/pub/FreeBSD/ports/packages/">packages
 	    directory</ulink>, but be sure to check your local mirror
 	    <emphasis>first!</emphasis>  These are more likely to work
 	    than trying to compile from source and are a lot faster as
Index: en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v
retrieving revision 1.65
diff -u -r1.65 chapter.sgml
--- en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	2001/10/17 06:49:06	1.65
+++ en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	2001/10/21 05:29:12
@@ -2346,7 +2346,7 @@
 	  system for this yet, please see the tutorial for configuring
 	  dialup services; if you have a World-Wide Web browser available,
 	  browse the list of tutorials at <ulink
-	  url="http://www.FreeBSD.org/">http://www.FreeBSD.org/</ulink>.
+	  url="&url.top.level;/index.html">&url.home.page;/</ulink>.
 	  You may also want to check the manual pages for &man.sio.4; for
 	  information on the serial port device driver and &man.ttys.5;,
 	  &man.gettytab.5;, &man.getty.8;, &amp; &man.init.8; for
Index: en_US.ISO8859-1/books/handbook/security/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
retrieving revision 1.93
diff -u -r1.93 chapter.sgml
--- en_US.ISO8859-1/books/handbook/security/chapter.sgml	2001/10/20 07:24:47	1.93
+++ en_US.ISO8859-1/books/handbook/security/chapter.sgml	2001/10/21 03:54:34
@@ -2717,7 +2717,7 @@
     layer and socket layer communication.  This section should
     explain how to use them.  For implementation details, please
     refer to <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ipv6.html">The
+    url="&url.top.books;/developers-handbook/ipv6.html">The
     Developers' Handbook</ulink>.</para>
 
     <para>The current IPsec implementation supports both transport mode
@@ -3382,7 +3382,7 @@
 
     <sect2>
       <title>Further Reading</title>
-      <para><ulink url="http://www.openssh.com">OpenSSH</ulink></para>
+      <para><ulink url="http://www.openssh.com/">OpenSSH</ulink></para>
       <para>&man.ssh.1; &man.scp.1; &man.ssh-keygen.1; 
         &man.ssh-agent.1; &man.ssh-add.1;</para>
       <para>&man.sshd.8; &man.sftp-server.8;</para>
Index: en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v
retrieving revision 1.50
diff -u -r1.50 chapter.sgml
--- en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml	2001/10/16 19:33:03	1.50
+++ en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml	2001/10/21 03:54:35
@@ -2035,7 +2035,7 @@
 		  use as the serial console.  The only use of this
 		  flag is to designate the unit for kernel remote
 		  debugging.  See <ulink
-		  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/">The
+		  url="&url.top.books;/developers-handbook/index.html">The
 		  Developer's Handbook</ulink> for more information on
 		  remote debugging.</para>
 		
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.175
diff -u -r1.175 book.sgml
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	2001/10/19 08:14:21	1.175
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	2001/10/22 22:02:24
@@ -321,7 +321,7 @@
           directory or the <filename>pkgname.tgz</filename> package, so delete
           them now.  Next, simply include the output of <command>shar `find
             port_dir`</command> in a bug report and send it with the
-            &man.send-pr.1; program (see <ulink url="../handbook/contrib-how.html#CONTRIB-GENERAL">Bug
+            &man.send-pr.1; program (see <ulink url="&url.top.articles;/contributing/contrib-how.html#CONTRIB-GENERAL">Bug
             Reports and General Commentary</ulink> for more information about
             &man.send-pr.1;.  If the uncompressed port is larger than 20KB,
           you should compress it into a tarfile and use &man.uuencode.1;
@@ -399,7 +399,7 @@
               cannot find the required files in <makevar>DISTDIR</makevar> it
               will look up the URL <makevar>MASTER_SITES</makevar>, which is
               set in the Makefile, as well as our main FTP site at <ulink
-                url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/</ulink>,
+                url="&url.ftp.server;/pub/FreeBSD/ports/distfiles/">&url.ftp.server;/pub/FreeBSD/ports/distfiles/</ulink>,
               where we put sanctioned distfiles as backup.  It will then
               attempt to fetch the named distribution file with
               <makevar>FETCH</makevar>, assuming that the requesting site has
@@ -1062,7 +1062,7 @@
           --><emphasis>:-)</emphasis></para>
 
         <para>For a detailed description of the responsibilities of maintainers,
-          refer to the <ulink url="../handbook/policies.html#POLICIES-MAINTAINER">MAINTAINER on
+          refer to the <ulink url="&url.top.books;/developers-handbook/policies.html#POLICIES-MAINTAINER">MAINTAINER on
             Makefiles</ulink> section.</para>
       </sect1>
 
@@ -1621,7 +1621,7 @@
     <chapter>
       <title>Shared library versions</title>
 
-      <para>Please read our <ulink url="../developers-handbook/policies-shlib.html">policy on
+      <para>Please read our <ulink url="&url.top.books;/developers-handbook/policies-shlib.html">policy on
         shared library versioning</ulink> to understand what to do with
         shared library versions in general.  Do not blindly assume software
         authors know what they are doing; many of them do not.  It is very
@@ -2320,7 +2320,7 @@
         port.  You can find them in the
         <filename>ports/ports-current</filename> directory of the FTP mirror
         sites.  You may also use CVSup to keep your whole ports collection
-        up-to-date, as described in <ulink url="../handbook/synching.html#CVSUP-CONFIG">the Handbook</ulink>.</para>
+        up-to-date, as described in <ulink url="&url.top.books;/handbook/synching.html#CVSUP-CONFIG">the Handbook</ulink>.</para>
 
       <para>The next step is to send a mail to the maintainer, if one is
         listed in the port's <filename>Makefile</filename>.  That person may
@@ -2356,7 +2356,7 @@
         the porting process.You should check your own port against this list,
         but you can also check ports in the PR database that others have
         submitted.  Submit any comments on ports you check as described in
-        <ulink url="../handbook/contrib-how.html#CONTRIB-GENERAL">Bug Reports and General
+        <ulink url="&url.top.articles;/contributing/contrib-how.html#CONTRIB-GENERAL">Bug Reports and General
           Commentary</ulink>.  Checking ports in the PR database will both make
         it faster for us to commit them, and prove that you know what you are
         doing.</para>
@@ -2418,7 +2418,7 @@
         <para>Do not write anything to files outside
           <makevar>WRKDIR</makevar>.  <makevar>WRKDIR</makevar> is the only
           place that is guaranteed to be writable during the port build (see
-          <ulink url="../handbook/ports-using.html#PORTS-CD">compiling ports from CDROM</ulink> for an
+          <ulink url="&url.top.books;/handbook/ports-using.html#PORTS-CD">compiling ports from CDROM</ulink> for an
           example of building ports from a read-only tree).  If you need to
           modify one of the <filename>pkg-<replaceable>*</replaceable></filename>
           files, do so by <link
@@ -4540,7 +4540,7 @@
         &a.ports;.  Important changes to the way ports work will be announced
         there.  You can always find more detailed information on the latest
         changes by looking at <ulink
-          url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk"> the
+          url="&url.cgi.server;/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk"> the
           bsd.port.mk CVS log</ulink>.</para>
     </chapter>
 
Index: en_US.ISO8859-1/books/ppp-primer/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml,v
retrieving revision 1.13
diff -u -r1.13 book.sgml
--- en_US.ISO8859-1/books/ppp-primer/book.sgml	2001/08/30 11:25:50	1.13
+++ en_US.ISO8859-1/books/ppp-primer/book.sgml	2001/10/18 08:32:00
@@ -1040,15 +1040,15 @@
 </listitem>
 
 <listitem>
-<para>The IBM Network (<ulink URL="http://www.ibm.net">http://www.ibm.net</ulink>)</para>
+<para>The IBM Network (<ulink URL="http://www.ibm.net/">http://www.ibm.net/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>AT&amp;T WorldNet (<ulink URL="http://att.com/worldnet">http://att.com/worldnet</ulink>)</para>
+<para>AT&amp;T WorldNet (<ulink URL="http://att.com/worldnet/">http://att.com/worldnet/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>Erol's (<ulink URL="http://www.erols.com">http://www.erols.com</ulink>)</para>
+<para>Erol's (<ulink URL="http://www.erols.com/">http://www.erols.com/</ulink>)</para>
 </listitem>
 
 </itemizedlist>
@@ -1415,7 +1415,7 @@
 they need to be properly configured.  Note that this section does not
 explain how to configure the Windows workstations for Dial-Up
 networking.  If you need a good explanation of that procedure, I
-recommend <ulink URL="http://www.aladdin.co.uk/techweb">http://www.aladdin.co.uk/techweb</ulink>.</para>
+recommend <ulink URL="http://www.aladdin.co.uk/techweb/">http://www.aladdin.co.uk/techweb/</ulink>.</para>
   
 
 <sect1>
@@ -1580,7 +1580,7 @@
 Configuration" and "Bindings" tabs are not necessary.</para>
   
 <para>If you wish to use the Windows Internet Naming Service ("WINS")
-your attention is invited to <ulink URL="http://www.localnet.org">http://www.localnet.org</ulink> for
+your attention is invited to <ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> for
 more information about WINS settings, specifically regarding sharing
 files transparently across the Internet.</para>
   
@@ -1778,7 +1778,7 @@
 "Routing" tabs are not used.</para>
   
 <para>If you wish to use the Windows Internet Naming Service ("WINS")
-your attention is invited to <ulink URL="http://www.localnet.org">http://www.localnet.org</ulink> for
+your attention is invited to <ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> for
 more information about WINS settings, specifically regarding sharing
 files transparently across the Internet.</para>
   
@@ -1813,7 +1813,7 @@
 requires that the Microsoft TCP/IP-32 driver diskette has been
 installed on the workstation.  The TCP/IP drivers are not included
 with the WfW CD or diskettes; if you need a copy they're available at
-<ulink URL="ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip">ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip</ulink>.</para>
+<ulink URL="ftp://ftp.microsoft.com/peropsys/windows/public/tcpip/">ftp://ftp.microsoft.com/peropsys/windows/public/tcpip/</ulink>.</para>
   
 <para>Once the TCP/IP drivers have been loaded, perform the following
 steps:</para>
Index: share/mk/doc.docbook.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.51
diff -u -r1.51 doc.docbook.mk
--- share/mk/doc.docbook.mk	2001/10/04 09:40:31	1.51
+++ share/mk/doc.docbook.mk	2001/10/22 22:20:42
@@ -127,6 +127,8 @@
 
 CSS_SHEET?=	${DOC_PREFIX}/share/misc/docbook.css
 
+TOPLEVEL?=	-1
+
 PRINTOPTS?=    -ioutput.print
 
 .if defined(BOOK_OUTPUT)
@@ -298,20 +300,20 @@
 all: ${_docs}
 
 index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${INDEX_SGML} ${HTML_SPLIT_INDEX} docbook.css
-	${JADE} -V html-manifest -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
+	${JADE} -V html-manifest -ioutput.html -iurl.top.level.${TOPLEVEL} -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
 .if !defined(NO_TIDY)
 	-tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`
 .endif
 
 ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${INDEX_SGML} ${HTML_INDEX} docbook.css
-	${JADE} -ioutput.html -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET} || (rm -f ${.TARGET} && false)
+	${JADE} -ioutput.html -iurl.top.level.${TOPLEVEL} -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET} || (rm -f ${.TARGET} && false)
 .if !defined(NO_TIDY)
 	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
 .endif
 
 # Special target to produce HTML with no images in it.
 ${DOC}.html-text: ${SRCS} ${INDEX_SGML} ${HTML_INDEX}
-	${JADE} -ioutput.html -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET} || (rm -f ${.TARGET} && false)
+	${JADE} -ioutput.html -iurl.top.level.${TOPLEVEL} -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET} || (rm -f ${.TARGET} && false)
 
 ${DOC}.html-split.tar: HTML.manifest
 	tar cf ${.TARGET} `xargs < HTML.manifest`
@@ -407,11 +409,11 @@
 .endif
 
 ${HTML_INDEX}:
-	${JADE} -V html-index -ioutput.html -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
+	${JADE} -V html-index -ioutput.html -iurl.top.level.${TOPLEVEL} -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
 	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}
 
 ${HTML_SPLIT_INDEX}:
-	${JADE} -V html-index -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
+	${JADE} -V html-index -ioutput.html -iurl.top.level.${TOPLEVEL} -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
 	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}
 
 ${PRINT_INDEX}: ${HTML_INDEX}
Index: share/sgml/freebsd.dtd
===================================================================
RCS file: /home/ncvs/doc/share/sgml/freebsd.dtd,v
retrieving revision 1.8
diff -u -r1.8 freebsd.dtd
--- share/sgml/freebsd.dtd	2001/01/06 18:26:11	1.8
+++ share/sgml/freebsd.dtd	2001/10/22 22:18:51
@@ -118,3 +118,48 @@
 <!ENTITY prompt.root		"<prompt>#</prompt>">
 <!ENTITY prompt.user		"<prompt>%</prompt>">
 
+<!-- maybe the following entities should go in freebsd.ent ?
+     in which case, it should be included w/in every book -->
+
+<!ENTITY url.www.server         "http://www.FreeBSD.org">
+<!ENTITY url.cgi.server         "&url.www.server;">
+<!ENTITY url.stat.server        "&url.www.server;">
+<!ENTITY url.docs.server        "http://docs.FreeBSD.org">
+<!ENTITY url.people.server      "http://people.FreeBSD.org">
+<!ENTITY url.ftp.server         "ftp://ftp.FreeBSD.org">
+
+<![ %output.html.images; [
+<!ENTITY % url.top.level.-1	"IGNORE">
+<!ENTITY % url.top.level.0	"IGNORE">
+<!ENTITY % url.top.level.1	"IGNORE">
+<!ENTITY % url.top.level.2	"IGNORE">
+<!ENTITY % url.top.level.3	"IGNORE">
+<!ENTITY % url.top.level.4	"IGNORE">
+<![ %url.top.level.0; [
+<!ENTITY url.top.level		".">
+]]>
+<![ %url.top.level.1; [
+<!ENTITY url.top.level		"..">
+]]>
+<![ %url.top.level.2; [
+<!ENTITY url.top.level		"../..">
+]]>
+<![ %url.top.level.3; [
+<!ENTITY url.top.level		"../../..">
+]]>
+<![ %url.top.level.4; [
+<!ENTITY url.top.level		"../../../..">
+]]>
+]]>
+
+<!ENTITY url.home.page		"&url.www.server;">
+
+<!-- not % output.html -->
+<!ENTITY url.top.level		"&url.home.page;">
+
+<!-- where to find articles and books -->
+<!ENTITY url.doc.enUS		"doc/en_US.ISO8859-1">
+<!ENTITY url.www.articles	"&url.home.page;/&url.doc.enUS;/articles">
+<!ENTITY url.www.books		"&url.home.page;/&url.doc.enUS;/books">
+<!ENTITY url.top.articles	"&url.top.level;/&url.doc.enUS;/articles">
+<!ENTITY url.top.books		"&url.top.level;/&url.doc.enUS;/books">
Index: share/sgml/freebsd41.dtd
===================================================================
RCS file: /home/ncvs/doc/share/sgml/freebsd41.dtd,v
retrieving revision 1.3
diff -u -r1.3 freebsd41.dtd
--- share/sgml/freebsd41.dtd	2001/07/24 11:07:59	1.3
+++ share/sgml/freebsd41.dtd	2001/10/22 22:18:51
@@ -135,3 +135,48 @@
 <!ENTITY prompt.root		"<prompt>#</prompt>">
 <!ENTITY prompt.user		"<prompt>%</prompt>">
 
+<!-- maybe the following entities should go in freebsd.ent ?
+     in which case, it should be included w/in every book -->
+
+<!ENTITY url.www.server         "http://www.FreeBSD.org">
+<!ENTITY url.cgi.server         "&url.www.server;">
+<!ENTITY url.stat.server        "&url.www.server;">
+<!ENTITY url.docs.server        "http://docs.FreeBSD.org">
+<!ENTITY url.people.server      "http://people.FreeBSD.org">
+<!ENTITY url.ftp.server         "ftp://ftp.FreeBSD.org">
+
+<![ %output.html.images; [
+<!ENTITY % url.top.level.-1	"IGNORE">
+<!ENTITY % url.top.level.0	"IGNORE">
+<!ENTITY % url.top.level.1	"IGNORE">
+<!ENTITY % url.top.level.2	"IGNORE">
+<!ENTITY % url.top.level.3	"IGNORE">
+<!ENTITY % url.top.level.4	"IGNORE">
+<![ %url.top.level.0; [
+<!ENTITY url.top.level		".">
+]]>
+<![ %url.top.level.1; [
+<!ENTITY url.top.level		"..">
+]]>
+<![ %url.top.level.2; [
+<!ENTITY url.top.level		"../..">
+]]>
+<![ %url.top.level.3; [
+<!ENTITY url.top.level		"../../..">
+]]>
+<![ %url.top.level.4; [
+<!ENTITY url.top.level		"../../../..">
+]]>
+]]>
+
+<!ENTITY url.home.page		"&url.www.server;">
+
+<!-- not % output.html -->
+<!ENTITY url.top.level		"&url.home.page;">
+
+<!-- where to find articles and books -->
+<!ENTITY url.doc.enUS		"doc/en_US.ISO8859-1">
+<!ENTITY url.www.articles	"&url.home.page;/&url.doc.enUS;/articles">
+<!ENTITY url.www.books		"&url.home.page;/&url.doc.enUS;/books">
+<!ENTITY url.top.articles	"&url.top.level;/&url.doc.enUS;/articles">
+<!ENTITY url.top.books		"&url.top.level;/&url.doc.enUS;/books">
Index: www/en/doc/Makefile
===================================================================
RCS file: /home/ncvs/www/en/doc/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/en/doc/Makefile	2001/08/23 08:12:26	1.7
+++ www/en/doc/Makefile	2001/10/22 22:26:12
@@ -9,15 +9,17 @@
 # requirements here.
 #
 
+TOPLEVEL?=	4
+
 all:
-	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html all)
-	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html DOCDIR=${.CURDIR} install)
-	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1/books/handbook && ${MAKE} pgpkeyring > ${.CURDIR}/pgpkeyring.txt)
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html TOPLEVEL=${TOPLEVEL} INSTALL_COMPRESSED= all)
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html TOPLEVEL=${TOPLEVEL} INSTALL_COMPRESSED= DOCDIR=${.CURDIR} install)
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1/books/handbook && ${MAKE} TOPLEVEL=${TOPLEVEL} pgpkeyring > ${.CURDIR}/pgpkeyring.txt)
 
 install clean:
-	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html DOCDIR=${DESTDIR}/data/doc ${.TARGET})
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1 && ${MAKE} FORMATS=html-split\ html TOPLEVEL=${TOPLEVEL} INSTALL_COMPRESSED= DOCDIR=${DESTDIR}/data/doc ${.TARGET})
 .if make(install)
-	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1/books/handbook && ${MAKE} pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt)	
+	(unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO8859-1/books/handbook && ${MAKE} TOPLEVEL=${TOPLEVEL} pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt)	
 .endif
 .if make(clean)
 	rm -rf en* handbook faq pgpkeyring.txt
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: murray 
State-Changed-When: Tue Oct 23 15:13:48 PDT 2001 
State-Changed-Why:  
This patch was huge and difficult to work with.  Please submit your 
changes more often so that the PRs are easy to deal with. ;) You've 
done some excellent work here. 

Would it be possible for you to generate another patch with just your 
URL entity stuff?  It looks really cool but I wanted to take care of 
everything else in your patch first.  I really like the idea of doing 
make TOPLEVEL="bla" since this would have made my job producing 
printed output easier. 

Thanks! 


http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31447 
State-Changed-From-To: analyzed->closed 
State-Changed-By: murray 
State-Changed-When: Mon Nov 5 02:36:56 PST 2001 
State-Changed-Why:  
Please post your urlbase entity stuff to the doc list for discussion. 
When we've agreed on the best semantics then you can submit another 
(smaller) PR.  Most of this PR has already been committed.  Thanks! 


http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31447 
>Unformatted:
