Merge "staying current", "staying stable" and "synching" into a

single chapter.

Move "source tree guidelines and policies" out of the dark dungeon
of the Appendix.

7 files changed, 53 insertions, 43 deletions

diff --git a/share/doc/handbook/ctm.sgml b/share/doc/handbook/ctm.sgml
index 493256a..8e62940 100644
--- a/share/doc/handbook/ctm.sgml
+++ b/share/doc/handbook/ctm.sgml
@@ -3,7 +3,7 @@
 #
 # Converted by Ollivier Robert <roberto@FreeBSD.ORG>
 #
-# $Id: ctm.sgml,v 1.15 1997/02/22 12:58:15 peter Exp $
+# $Id: ctm.sgml,v 1.16 1997/04/19 10:40:45 gpalmer Exp $
 #
 # ----------------------------------------------------------------------------
 # "THE BEER-WARE LICENSE" (Revision 42):
@@ -14,7 +14,7 @@
 #
 -->
 
-<sect><heading>CTM<label id="ctm"></heading>
+<sect1><heading>CTM<label id="ctm"></heading>
 
 <p><em>Contributed by &a.phk;.  Updated 16-Mar-1995.</em>
 
@@ -25,7 +25,7 @@
         this time on the process of creating deltas, so talk to &a.phk;
         for more information should you wish to use <tt/CTM/ for other things.
 
-    <sect1><heading>Why should I use <tt/CTM/?</heading>
+    <sect2><heading>Why should I use <tt/CTM/?</heading>
       <p><tt/CTM/ will give you a local copy of the ``FreeBSD-current''
         sources.  If you are an active developer on FreeBSD, but have lousy
         or non-existent TCP/IP connectivity, <tt/CTM/ was made for you.
@@ -39,7 +39,7 @@
         running ``current'' sources, and for this it is recommended that
         you read <ref id="current" name="Staying current with FreeBSD">.
 
-    <sect1><heading>What do I need to use <tt/CTM/?</heading>
+    <sect2><heading>What do I need to use <tt/CTM/?</heading>
 
       <p>You will need two things: The ``<tt/CTM/'' program and the initial
         deltas to feed it (to get up to ``current'' levels).
@@ -87,7 +87,7 @@
         posted.  Send an email to &a.majordomo with a single
         line of ``<tt/subscribe ctm-announce/'' to get added to the list.
 
-    <sect1><heading>Starting off with <tt/CTM/ for the first time</heading>
+    <sect2><heading>Starting off with <tt/CTM/ for the first time</heading>
       <p>Before you can start using <tt/CTM/ deltas, you will need to get a
         special ``base'' delta that provides the starting point for all
         deltas produced subsequently to it.
@@ -105,7 +105,7 @@
         Once you've picked a base delta to start from, you will also need
         all deltas with higher numbers following it.
 
-    <sect1><heading>Using <tt/CTM/ in your daily life</heading>
+    <sect2><heading>Using <tt/CTM/ in your daily life</heading>
       <p>To apply the deltas, simply say
         <verb>
           cd /where/ever/you/want/the/stuff
@@ -136,7 +136,7 @@
         make a copy.
 
 
-    <sect1><heading>Future plans for <tt/CTM/</heading>
+    <sect2><heading>Future plans for <tt/CTM/</heading>
       <p>
         Tons of them:
         <itemize>
@@ -161,7 +161,7 @@
         The bad news is that I am very busy, so any help in doing this will
         be most welcome.  And do not forget to tell me what you want also...
 
-    <sect1><heading>Miscellaneous stuff</heading>
+    <sect2><heading>Miscellaneous stuff</heading>
       <p>
         All the ``DES infected'' (e.g. export controlled) source is not
         included.  You will get the ``international'' version only.  If
@@ -184,7 +184,7 @@
         for details.
 
 
-    <sect1><heading>Thanks!</heading>
+    <sect2><heading>Thanks!</heading>
       <p>
         <descrip>
           <tag/&a.bde;/
diff --git a/share/doc/handbook/current.sgml b/share/doc/handbook/current.sgml
index 10b5972..269cd33 100644
--- a/share/doc/handbook/current.sgml
+++ b/share/doc/handbook/current.sgml
@@ -1,8 +1,8 @@
-<!-- $Id$ -->
+<!-- $Id: current.sgml,v 1.19 1997/02/22 12:58:16 peter Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
-<chapt><heading>Staying current with FreeBSD<label id="current"></heading>
+<sect><heading>Staying current with FreeBSD<label id="current"></heading>
 
 <p><em>Contributed by &a.jkh;.</em>
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1997/01/14 06:26:14 $
+Last updated: $Date: 1997/02/22 12:58:16 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
@@ -18,7 +18,7 @@ and states some prerequisites for making sure the process goes as
 smoothly as possible.
 -->
 
-<sect><heading>What is FreeBSD-current?</heading>
+<sect1><heading>What is FreeBSD-current?</heading>
 
 <p>FreeBSD-current is, quite literally, nothing more than a daily
 snapshot of the working sources for FreeBSD.  These include work in
