* Reflect 4.x branch creation.

* Reflect current version shift: 4 -> 5
* Fix few URLs:
  . releng30.freebsd.org -> releng3.freebsd.org
  . ftp/pub/FreeBSD/FreeBSD-CURRENT -> ftp/pub/FreeBSD/FreeBSD-current
* Point few man.cgi's links to correct man section

1 files changed, 57 insertions, 40 deletions

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index ae5a80d8a9..8fc1ecfc2d 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.47 2000/04/03 09:36:31 brian Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.48 2000/04/03 09:36:51 brian Exp $</pubdate>
 
     <abstract>
       <para>This is the FAQ for FreeBSD versions 2.X and 3.X.  All entries
@@ -185,7 +185,7 @@
 	  <para><ulink
 	    URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
 	    is the development version of the operating system, which will
-	    in due course become 4.0-RELEASE.  As such, it is really only
+	    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
@@ -245,8 +245,8 @@
   
 	  <para>Snapshot releases are directly available from <ulink
 	    URL="ftp://current.FreeBSD.org/pub/FreeBSD/">ftp://current.FreeBSD.org/pub/FreeBSD/</ulink>
-	    and are generated, on the average, once a day for both the
-	    4.0-CURRENT and 3.0-STABLE branches.</para>
+	    and are generated, on the average, once a day for the
+	    5.0-CURRENT, 4.X-STABLE and 3.X-STABLE branches.</para>
 	</answer>
       </qandaentry>
 
@@ -266,7 +266,7 @@
 	    undesirable).  The other branch was <ulink
 	    URL="../handbook/cutting-edge.html#CURRENT">-CURRENT</ulink>,
 	    which essentially has been one unbroken line leading towards
-	    4.0-RELEASE (and beyond) since 2.0 was released. If a little
+	    5.0-RELEASE (and beyond) since 2.0 was released. If a little
 	    ASCII art would help, this is how it looks:</para>
   
 	  <literallayout>                 2.0
@@ -285,22 +285,27 @@
                3.0-SNAPs  (started Q1 1997)
                   |
                   |
-             3.0.0-RELEASE (Oct 1998)
+               3.0-RELEASE (Oct 1998)
                   |
                   |  [3.0-STABLE]
- *BRANCH*        3.1  (Feb 1999) -&gt; 3.2 -&gt; ... future 3.x releases ...
-                  |               (May 1999)
+ *BRANCH*      3.1-RELESE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
+                  |                     (May 1999) (Sep 1999) (Dec 1999)
+                  |
+                  |  [4.0-STABLE]
+ *BRANCH*        4.0  (Mar 2000) -&gt; ... future 4.x releases ...
+                  |
                   |
                  \|/
                   +
-          [4.0-CURRENT continues]</literallayout>
+          [5.0-CURRENT continues]</literallayout>
 
-	  <para>The -CURRENT branch is slowly progressing towards 4.0 and
+	  <para>The -CURRENT branch is slowly progressing towards 5.0 and
 	    beyond, the previous 2.2-STABLE branch having been retired
 	    with the release of 2.2.8.  3.4-STABLE has now replaced it,
 	    with 3.4-RELEASE being released in mid-December 1999.
-	    4.0-CURRENT is now the "current branch", with the first 4.0
-	    releases appearing in Q1 2000.</para>
+	    4.0-RELEASE released at mid-March 2000 and going to replace
+	    3.X branch at summer 2000.  5.0-CURRENT is now the "current
+	    branch", with the no release date planed.</para>
 	</answer>
       </qandaentry>
 
@@ -357,7 +362,7 @@
 	    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
-	    some 15 people. There is a much larger team of over 150 <ulink
+	    some 15 people. There is a much larger team of about 200 <ulink
 	    URL="../handbook/staff-committers.html">committers</ulink> who
 	    are authorized to make changes directly to the FreeBSD source
 	    tree.</para>
@@ -406,7 +411,7 @@
 
 	    <listitem>
 	      <para><ulink
-	      URL="ftp://releng30.FreeBSD.org/pub/FreeBSD/">3.X Snapshot</ulink>
+	      URL="ftp://releng3.FreeBSD.org/pub/FreeBSD/">3.X Snapshot</ulink>
 	      releases are also made once a day along the RELENG_3 branch
 	      (post 3.0-RELEASE) as it continues on its way towards
 	      3.4-RELEASE.</para>
@@ -414,7 +419,7 @@
 
 	    <listitem>
 	      <para><ulink
-	      URL="ftp://current.FreeBSD.org/pub/FreeBSD/">4.0 Snapshot</ulink>
+	      URL="ftp://current.FreeBSD.org/pub/FreeBSD/">5.0 Snapshot</ulink>
 	      releases are made once a day for the <link
 	      linkend="current">-CURRENT</link> branch, these being of
 	      service purely to bleeding-edge testers and
