Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2014 23:35:45 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r43781 - head/en_US.ISO8859-1/books/handbook/cutting-edge
Message-ID:  <201402042335.s14NZj9j016990@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Tue Feb  4 23:35:45 2014
New Revision: 43781
URL: http://svnweb.freebsd.org/changeset/doc/43781

Log:
  Editorial pass through second 1/2 of this section.
  
  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 22:40:49 2014	(r43780)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 23:35:45 2014	(r43781)
@@ -1150,7 +1150,7 @@ before running "/usr/sbin/freebsd-update
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
 	development and  &os.current; users are expected to have a high
 	degree of technical skill.  Less technical users who wish
-	to track a development brach should
+	to track a development branch should
 	track &os.stable; instead.</para>
 
 	<para>&os.current; is the very latest source code for &os; and
@@ -1210,8 +1210,8 @@ before running "/usr/sbin/freebsd-update
 	      &a.svn-src-head.name; lists.  This is
 	      <emphasis>essential</emphasis> in order to see the
 	      comments that people are making about the current state
-	      of the system and to receive important bulletins which
-	      may be critical to the system's continued health.</para>
+	      of the system and to receive important bulletins about
+	      the current state of &os.current;.</para>
 
 	    <para>The &a.svn-src-head.name; list records the commit
 	      log entry for each change as it is made, along with any
@@ -1220,7 +1220,7 @@ before running "/usr/sbin/freebsd-update
 	    <para>To join these lists, go to &a.mailman.lists.link;,
 	      click on the list to subscribe to, and follow the
 	      instructions.  In order to track changes to the whole
-	      source tree, subscribe to the &a.svn-src-all.name;
+	      source tree, not just the changes to &os.current;, subscribe to the &a.svn-src-all.name;
 	      list.</para>
 	  </listitem>
 
@@ -1256,10 +1256,9 @@ before running "/usr/sbin/freebsd-update
 		<primary>-CURRENT</primary>
 		<secondary>compiling</secondary>
 	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> very carefully.
-	      <link linkend="makeworld">Install a new kernel and
-	      rebuild the world</link> the first time through as part
-	      of the upgrading process.  Read the &a.current; and
+	      <filename>/usr/src/Makefile</filename> very carefully and follow the instructions in
+	      <link linkend="makeworld">Rebuilding
+	      "world"</link>.  Read the &a.current; and
 	      <filename>/usr/src/UPDATING</filename> to stay
 	      up-to-date on other bootstrapping procedures that
 	      sometimes become necessary on the road to the next
@@ -1280,49 +1279,34 @@ before running "/usr/sbin/freebsd-update
 
 	<para>&os.stable; is the development branch from which major
 	  releases are made.  Changes go into this branch at a
-	  different pace, and with the general assumption that they
-	  have first gone into &os.current; for testing.  This is
-	  <emphasis>still</emphasis> a development branch, however,
-	  and this means that at any given time, the sources for
-	  &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>
+	  slower pace and with the general assumption that they
+	  have first been tested in &os.current;.  This is
+	  <emphasis>still</emphasis> a development branch and,
+	  at any given time, the sources for
+	  &os.stable; may or may not be suitable for general use.
+	  It is simply another engineering development
+	  track, not a resource for end-users.  Users who do not have the resources to perform
+	  testing should instead run the most
+	  recent release of &os;.</para>
 
 	<para>Those interested in tracking or contributing to the
-	  FreeBSD development process, especially as it relates to the
-	  next <quote>point</quote> release of FreeBSD, should
+	  &os; development process, especially as it relates to the
+	  next release of &os;, should
 	  consider following &os.stable;.</para>
 
-	<para>While security fixes go into the &os.stable; branch, one
-	  does not <emphasis>need</emphasis> to track &os.stable; to
-	  receive security fixes.  Every security advisory for &os;
-	  explains how to fix the problem for the releases it
-	  affects which are not yet EOL.
-
-	  <footnote>
-	    <para>For a complete description of the current security
-	      policy for old releases of FreeBSD, refer to <link
-		xlink:href="&url.base;/security/">http://www.FreeBSD.org/security/</link>.</para></footnote>.</para>;
-
 	<para>While the &os.stable; branch should compile and run at
-	  all times, this cannot be guaranteed.  While code is
-	  developed in &os.current; before including it in
-	  &os.stable;, more people run &os.stable; than &os.current;,
-	  so it is inevitable that bugs and corner cases will
+	  all times, this cannot be guaranteed.  Since
+	  more people run &os.stable; than &os.current;,
+	  it is inevitable that bugs and corner cases will
 	  sometimes be found in &os.stable; that were not apparent in