@@ -37,7 +37,7 @@ getting something tested, not because we are in the business of
 providing binary releases of current.  If we do not offer, please do not
 ask!  It takes far too much time to do this as a general task.
 
-<sect><heading>Who needs FreeBSD-current?</heading>
+<sect1><heading>Who needs FreeBSD-current?</heading>
 
 <p>FreeBSD-current is made generally available for 3 primary interest groups:
 <enum>
@@ -57,7 +57,7 @@ ask!  It takes far too much time to do this as a general task.
         people also make the occasional comment or contribute code.
 </enum>
 
-<sect><heading>What is FreeBSD-current <em>NOT</em>?</heading>
+<sect1><heading>What is FreeBSD-current <em>NOT</em>?</heading>
 
 <p><enum>
     <item>  A fast-track to getting pre-release bits because you heard there is
@@ -79,7 +79,7 @@ ask!  It takes far too much time to do this as a general task.
         improve FreeBSD, most of you would vote for us improving it.
 </enum>
 
-<sect><heading>Using FreeBSD-current</heading>
+<sect1><heading>Using FreeBSD-current</heading>
 
 <p><enum> <item> Join the &a.current and the &a.cvsall .
     This is not just a good idea, it is <em>essential</em>.
diff --git a/share/doc/handbook/cvsup.sgml b/share/doc/handbook/cvsup.sgml
index 4978da0..1c48f50 100644
--- a/share/doc/handbook/cvsup.sgml
+++ b/share/doc/handbook/cvsup.sgml
@@ -1,11 +1,11 @@
-<!-- $Id: cvsup.sgml,v 1.14 1997/04/08 00:14:00 jdp Exp $ -->
+<!-- $Id: cvsup.sgml,v 1.15 1997/04/27 00:32:35 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<sect><heading>CVSup<label id="cvsup"></heading>
+<sect1><heading>CVSup<label id="cvsup"></heading>
 
 <p><em>Contributed by &a.jdp;</em>.
 
-<sect1><heading>Introduction<label id="cvsup:intro"></heading>
+<sect2><heading>Introduction<label id="cvsup:intro"></heading>
 
 <p>CVSup is a software package for distributing and updating source
 trees from a master CVS repository on a remote server host.  The
@@ -33,7 +33,7 @@ way as sup and, in fact, uses configuration files which are
 backward-compatible with sup's.  Sup is no longer used in the FreeBSD
 project, however, because CVSup is both faster and more flexible.
 
-<sect1><heading>Installation<label id="cvsup:install"></heading>
+<sect2><heading>Installation<label id="cvsup:install"></heading>
 
 <p>The easiest way to install CVSup if you are running FreeBSD 2.2 or
 later is to use either <url
@@ -100,7 +100,7 @@ FreeBSD-2.1.0 to FreeBSD-current.
   <item>FreeBSD-2.1.5 or earlier:	static binary
 </itemize>
 
-<sect1><heading>Configuration<label id="cvsup:config"></heading>
+<sect2><heading>Configuration<label id="cvsup:config"></heading>
 
 <p>CVSup's operation is controlled by a configuration file called the
 "supfile".  Beginning with FreeBSD-2.2, there are some sample supfiles
@@ -340,7 +340,7 @@ substantially.
 </verb>
 </itemize>
 
-<sect1><heading>Running CVSup</heading>
+<sect2><heading>Running CVSup</heading>
 
 <p>You are now ready to try an update.  The command line for doing this is
 quite simple:
@@ -398,7 +398,7 @@ type "cvsup -H".  For more detailed descriptions, see the manual page.
 for regular runs of cvsup using cron(8).  Obviously, you should not let
 cvsup use its GUI when running it from cron.
 
-<sect1><heading>CVSup File Collections<label id="cvsup:collec"></heading>
+<sect2><heading>CVSup File Collections<label id="cvsup:collec"></heading>
 
 <p>The file collections available via CVSup are organized
 hierarchically.  There are a few large collections, and they are
@@ -558,7 +558,7 @@ The CVS repository for the SMP project.
 The installed World Wide Web data.  Used by WWW mirror sites.
 </descrip>
 
-<sect1><heading>Announcements, Questions, and Bug Reports</heading>
+<sect2><heading>Announcements, Questions, and Bug Reports</heading>
 
 <p>Most FreeBSD-related discussion of CVSup takes place on the
 &a.hackers;.  New versions of the software are announced there, as
diff --git a/share/doc/handbook/handbook.sgml b/share/doc/handbook/handbook.sgml
index abe2ce9..2b93c89 100644
--- a/share/doc/handbook/handbook.sgml
+++ b/share/doc/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.70 1997/05/01 03:06:31 jfieber Exp $ -->
+<!-- $Id: handbook.sgml,v 1.71 1997/05/02 02:20:25 ache Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -143,12 +143,23 @@ name="FreeBSD FTP server"> or one of the numerous
 <!-- ************************************************************ -->	      
 
     <part><heading>Advanced topics</heading>
