5 files changed, 24 insertions, 24 deletions

diff --git a/FAQ/hackers.sgml b/FAQ/hackers.sgml
index 7099239ffb..cbe0a17623 100644
--- a/FAQ/hackers.sgml
+++ b/FAQ/hackers.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hackers.sgml,v 1.13 1999-03-20 13:17:41 des Exp $ -->
+<!-- $Id: hackers.sgml,v 1.14 1999-03-27 15:48:05 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -48,7 +48,7 @@
       </verb>
 
       <p>Second, you have to have the whole CVS repository at hand.
-      To get this you can use <url url="../handbook/cvsup.html" name="CVSUP">
+      To get this you can use <url url="../handbook/synching.html#CVSUP" name="CVSUP">
       but in your supfile set the release name to cvs and remove any tag or
       date fields:
 
@@ -138,7 +138,7 @@
       </heading>
 
       <p>Yes, you can do this <tt /without/ downloading the whole source tree
-      by using the <url url="../handbook/ctm.html" name="CTM facility.">
+      by using the <url url="../handbook/synching.html#CTM" name="CTM facility.">
 
     <sect1>
       <heading>How did you split the distribution into 240k files?</heading>
diff --git a/FAQ/hardware.sgml b/FAQ/hardware.sgml
index 851457b77a..79ed262b04 100644
--- a/FAQ/hardware.sgml
+++ b/FAQ/hardware.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hardware.sgml,v 1.15 1999-01-21 01:49:12 jkh Exp $ -->
+<!-- $Id: hardware.sgml,v 1.16 1999-03-27 15:48:06 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -18,7 +18,7 @@
       <heading>Which SCSI controllers are supported?</heading>
 
       <p>See the complete list in the 
-      <htmlurl url="../handbook/install:hw.html" 
+      <htmlurl url="../handbook/install.html#INSTALL-HW" 
        name="Handbook">.
 
     <sect1>
@@ -83,7 +83,7 @@
       <heading>Which multi-port serial cards are supported by FreeBSD?</heading>
 
       <p>There is a list of these in the <htmlurl
-      url="../handbook/install:misc.html" name="Miscellaneous devices">
+      url="../handbook/install.html#INSTALL-MISC" name="Miscellaneous devices">
       section of the handbook.
 
       <p>Some unnamed clone cards have also been known to work, especially
@@ -272,7 +272,7 @@
     <sect1>
       <heading>Which network cards does FreeBSD support?</heading>
 
-      <p>See the <htmlurl url="../handbook/install:nics.html"
+      <p>See the <htmlurl url="../handbook/install.html#INSTALL-NICS"
       name="Ethernet cards"> section of the handbook for a more
       complete list. 
 
@@ -296,7 +296,7 @@
     <sect1>
       <heading>What other devices does 2.X support?</heading>
 
-      <p>See the <htmlurl url="../handbook/install:misc.html" name="Handbook"> 
+      <p>See the <htmlurl url="../handbook/install.html#INSTALL-MISC" name="Handbook"> 
       for the list of other devices supported.
 
 <!--
diff --git a/FAQ/misc.sgml b/FAQ/misc.sgml
index 3b76b499c2..abe980b962 100644
--- a/FAQ/misc.sgml
+++ b/FAQ/misc.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: misc.sgml,v 1.14 1999-03-15 02:44:55 billf Exp $ -->
+<!-- $Id: misc.sgml,v 1.15 1999-03-27 15:48:06 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -253,7 +253,7 @@
 
       <p>SUP is not bandwidth friendly, and has been retired.  The current
       recommended method to keep your sources up to date is
-      <url url="../handbook/cvsup.html" name="Handbook entry on CVSup">
+      <url url="../handbook/synching.html#CVSUP" name="Handbook entry on CVSup">
 
     <sect1>
       <heading>How cool is FreeBSD?</heading>
diff --git a/FAQ/network.sgml b/FAQ/network.sgml
index 329fb68188..870d714524 100644
--- a/FAQ/network.sgml
+++ b/FAQ/network.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: network.sgml,v 1.21 1999-01-31 18:58:22 brian Exp $ -->
+<!-- $Id: network.sgml,v 1.22 1999-03-27 15:48:06 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -106,7 +106,7 @@
         <item><url url="../handbook/ppp.html"
         name="Handbook entry on PPP (kernel version)">
 