@@ -821,9 +826,10 @@ prefix=/usr/local/www/data/www.FreeBSD.org delete old use-rel-suffix</literallay
 
 	    <listitem>
 	      <para>Using ftp mirror:  You can download the FTP server's
-	        copy of the web site using your favorite ftp mirror tool.
-		Simply start at
-		ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-CURRENT/www.</para>
+	        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
+		ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/www.</para>
 	    </listitem>
 	  </itemizedlist></para>
 	</answer>
@@ -1249,8 +1255,10 @@ IP Address    10.0.0.1      10.0.0.2
 </para>
   
 <para>Thats all! Please read also the manpages 
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?lp">lp(4)</ulink> and
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?lpt">lpt(4)</ulink>.</para>
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?lp(4)">lp(4)
+</ulink> and
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?lpt(4)">lpt(4)
+</ulink>.</para>
   
 <para>You should also add the hosts to <filename>/etc/hosts</filename>.</para>
   
@@ -1474,7 +1482,8 @@ includes several of the files mentioned here, and the
 kernel.  There is nothing in the system which requires the
 presence of the sources to operate, however, except for the
 kernel-configuration program 
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?config">config</ulink>.  With the exception
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?config(8)">config
+</ulink>.  With the exception
 of the kernel sources, our build structure is set up so that you
 can read-only mount the sources from elsewhere via NFS and still
 be able to make new binaries.  (Because of the kernel-source
@@ -1882,7 +1891,8 @@ section of the handbook.</para>
 <para>Some unnamed clone cards have also been known to work, especially
 those that claim to be AST compatible.</para>
   
-<para>Check the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?sio">sio</ulink> man page to get more information on configuring such cards.</para>
+<para>Check the
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?sio(4)">sio</ulink> man page to get more information on configuring such cards.</para>
   
 </answer></qandaentry>
 
@@ -2126,7 +2136,7 @@ button) to paste it at the text cursor.</para>
 the text.  Pressing the button 3 will ``extend'' the selected region
 of text.  If your mouse does not have the middle button, you may wish
 to emulate it or remap buttons using moused options.  See the 
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?moused">moused(8)</ulink>
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?moused(8)">moused(8)</ulink>
 man page for details.</para>
   
 </answer></qandaentry>
@@ -2308,10 +2318,13 @@ and may not work well with FreeBSD.</para>
 <qandaentry><question>
 <para>Does FreeBSD support tape changers?</para></question><answer>
 
-<para>FreeBSD 2.2 supports SCSI changers using the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?ch(4)">ch</ulink> device and
-the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?chio">chio</ulink>
+<para>FreeBSD 2.2 supports SCSI changers using the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?ch(4)">ch(4)</ulink> device and
+the <ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?chio(1)">chio(1)</ulink>
 command.  The details of how you actually control the changer can be
-found in the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?chio">chio</ulink> man page.</para>
+found in the <ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?chio(4)">chio(1)</ulink>
+man page.</para>
   
 <para>If you're not using <ulink URL="http://www.FreeBSD.org/cgi/ports.cgi?amanda">AMANDA</ulink> or
 some other product that already understands changers, remember that
@@ -2384,7 +2397,7 @@ for the list of other devices supported.</para>
 <para>Does FreeBSD support power management on my laptop?</para></question><answer>
 
 <para>FreeBSD supports APM on certain machines.  Please look in the
-<acronym>LINT</acronym> kernel config file, searching for the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?apm">APM</ulink> keyword.</para>
+<acronym>LINT</acronym> kernel config file, searching for the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?apm(4)">APM</ulink> keyword.</para>
   
 </answer></qandaentry>
 
@@ -2659,9 +2672,6 @@ interface there.  Simply type</para>
 <para>at the prompt, and install your system as usual.  While it's
 recommended you compile and install a custom kernel anyway,</para>
   
-<para><ulink URL="http://www.FreeBSD.org/cgi/man.cgi?dset">dset</ulink>
-now also understands to save this value.</para>
-  
 <para>Hopefully, future versions will have a proper fix for this problem.</para>
   
 <para><emphasis remap=tt>NOTE:</emphasis> You can not use a <emphasis remap=bf>dangerously dedicated</emphasis> disk with
