2 files changed, 78 insertions, 65 deletions

diff --git a/handbook/current.sgml b/handbook/current.sgml
index 4fbcfae241..a00fb22776 100644
--- a/handbook/current.sgml
+++ b/handbook/current.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: current.sgml,v 1.24 1998-03-15 15:10:05 nik Exp $ -->
+<!-- $Id: current.sgml,v 1.25 1998-12-19 13:36:43 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1998-03-15 15:10:05 $
+Last updated: $Date: 1998-12-19 13:36:43 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
@@ -18,7 +18,8 @@ and states some prerequisites for making sure the process goes as
 smoothly as possible.
 -->
 
-<sect1><heading>What is FreeBSD-current?</heading>
+<itemize>
+<item><em>What is FreeBSD-current?</em>
 
 <p>FreeBSD-current is, quite literally, nothing more than a daily
 snapshot of the working sources for FreeBSD.  These include work in
@@ -31,90 +32,95 @@ but whether or not FreeBSD-current sources bring disaster or greatly
 desired functionality can literally be a matter of which part of any
 given 24 hour period you grabbed them in!
 
-<sect1><heading>Who needs FreeBSD-current?</heading>
+<item><em>Who needs FreeBSD-current?</em>
 
-<p>FreeBSD-current is made generally available for 3 primary interest groups:
-<enum>
-    <item>  Members of the FreeBSD group who are actively working on some
+<p>FreeBSD-current is aimed at 3 primary interest groups:
+
+<p><enum>
+    <item><p>Members of the FreeBSD group who are actively working on some
         part of the source tree and for whom keeping `current' is an
         absolute requirement.
 
-    <item>  Members of the FreeBSD group who are active testers,
+    <item><p>Members of the FreeBSD group who are active testers,
         willing to spend time working through problems in order to
         ensure that FreeBSD-current remains as sane as possible.  These
         are also people who wish to make topical suggestions on changes
         and the general direction of FreeBSD.
 
-    <item>  Peripheral members of the FreeBSD (or some other) group who merely
+    <item><p>Peripheral members of the FreeBSD (or some other) group who merely
         wish to keep an eye on things and use the current sources for
         reference purposes (e.g. for <em>reading</em>, not running).  These
         people also make the occasional comment or contribute code.
 </enum>
 
-<sect1><heading>What is FreeBSD-current <em>NOT</em>?</heading>
+<item><em>What is FreeBSD-current NOT?</em>
 
 <p><enum>
-    <item>  A fast-track to getting pre-release bits because you heard there is
-        some cool new feature in there and you want to be the first on
+    <item><p>A fast-track to getting pre-release bits because you heard there
+        is some cool new feature in there and you want to be the first on
         your block to have it.
 
-    <item>  A quick way of getting bug fixes.
+    <item><p>A quick way of getting bug fixes.
 
-    <item>  In any way ``officially supported'' by us.
+    <item><p>In any way ``officially supported'' by us.
 
-        We do our best to help people genuinely in one of the 3
-        ``legitimate'' FreeBSD-current categories, but we simply <em>do not
-        have the time</em> to provide tech support for it.
-        This is not because we are mean and nasty people who do not like
-        helping people out (we would not even be doing FreeBSD if we were),
-        it is literally because we cannot answer 400 messages a day
-        <em>and</em> actually work on FreeBSD!  I am sure that, if given
-        the choice between having us answer lots of questions or continuing to
-        improve FreeBSD, most of you would vote for us improving it.
+       We do our best to help people genuinely in one of the 3
+       ``legitimate'' FreeBSD-current categories, but we simply <em>do not
+       have the time</em> to provide tech support for it.
+       This is not because we are mean and nasty people who do not like
+       helping people out (we would not even be doing FreeBSD if we were),
+       it is literally because we cannot answer 400 messages a day
+       <em>and</em> actually work on FreeBSD!  I am sure that, if given
+       the choice between having us answer lots of questions or continuing to
+       improve FreeBSD, most of you would vote for us improving it.
 </enum>
 
-<sect1><heading>Using FreeBSD-current</heading>
+<item><em>Using FreeBSD-current</em>
 
-<p><enum> <item> Join the &a.current and the &a.cvsall .
+<p><enum>
+    <item><p>Join the &a.current and the &a.cvsall .
     This is not just a good idea, it is <em>essential</em>.
-    If you are not on the <em>FreeBSD-current</em> mailing list you
+    If you are not on the <em>FreeBSD-current</em> mailing list, you
     will not see the comments that people are making about the
     current state of the system and thus will probably end up stumbling
     over a lot of problems that others have already found and
-    solved.  Even more importantly, you will miss out on
-    potentially critical information (e.g. ``Yo, Everybody!
-    Before you rebuild <tt>/usr/src</tt>, you <em>must</em>
-    rebuild the kernel or your system will crash horribly!").
+    solved.  Even more importantly, you will miss out on important
+    bulletins which may be critical to your system's continued health.
 
-    The <em>cvs-all</em> mailing list will allow you to see the commit log
-    entry for each change as it is made along with any pertinent
-    information on possible side-effects.
+    The <em>cvs-all</em> mailing list also allows you to see the commit log
+    entry for each change as it is made, along with any pertinent
+    information on possible side-effects, and is another good mailing list
+    to subscribe to.
 
-        To join these lists, send mail to &a.majordomo and specify:
+    To join these lists, send mail to &a.majordomo and specify:
 <verb>
 subscribe freebsd-current
 subscribe cvs-all
 </verb>
-        In the body of your message.  Optionally, you can also say `help'
-        and Majordomo will send you full help on how to subscribe and
-        unsubscribe to the various other mailing lists we support.
+    In the body of your message.  Optionally, you can also say `help'
+    and Majordomo will send you full help on how to subscribe and
+    unsubscribe to the various other mailing lists we support.
 
-    <item>  Grab the sources from ftp.FreeBSD.ORG.  You can do this in
-        three ways:
+    <item><p>Grab the sources from ftp.FreeBSD.ORG.  You can do this in
+        one of three ways:
 
     <enum>
-	<item> Use the <ref id="ctm" name="CTM"> facility.  Unless you 
+	<item><p>Use the <ref id="ctm" name="CTM"> facility.  Unless you 
             have a good TCP/IP connection at a flat rate, this is 
             the way to do it.
 
-        <item>  Use the <ref id="cvsup" name="cvsup"> program with
+        <item><p>Use the <ref id="cvsup" name="cvsup"> program with
 	    <url url="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile" name="this supfile">.
             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 on.  Many people run cvsup from cron
-            and keep their sources up-to-date automatically.
+            to keep their sources up-to-date automatically.  For a fairly
+	    easy interface to this, simply type:
+<verb>
+	pkg_add -f ftp://ftp.freebsd.org/pub/FreeBSD/CVSup/cvsupit.tgz
+</verb>
 
-        <item>  Use ftp.  The source tree for FreeBSD-current is always
+        <item><p>Use ftp.  The source tree for FreeBSD-current is always
             "exported" on:
             <htmlurl url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current"
             name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current">
@@ -128,29 +134,30 @@ subscribe cvs-all
             ftp> cd usr.bin
             ftp> get lex.tar.Z
 </verb>
-            And it will get the whole directory for you as a compressed
+            and it will get the whole directory for you as a compressed
             tar file.
     </enum>
 
-    <item>  Essentially, if you need rapid on-demand access to the source and
+    Essentially, if you need rapid on-demand access to the source and
     communications bandwidth is not a consideration, use cvsup or ftp.
     Otherwise, use CTM.
 
-    <item>  If you are grabbing the sources to run, and not just look at,
+    If you are grabbing the sources to run, and not just look at,
     then grab <em>all</em> of current, not just selected portions.  The
     reason for this is that various parts of the source depend on
     updates elsewhere, and trying to compile just a subset is almost
     guaranteed to get you into trouble.
 
-    <item>  Before compiling current, read the Makefile in /usr/src
-        carefully.  You should at least run a `<ref id="makeworld"
-        name="make world">' the first time through as part of the upgrading
-        process. Reading the &a.current will keep you up-to-date on other
-        bootstrapping procedures that sometimes become necessary as we move
-        towards	the next release.
+    Before compiling current, read the Makefile in /usr/src
+    carefully.  You should at least run a `<ref id="makeworld"
+    name="make world">' the first time through as part of the upgrading
+    process. Reading the &a.current will keep you up-to-date on other
+    bootstrapping procedures that sometimes become necessary as we move
+    towards the next release.
 
-    <item>  Be active!  If you are  running FreeBSD-current, we want to know
+    <item><p>Be active!  If you are  running FreeBSD-current, we want to know
 	what you have to say about it, especially if you have suggestions
 	for enhancements or bug fixes.  Suggestions with accompanying code
-	are received most enthusiastically! 
+	are received most enthusiastically!
 </enum>
+</itemize>
diff --git a/handbook/stable.sgml b/handbook/stable.sgml
index 50386d00b3..af4670215c 100644
--- a/handbook/stable.sgml
+++ b/handbook/stable.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: stable.sgml,v 1.18 1998-11-08 10:40:54 jkh Exp $ -->
+<!-- $Id: stable.sgml,v 1.19 1998-12-19 13:36:44 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1998-11-08 10:40:54 $
+Last updated: $Date: 1998-12-19 13:36:44 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
@@ -54,30 +54,36 @@ next section).
     the users a chance to respond if they have any issues to raise concerning
     the proposed change.
 
-    <p>To join this list, send mail to &a.majordomo and say:
+    The <em>cvs-all</em> mailing list also allows you to see the commit log
+    entry for each change as it is made, along with any pertinent
+    information on possible side-effects, and is another good mailing list
+    to subscribe to.
+
+    To join these lists, send mail to &a.majordomo and specify:
 <verb>
-            subscribe freebsd-stable
+       subscribe freebsd-stable
+       subscribe cvs-all
 </verb>
-   <p>In the body of your message.  Optionally, you can also say `help'
+   In the body of your message.  Optionally, you can also say `help'
    and Majordomo will send you full help on how to subscribe and
    unsubscribe to the various other mailing lists we support.
 
-    <item><p>If you're installing a new system and want it to be as -stable
+    <p><item>If you're installing a new system and want it to be as -stable
 	as possible, you can simply grab the latest dated branch snapshot
 	from <url url="ftp://releng22.freebsd.org/pub/FreeBSD"
 	name="ftp://releng22.freebsd.org/pub/FreeBSD"> and install it like
 	any other release.
 
-    <item><p>If you're already running a previous release of 2.2 and
+    <p><item>If you're already running a previous release of 2.2 and
 	wish to upgrade via sources then you can easily do so from
 	ftp.FreeBSD.ORG.  This can be done in one of three ways:
 
     <enum>
-	<item><p>Use the <ref id="ctm" name="CTM"> facility.  Unless you 
+	<p><item><p>Use the <ref id="ctm" name="CTM"> facility.  Unless you 
             have a good TCP/IP connection at a flat rate, this is 
             the way to do it.
 
-        <item><p>Use the <ref id="cvsup" name="cvsup"> program with
+        <p><item><p>Use the <ref id="cvsup" name="cvsup"> program with
 	    <url url="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile" name="this supfile">.
             This is the second most recommended method, since it allows 
 	    you to grab the entire collection once and then only what has
@@ -88,7 +94,7 @@ next section).
 	pkg_add -f ftp://ftp.freebsd.org/pub/FreeBSD/CVSup/cvsupit.tgz
 </verb>
 
-        <item><p>Use ftp.  The source tree for FreeBSD-stable is always
+        <p><item><p>Use ftp.  The source tree for FreeBSD-stable is always
             "exported" on:
             <htmlurl url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-stable"
             name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/FreeBSD-stable">
@@ -103,7 +109,7 @@ next section).
             ftp> cd usr.bin
             ftp> get lex.tar.Z
 </verb>
-            And it will get the whole directory for you as a compressed
+            and it will get the whole directory for you as a compressed
             tar file.
     </enum>