--- en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	(revision 49512)
+++ en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	(working copy)
@@ -58,14 +58,20 @@ 
   <sect1 xml:id="updating-upgrading-synopsis">
     <title>Synopsis</title>
 
+    <para>Applying security patches in a timely manner and upgrading
+      to a newer release of an operating system are important aspects
+      of ongoing system administration.</para>
+
     <para>&os; is under constant development between releases.  Some
       people prefer to use the officially released versions, while
       others prefer to keep in sync with the latest developments.
       However, even official releases are often updated with security
-      and other critical fixes.  Regardless of the version used, &os;
+      and other critical fixes.</para>
+
+    <para>Regardless of the version used, &os;
       provides all the necessary tools to keep the system updated, and
       allows for easy upgrades between versions.  This chapter
-      describes how to track the development system and the basic
+      describes how to track the latest changes and the basic
       tools for keeping a &os; system up-to-date.</para>
 
     <para>After reading this chapter, you will know:</para>
@@ -72,9 +78,14 @@ 
 
     <itemizedlist>
       <listitem>
+	<para>Which upgrade strategy is right for you: binary-only,
+	  or source-based?</para>
+      </listitem>
+
+      <listitem>
 	<para>How to keep a &os; system up-to-date with
-	  <application>freebsd-update</application> or
-	  <application>Subversion</application>.</para>
+	  <application>freebsd-update</application> (binary-only) or
+	  <application>Subversion</application> (source-based).</para>
       </listitem>
 
       <listitem>
@@ -89,13 +100,13 @@ 
       </listitem>
 
       <listitem>
-	<para>The difference between the two development
+	<para>The difference between the two source development
 	  branches: &os.stable; and &os.current;.</para>
       </listitem>
 
       <listitem>
 	<para>How to rebuild and reinstall the entire base
-	  system.</para>
+	  system from source.</para>
       </listitem>
     </itemizedlist>
 
@@ -121,6 +132,76 @@ 
     </note>
   </sect1>
 
+  <sect1 xml:id="updating-upgrading-strategy">
+    <info>
+      <title>Choosing a Strategy</title>
+
+      <authorgroup>
+	<author>
+	  <personname>
+	    <firstname>Mark</firstname>
+	    <surname>Linimon</surname>
+	  </personname>
+	  <contrib>Written by </contrib>
+	</author>
+      </authorgroup>
+    </info>
+
+    <indexterm>
+      <primary>Updating and Upgrading</primary>
+    </indexterm>
+    <indexterm>
+      <primary>updating strategy</primary>
+      <see>updating-upgrading</see>
+    </indexterm>
+
+    <para>With respect to the base system, there are two major strategies
+      to choose from: binary-only, or source-based.</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><varname>binary-only</varname></term>
+
+	<listitem>
+	  <para><emphasis>binary-only</emphasis> is best suited for users
+	    who have installed from a formal &os; release;  who neither
+	    need nor desire to make customizations to their base system;
+	    who are using standard x86-based hardware; and who do not plan
+	    to use code from any experimental branches (e.g. graphics
+	    drivers).</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>source-based</varname></term>
+
+	<listitem>
+	  <para><emphasis>source-based</emphasis> is best suited for
+	    users who either will be making customizations to their
+	    base system, doing development work, working with embedded
+	    systems, incorporating code from experimental branches,
+	    or working on the less-supported architectures.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>For binary-only installations, the recommended tool is
+      <xref linkend="updating-upgrading-freebsdupdate"/>.</para>
+
+    <para>Other sections of this chapter are applicable to
+      source-based installations:
+	<xref linkend="current-stable"/>,
+	<xref linkend="synching"/>,
+	<xref linkend="makeworld"/>, and
+	<xref linkend="small-lan"/>.
+    </para>
+
+    <para>Your choice of strategy for the base system does not
+      affect your similar choices for documentation or ports/
+      packages.</para>
+
+  </sect1>
+
   <sect1 xml:id="updating-upgrading-freebsdupdate">
     <info>
       <title>&os; Update</title>
@@ -154,11 +235,10 @@ 
       <see>updating-upgrading</see>
     </indexterm>
 
-    <para>Applying security patches in a timely manner and upgrading
-      to a newer release of an operating system are important aspects
-      of ongoing system administration.  &os; includes a utility
+    <para>&os; includes a utility
       called <command>freebsd-update</command> which can be used to
-      perform both these tasks.</para>
+      apply security patches in a timely manner and upgrade
+      to a newer release of the operating system.</para>
 
     <para>This utility supports binary security and errata updates to
       &os;, without the need to manually compile and install the patch
@@ -168,6 +248,12 @@ 
       end-of-life dates are listed at <uri
 	xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>
 
+    <note>
+      <para>The list of supported architectures is not yet shown on
+	that page, but the list will always include the x86-based
+	architectures.</para>
+    </note>
+
     <para>This utility also supports operating system upgrades to
       minor point releases as well as upgrades to another release
       branch.  Before upgrading to a new release, review its release
@@ -2110,7 +2196,7 @@ 
 
   <sect1 xml:id="small-lan">
     <info>
-      <title>Tracking for Multiple Machines</title>
+      <title>Tracking for Multiple Machines using NFS</title>
 
       <authorgroup>
 	<author>
@@ -2131,7 +2217,7 @@ 
     <para>When multiple machines need to track the same source tree,
       it is a waste of disk space, network bandwidth, and
       <acronym>CPU</acronym> cycles to have each system download the
-      sources and rebuild everything.  The solution is to have one
+      sources and rebuild everything.  One solution is to have one
       machine do most of the work, while the rest of the machines
       mount that work via <acronym>NFS</acronym>.  This section
       outlines a method of doing so.  For more information about using