@@ -2711,12 +2721,16 @@ no link on the UTP port or if the cable is disconnected.</para>
 <para>When I mount a CDROM, I get ``Incorrect super block''.</para></question><answer>
 
 <para>You have to tell 
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?mount">mount</ulink>
+<ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?mount(8)">mount</ulink>
 the type of the device that you want to mount.  By default, 
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?mount">mount</ulink>
+<ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?mount(8)">mount(8)</ulink>
 will assume the filesystem is of type ``<emphasis remap=tt>ufs</emphasis>''.  You want to mount
 a CDROM filesystem, and you do this by specifying the ``<option>-t cd9660</option>''
-option to <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?mount">mount</ulink>.  This does, of course, assume that the
+option to <ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?mount(8)">mount(8)
+</ulink>.  This does, of course, assume that the
 CDROM contains an ISO 9660 filesystem, which is what most CDROMs
 have.  As of 1.1R, FreeBSD automatically understands the Rock Ridge
 (long filename) extensions as well.</para>
@@ -2811,7 +2825,8 @@ the BIOS setup and see if that solves the problem.</para>
 <para>This is a known problem with the ATI Mach 64 video card.
 The problem is that this card uses address <emphasis remap=tt>2e8</emphasis>, and
 the fourth serial port does too. Due to a bug (feature?) in the
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?sio">sio.c</ulink>
+<ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?sio(4)">sio(4)</ulink>
 driver it will touch this port even if you don't have the
 fourth serial port, and <emphasis remap=bf>even</emphasis> if you disable sio3 (the fourth
 port) which normally uses this address.</para>
@@ -2898,7 +2913,7 @@ range 512-4096, depending on the number of concurrent TCP
 connections you need to support. I'd recommend trying 2048 - this
 should get rid of the panic completely. You can monitor the
 number of mbuf clusters allocated/in use on the system with
-<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?netstat">netstat -m</ulink>.  The default value for NMBCLUSTERS is 
+<ulink URL="http://www.FreeBSD.org/cgi/man.cgi?netstat(1)">netstat -m</ulink>.  The default value for NMBCLUSTERS is 
 <emphasis remap=tt>512 + MAXUSERS * 16</emphasis>.</para>
   
 </answer></qandaentry>
@@ -2925,7 +2940,9 @@ mismatched file can sometimes lead to panics.</para>
 <para>This is a conflict with an Ultrastor SCSI Host Adapter. </para>
   
 <para>During the boot process enter the kernel configuration menu and
-disable <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?uha(4)">uha0</ulink>, which is causing the problem.</para>
+disable <ulink
+URL="http://www.FreeBSD.org/cgi/man.cgi?uha(4)">uha0</ulink>,
+which is causing the problem.</para>
   
 </answer></qandaentry>
 
@@ -3507,7 +3524,7 @@ following variable to <acronym>YES</acronym>:</para>
       </literallayout>
 </para>
   
-<para>It will load the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?ibcs2">ibcs2</ulink>
+<para>It will load the <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?ibcs2(8)">ibcs2</ulink>
 kernel module at startup.</para>
   
 <para>You'll then need to set up /compat/ibcs2/dev to look like:</para>
@@ -3691,7 +3708,7 @@ id="admin">
 
 <para>From 2.0.5R to 2.2.1R, the primary configuration file is
 <filename>/etc/sysconfig</filename>. All the options are to be specified in
-this file and other files such as <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?rc">/etc/rc</ulink> and
+this file and other files such as <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?rc(8)">/etc/rc</ulink> and
 <filename>/etc/netstart</filename> just include it.</para>
   
 <para>Look in the <filename>/etc/sysconfig</filename> file and change the value to
@@ -3702,7 +3719,7 @@ to put in there.</para>
 to a more self-describing <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?rc.conf(5)">rc.conf</ulink>
 file and the syntax cleaned up a bit in the process.
 <filename>/etc/netstart</filename> was also renamed to <filename>/etc/rc.network</filename>
-so that all files could be copied with a <command><ulink URL="http://www.FreeBSD.org/cgi/man.cgi?cp">cp</ulink> /usr/src/etc/rc*
+so that all files could be copied with a <command><ulink URL="http://www.FreeBSD.org/cgi/man.cgi?cp(1)">cp</ulink> /usr/src/etc/rc*
 /etc</command> command.</para>
   
 <para><filename>/etc/rc.local</filename> is here as always and may be used to
@@ -5426,7 +5443,7 @@ mode. Tap the control key to wake it up again.</para>
 
 <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">xdm</ulink>.  One school starts xdm from
 <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?ttys">/etc/ttys</ulink> using the supplied example, while the other
-simply runs xdm from <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?rc">rc.local</ulink> or 
+simply runs xdm from <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?rc(8)">rc.local</ulink> or 
 from a <filename>X.sh</filename> script in <filename>/usr/local/etc/rc.d</filename>.
 Both are equally valid, and one may work in 
 situations where the other doesn't. In both cases the result is the