-        <item><url url="../handbook/userppp.html"
+        <item><url url="../handbook/ppp-and-slip.html#USERPPP"
         name="Handbook entry on PPP (user-mode version)">
       </itemize>
 
@@ -141,7 +141,7 @@
 
       <p>You should first read the <htmlurl
       url="http://www.freebsd.org/cgi/man.cgi?ppp" name="ppp man page"> and
-      the <url url="../handbook/userppp.html"
+      the <url url="../handbook/ppp-and-slip.html#USERPPP"
       name="ppp section of the handbook">.  Enable logging with the command
 
       <verb>
@@ -233,7 +233,7 @@ default            10.0.0.2           UGSc        0        0      tun0
         </verb>
 
         <p>from <tt>ppp.conf</tt>.  If this is the case, go back to the
-        <url url="../handbook/userppp:final.html"
+        <url url="../handbook/ppp-and-slip.html#USERPPP-FINAL"
         name="Final system configuration"> section of the handbook.
 
       <sect2>
@@ -258,7 +258,7 @@ default            10.0.0.2           UGSc        0        0      tun0
           add 0 0 HISADDR
         </verb>
 
-        <p>Refer to the <url url="../handbook/userppp:dynamicIP.html"
+        <p>Refer to the <url url="../handbook/ppp-and-slip.html#USERPPP-DYNAMICIP"
         name="PPP and Dynamic IP addresses"> section of the handbook
         for further details.
 
@@ -1250,7 +1250,7 @@ ftp stream tcp nowait nobody /usr/local/bin/socket socket ftp.foo.com ftp
        # sh MAKEDEV bpf0
        </verb></tscreen>
 
-       <p>Please see the <htmlurl url="../handbook/kernelconfig:nodes.html"
+       <p>Please see the <htmlurl url="../handbook/kernelconfig-nodes.html"
        name="handbook's entry on device nodes"> for more information
        on creating devices.
 
diff --git a/FAQ/preface.sgml b/FAQ/preface.sgml
index 65625cb288..f9a1b6d4fd 100644
--- a/FAQ/preface.sgml
+++ b/FAQ/preface.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: preface.sgml,v 1.30 1999-03-20 14:35:14 jesusr Exp $ -->
+<!-- $Id: preface.sgml,v 1.31 1999-03-27 15:48:06 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -99,11 +99,11 @@
     <sect1>
       <heading>What is FreeBSD-current?<label id="current"></heading>
 
-      <p><url url="../handbook/current.html" name="FreeBSD-current"> is the
+      <p><url url="../handbook/cutting-edge.html#CURRENT" name="FreeBSD-current"> is the
       development version of the operating system, which will in due
       course become 4.0-RELEASE.  As such, it is really only of interest
       to developers working on the system and die-hard hobbyists.
-      See the <url url="../handbook/current.html" name="relevant section">
+      See the <url url="../handbook/cutting-edge.html#CURRENT" name="relevant section">
       in the <url url="../handbook/handbook.html" name="handbook"> for
       details on running -current.
 
@@ -156,7 +156,7 @@
       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
-      <url url="../handbook/current.html" name="-current">, which
+      <url url="../handbook/cutting-edge.html#CURRENT" name="-current">, which
       essentially has been one unbroken line leading towards 4.0-RELEASE
       (and beyond) since 2.0 was released. If a little ASCII art would
       help, this is how it looks:
@@ -231,9 +231,9 @@
 
       <p>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 <url url="../handbook/staff:core.html"
+      the source tree, are made by a <url url="../handbook/staff.html#STAFF-CORE"
       name="core team"> of some 15 people. There is a much larger team of
-      over 100 <url url="../handbook/staff:committers.html"
+      over 100 <url url="../handbook/staff-committers.html"
       name="committers"> who are authorized to make changes directly to the
       FreeBSD source tree.
 
@@ -318,14 +318,14 @@
       </heading>
 
       <p>You can find full information in the <url
-      url="../handbook/eresources:mail.html"
+      url="../handbook/eresources.html#ERESOURCES-MAIL"
       name="Handbook entry on mailing-lists.">
 
     <sect1>
       <heading>What FreeBSD news groups are available?</heading>
 
       <p>You can find full information in the<url
-      url="../handbook/eresources:news.html"
+      url="../handbook/eresources-news.html"
       name="Handbook entry on newsgroups.">
 
     <sect1>