diff --git a/FAQ/admin.sgml b/FAQ/admin.sgml
index d5ebbdb0f7..9b8739ebd6 100644
--- a/FAQ/admin.sgml
+++ b/FAQ/admin.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: admin.sgml,v 1.7 1998-08-04 02:22:58 jkoshy Exp $ -->
+<!-- $Id: admin.sgml,v 1.8 1998-08-09 22:49:45 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -80,7 +80,7 @@
       <heading>How can I add my new hard disk to my FreeBSD system?</heading>
 
       <p>See the Disk Formatting Tutorial at 
-      <url url="http://www.freebsd.org/tutorials/diskformat" 
+      <url url="../tutorials/diskformat/" 
        name="www.freebsd.org">.
 
     <sect1>
diff --git a/FAQ/applications.sgml b/FAQ/applications.sgml
index 698d4b698f..02558147d3 100644
--- a/FAQ/applications.sgml
+++ b/FAQ/applications.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: applications.sgml,v 1.4 1998-06-27 01:13:48 hoek Exp $ -->
+<!-- $Id: applications.sgml,v 1.5 1998-08-09 22:49:45 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -7,7 +7,7 @@
     <sect1>
       <heading>So, where are all the user applications?</heading>
 
-      <p>Please take a look at <url url="http://www.FreeBSD.ORG/ports/"
+      <p>Please take a look at <url url="../ports/"
       name="the ports page"> for info on software packages ported to
       FreeBSD.  The list currently tops 1000 and is growing daily, so come
       back to check often or subscribe to the <tt/freebsd-announce/
diff --git a/en/tutorials/devel/devel.docb b/en/tutorials/devel/devel.docb
index 310401db55..be4ef4d0b8 100644
--- a/en/tutorials/devel/devel.docb
+++ b/en/tutorials/devel/devel.docb
@@ -1,4 +1,4 @@
-<!-- $Id: devel.docb,v 1.3 1997-08-17 17:33:49 jfieber Exp $ -->
+<!-- $Id: devel.docb,v 1.4 1998-08-09 22:53:51 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -1019,7 +1019,7 @@ basic commands.</para>
 
 <para>Finally, if you find its text-based command-prompt style
 off-putting, there's a graphical front-end for it <ulink
-URL="http://www.freebsd.org/ports/devel.html">xxgdb</ulink>
+URL="../../ports/devel.html">xxgdb</ulink>
 in the ports collection.</para>
 
 <para>This section is intended to be an introduction to using
@@ -1293,7 +1293,7 @@ is compiling.</para></listitem>
 </itemizedlist>And doubtless many more that I've overlooked.</para>
 
 <para>Emacs can be installed on FreeBSD using <ulink
-URL="http://www.freebsd.org/ports/editors">the Emacs
+URL="../../ports/editors.html">the Emacs
 port</ulink>.</para>
 
 <para>Once it's installed, start it up and do <userinput>C-h
diff --git a/en/tutorials/newuser/newuser.docb b/en/tutorials/newuser/newuser.docb
index 9adefd509b..c8ab990405 100644
--- a/en/tutorials/newuser/newuser.docb
+++ b/en/tutorials/newuser/newuser.docb
@@ -1,4 +1,4 @@
-<!-- $Id: newuser.docb,v 1.4 1997-08-15 17:11:49 jfieber Exp $ -->
+<!-- $Id: newuser.docb,v 1.5 1998-08-09 22:53:56 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -616,7 +616,7 @@ Then the printer should respond if it's turned on when the system is
 booted, and lp or lpr 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="http://www.freebsd.org/handbook/handbook.html">FreeBSD
+URL="../../handbook/handbook.html">FreeBSD
 handbook.</></para>
 
 </chapter>
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index 67568b5590..9c3baeb6b5 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: article.sgml,v 1.4 1997-08-15 17:11:49 jfieber Exp $ -->
+<!-- $Id: article.sgml,v 1.5 1998-08-09 22:53:56 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -616,7 +616,7 @@ Then the printer should respond if it's turned on when the system is
 booted, and lp or lpr 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="http://www.freebsd.org/handbook/handbook.html">FreeBSD