-	  &os.current;.</para>
-
-	<para>For these reasons, one should <emphasis>not</emphasis>
-	  blindly track &os.stable;.  It is particularly important not
+	  &os.current;.  For this reason, one should not
+	  blindly track &os.stable;.  It is particularly important <emphasis>not</emphasis>
 	  to update any production servers to &os.stable; without
-	  first thoroughly testing the code in a development/testing
+	  thoroughly testing the code in a development or testing
 	  environment.</para>
 
-	<para>Except for those users who have the resources to perform
-	  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>
-
+	<para>To track &os.stable;:</para>
+	  
 	<indexterm>
 	  <primary>-STABLE</primary>
 	  <secondary>using</secondary>
@@ -1330,7 +1314,7 @@ before running "/usr/sbin/freebsd-update
 	<orderedlist>
 	  <listitem>
 	    <para>Join the &a.stable.name; list in order to stay
-	      informed of build-dependencies that may appear in
+	      informed of build dependencies that may appear in
 	      &os.stable; or any other issues requiring special
 	      attention.  Developers will also make announcements in
 	      this mailing list when they are contemplating some
@@ -1354,66 +1338,35 @@ before running "/usr/sbin/freebsd-update
 	  </listitem>
 
 	  <listitem>
-	    <para>To install a new system running monthly snapshots
-	      built from &os.stable;, refer to <link
+	    <para>To install a new &os.stable; system, install the most recent &os.stable; release from the
+	      <link linkend="mirrors">&os; mirror sites</link> or use a monthly snapshot
+	      built from &os.stable;.  Refer to <link
 		xlink:href="&url.base;/snapshots/">Snapshots</link>
-	      for more information.  Alternatively, it is possible to
-	      install the most recent &os.stable; release from the
-	      <link linkend="mirrors">mirror sites</link> and follow
-	      the instructions below to upgrade the system to the most
-	      up-to-date &os.stable; source code.</para>
-
-	    <para>Several methods are available to upgrade from a &os;
-	      <link linkend="mirrors">mirror site</link> on a system
-	      already running a previous release of &os;:</para>
+	      for more information about snapshots.</para>
 
-	    <orderedlist>
-	      <listitem>
-		<para>Use <link linkend="svn">svn</link>
+	    <para>To compile or upgrade to an existing &os;
+	      system to &os.stable;, use <link linkend="svn">svn</link>
 		  <indexterm>
 		    <primary>Subversion</primary>
-		  </indexterm> to check out the desired development or
-		  release branch.  This is the recommended method,
-		  providing access to &os; development as it occurs.
-		  Branch names include <literal>head</literal> for the
-		  current development head, and branches identified in
+		  </indexterm> to check out the source for the desired
+		  branch. 
+		  Branch names, such as <literal>stable/9</literal>, are identified in
 		  <link xlink:href="&url.base;/releng/">the release
-		    engineering page</link>, such as
-		  <literal>stable/9</literal>
-		  <indexterm>
-		    <primary>-STABLE</primary>
-		    <secondary>syncing with
-		      <application>Subversion</application></secondary>
-		  </indexterm>
-		  or <literal>releng/9.2</literal>.  URL prefixes for
-		  <application>Subversion</application> checkout of
-		  the base system are shown in <link
-		    linkend="svn-mirrors">Subversion mirror
-		    sites</link>.  Because of the size of the
-		  repository, it is recommended that only desired
-		  subtrees be checked out.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Consider using <application>CTM</application>
+		    engineering page</link>.   <link linkend="ctm">CTM</link> can be used
 		  <indexterm>
 		    <primary>-STABLE</primary>
 		    <secondary>syncing with CTM</secondary>
-		  </indexterm> if you do not have a fast connection to
-		  the Internet.</para>
-	      </listitem>
-	    </orderedlist>
+		  </indexterm> if a reliable Internet connection is not available.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Before compiling &os.stable;<indexterm>
+	    <para>Before compiling or upgrading to &os.stable;<indexterm>
 		<primary>-STABLE</primary>
 		<secondary>compiling</secondary>
 	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> carefully.
-	      <link linkend="makeworld">Install a new kernel and
-	      rebuild the world</link> the first time through as part
-	      of the upgrading process.  Read &a.stable; and
+	      <filename>/usr/src/Makefile</filename> carefully and follow the instructions in
+	      <link linkend="makeworld">Rebuilding
+	      "world"</link>.  Read &a.stable; and
 	      <filename>/usr/src/UPDATING</filename> to keep
 	      up-to-date on other bootstrapping procedures that
 	      sometimes become necessary on the road to the next



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402042335.s14NZj9j016990>