svn commit: r43778 - head/en_US.ISO8859-1/books/handbook/cutting-edge

[Dru Lavigne]

Author: dru
Date: Tue Feb  4 21:52:57 2014
New Revision: 43778
URL: http://svnweb.freebsd.org/changeset/doc/43778

Log:
  Initial shuffle to improve flow and tighten up this section.
  Subsequent commits will review the content.
  
  Sponsored by: iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 20:58:15 2014	(r43777)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 21:52:57 2014	(r43778)
@@ -1137,26 +1137,22 @@ before running "/usr/sbin/freebsd-update
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
-    <para>There are two development branches to &os;: &os.current;
-      and &os.stable;.  This section provides an explanation of each
+    <para>&os; has two development branches: &os.current;
+      and &os.stable;.</para>  
+      
+    <para>This section provides an explanation of each
       and describes how to keep a system up-to-date with each
-      respective tree.  &os.current; will be discussed first, then
+      respective branch.  &os.current; will be discussed first, then
       &os.stable;.</para>
 
-    <sect2 xml:id="current">
-      <title>Staying Current with &os;</title>
-
+      <sect2 xml:id="current">
+	<title>Using &os.current;</title>
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
 	development.  &os.current; users are expected to have a high
 	degree of technical skill and should be capable of solving
 	difficult system problems on their own.  If you are new to
 	&os;, track &os.stable; instead.</para>
 
-      <sect3>
-	<title>What Is &os.current;?</title>
-
-	<indexterm><primary>snapshot</primary></indexterm>
-
 	<para>&os.current; is the very latest source code for &os;.
 	  This includes work in progress, experimental changes, and
 	  transitional mechanisms that might or might not be present
@@ -1167,10 +1163,6 @@ before running "/usr/sbin/freebsd-update
 	  possible, but whether or not &os.current; brings disaster or
 	  greatly desired functionality can be a matter of when the
 	  source code was synced.</para>
-      </sect3>
-
-      <sect3>
-	<title>Who Needs &os.current;?</title>
 
 	<para>&os.current; is made available for three primary
 	  interest groups:</para>
@@ -1199,10 +1191,8 @@ before running "/usr/sbin/freebsd-update
 	      contribute code.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
 
-      <sect3>
-	<title>What Is &os.current; <emphasis>Not</emphasis>?</title>
+	<para>&os.current; is <emphasis>Not</emphasis>:</para>
 
 	<orderedlist>
 	  <listitem>
@@ -1222,10 +1212,6 @@ before running "/usr/sbin/freebsd-update
 		supported</quote>.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
-
-      <sect3>
-	<title>Using &os.current;</title>
 
 	<indexterm>
 	  <primary>-CURRENT</primary>
@@ -1327,16 +1313,10 @@ before running "/usr/sbin/freebsd-update
 	      enthusiastically!</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="stable">
-      <title>Staying Stable with &os;</title>
-
-      <sect3>
-	<title>What Is &os.stable;?</title>
-
-	<indexterm><primary>-STABLE</primary></indexterm>
+      <title>Using &os.stable;</title>
 
 	<para>&os.stable; is the development branch from which major
 	  releases are made.  Changes go into this branch at a
@@ -1347,10 +1327,6 @@ before running "/usr/sbin/freebsd-update
 	  &os.stable; may or may not be suitable for any particular
 	  purpose.  It is simply another engineering development
 	  track, not a resource for end-users.</para>
-      </sect3>
-
-      <sect3>
-	<title>Who Needs &os.stable;?</title>
 
 	<para>Those interested in tracking or contributing to the
 	  FreeBSD development process, especially as it relates to the
@@ -1386,10 +1362,6 @@ before running "/usr/sbin/freebsd-update
 	  testing, it is recommended that users instead run the most
 	  recent release of FreeBSD, and use the binary update
 	  mechanism to move from release to release.</para>
-      </sect3>
-
-      <sect3>
-	<title>Using &os.stable;</title>
 
 	<indexterm>
 	  <primary>-STABLE</primary>
@@ -1488,7 +1460,6 @@ before running "/usr/sbin/freebsd-update
 	      release.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
     </sect2>
   </sect1>