-    &current;
-    &stable;
-    &synching; 
+    <chapt><heading>The Cutting Edge: FreeBSD-current and FreeBSD-stable</>
+    <p>FreeBSD is under constant development between releases.  For
+    people who want to be on the cutting edge, there are several
+    easy mechanisms for keeping your system in sync with the latest
+    developments.  Be warned: the cutting edge is not for everyone!
+    This chapter will help you decide if you want to track the development
+    system, or stick with one of the released versions.</p>
+
+      &current;
+      &stable;
+      &synching; 
+    </chapt>
+
     &submitters;
-    &kerneldebug;
+    &policies;
     &kernelopts;
+    &kerneldebug;
     &linuxemu;
     <chapt><heading>FreeBSD internals</heading>
       &booting;
@@ -164,7 +175,6 @@ name="FreeBSD FTP server"> or one of the numerous
     &bibliography;
     &eresources;
     &contrib;
-    &policies;
     &pgpkeys;
 
 <!--    &glossary; -->
diff --git a/share/doc/handbook/stable.sgml b/share/doc/handbook/stable.sgml
index 6441e33..cecfc54 100644
--- a/share/doc/handbook/stable.sgml
+++ b/share/doc/handbook/stable.sgml
@@ -1,8 +1,8 @@
-<!-- $Id: stable.sgml,v 1.9 1997/02/22 12:59:27 peter Exp $ -->
+<!-- $Id: stable.sgml,v 1.10 1997/03/19 03:22:29 obrien Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
-<chapt><heading>Staying stable with FreeBSD<label id="stable"></heading>
+<sect><heading>Staying stable with FreeBSD<label id="stable"></heading>
 
 <p><em>Contributed by &a.jkh;.</em>
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1997/02/22 12:59:27 $
+Last updated: $Date: 1997/03/19 03:22:29 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
@@ -18,14 +18,14 @@ and states some prerequisites for making sure the process goes as
 smoothly as possible.
 -->
 
-<sect><heading>What is FreeBSD-stable?</heading>
+<sect1><heading>What is FreeBSD-stable?</heading>
 
 <p>FreeBSD-stable is our development branch for a more low-key and
 conservative set of changes intended for our next mainstream release.
 Changes of an experimental or untested nature do not go into this
 branch (see <ref id="current" name="FreeBSD-current">).
 
-<sect><heading>Who needs FreeBSD-stable?</heading>
+<sect1><heading>Who needs FreeBSD-stable?</heading>
 
 <p>If you are a commercial user or someone who puts maximum stability of
 their FreeBSD system before all other concerns, you should consider tracking
@@ -43,7 +43,7 @@ our tests fail to catch every case.  If something breaks for you in
 <em>stable</em>, please let us know <em>immediately!</em> (see
 next section).
 
-<sect><heading>Using FreeBSD-stable</heading>
+<sect1><heading>Using FreeBSD-stable</heading>
 
     <p><enum><item> Join the &a.stable .  This will
     keep you informed of build-dependencies that may appear in
diff --git a/share/doc/handbook/sup.sgml b/share/doc/handbook/sup.sgml
index d1ce59f..19c3144 100644
--- a/share/doc/handbook/sup.sgml
+++ b/share/doc/handbook/sup.sgml
@@ -1,15 +1,15 @@
-<!-- $Id: sup.sgml,v 1.27 1997/03/11 06:42:03 jkh Exp $ -->
+<!-- $Id: sup.sgml,v 1.28 1997/04/27 00:32:37 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
-<sect><heading>SUP<label id="sup"></heading>
+<sect1><heading>SUP<label id="sup"></heading>
 
 <p><em>Contributed by &a.jkh; and &a.gclarkii;.</em> 
 
 SUP is a network based software update tool developed at CMU.  The
 purpose of this document is get the beginner up and running with sup.
 
-<sect1><heading>Configuration<label id="sup:setup"></heading>
+<sect2><heading>Configuration<label id="sup:setup"></heading>
 
 <p>SUP gets the information it needs to run from a configuration file 
 called a supfile.  There are different example supfiles provided
@@ -69,7 +69,7 @@ a -current user.    If you are using the stable-supfile, please
 join the &a.stable and read
 <ref id="stable" name="Staying stable with FreeBSD">.
 
-<sect1><heading>Distributions<label id="sup:dists">
+<sect2><heading>Distributions<label id="sup:dists">
 </heading>
 
 <p>For the main FreeBSD distribution using the standard-supfile:
diff --git a/share/doc/handbook/synching.sgml b/share/doc/handbook/synching.sgml
index 708c275..fe5e566 100644
--- a/share/doc/handbook/synching.sgml
+++ b/share/doc/handbook/synching.sgml
@@ -1,13 +1,13 @@
-<!-- $Id$ -->
+<!-- $Id: synching.sgml,v 1.9 1997/02/22 12:59:32 peter Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
-<chapt><heading>Synchronizing source trees over the Internet<label id="synching"></heading>
+<sect><heading>Synchronizing source trees over the Internet<label id="synching"></heading>
 
 <p><em>Contributed by &a.jkh;.</em>
 
 <!--
 
-Last updated: $Date: 1997/01/14 06:26:49 $
+Last updated: $Date: 1997/02/22 12:59:32 $
 
 This document tries to describe the various ways in which a user may
 use the internet to keep development sources in synch.