+URL="../../handbook/handbook.html">FreeBSD
 handbook.</></para>
 
 </chapter>
diff --git a/en_US.ISO8859-1/articles/programming-tools/article.sgml b/en_US.ISO8859-1/articles/programming-tools/article.sgml
index addd185ee8..65e1f87d26 100644
--- a/en_US.ISO8859-1/articles/programming-tools/article.sgml
+++ b/en_US.ISO8859-1/articles/programming-tools/article.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: article.sgml,v 1.3 1997-08-17 17:33:49 jfieber Exp $ -->
+<!-- $Id: article.sgml,v 1.4 1998-08-09 22:53:51 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -1019,7 +1019,7 @@ basic commands.</para>
 
 <para>Finally, if you find its text-based command-prompt style
 off-putting, there's a graphical front-end for it <ulink
-URL="http://www.freebsd.org/ports/devel.html">xxgdb</ulink>
+URL="../../ports/devel.html">xxgdb</ulink>
 in the ports collection.</para>
 
 <para>This section is intended to be an introduction to using
@@ -1293,7 +1293,7 @@ is compiling.</para></listitem>
 </itemizedlist>And doubtless many more that I've overlooked.</para>
 
 <para>Emacs can be installed on FreeBSD using <ulink
-URL="http://www.freebsd.org/ports/editors">the Emacs
+URL="../../ports/editors.html">the Emacs
 port</ulink>.</para>
 
 <para>Once it's installed, start it up and do <userinput>C-h
diff --git a/en_US.ISO_8859-1/articles/new-users/article.sgml b/en_US.ISO_8859-1/articles/new-users/article.sgml
index 67568b5590..9c3baeb6b5 100644
--- a/en_US.ISO_8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO_8859-1/articles/new-users/article.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: article.sgml,v 1.4 1997-08-15 17:11:49 jfieber Exp $ -->
+<!-- $Id: article.sgml,v 1.5 1998-08-09 22:53:56 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -616,7 +616,7 @@ Then the printer should respond if it's turned on when the system is
 booted, and lp or lpr 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="http://www.freebsd.org/handbook/handbook.html">FreeBSD
+URL="../../handbook/handbook.html">FreeBSD
 handbook.</></para>
 
 </chapter>
diff --git a/en_US.ISO_8859-1/articles/programming-tools/article.sgml b/en_US.ISO_8859-1/articles/programming-tools/article.sgml
index addd185ee8..65e1f87d26 100644
--- a/en_US.ISO_8859-1/articles/programming-tools/article.sgml
+++ b/en_US.ISO_8859-1/articles/programming-tools/article.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: article.sgml,v 1.3 1997-08-17 17:33:49 jfieber Exp $ -->
+<!-- $Id: article.sgml,v 1.4 1998-08-09 22:53:51 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
@@ -1019,7 +1019,7 @@ basic commands.</para>
 
 <para>Finally, if you find its text-based command-prompt style
 off-putting, there's a graphical front-end for it <ulink
-URL="http://www.freebsd.org/ports/devel.html">xxgdb</ulink>
+URL="../../ports/devel.html">xxgdb</ulink>
 in the ports collection.</para>
 
 <para>This section is intended to be an introduction to using
@@ -1293,7 +1293,7 @@ is compiling.</para></listitem>
 </itemizedlist>And doubtless many more that I've overlooked.</para>
 
 <para>Emacs can be installed on FreeBSD using <ulink
-URL="http://www.freebsd.org/ports/editors">the Emacs
+URL="../../ports/editors.html">the Emacs
 port</ulink>.</para>
 
 <para>Once it's installed, start it up and do <userinput>C-h