A few updates in Handbook's 'cutting-edge' chapter:

- Note that csup can now be used in place of cvsup
- Replace the cvs-all mailing list with the new SVN lists
- Explain how to convert standard-supfile for use with CURRENT
- Refine the sample commands for rebuilding world

Reviewed by:	keramida, pgj, trhodes

en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml

@@ -75,6 +75,15 @@
       <listitem><para>Know how to install additional third-party
         software (<xref linkend="ports">).</para></listitem>
     </itemizedlist>
+
+    <note>
+      <para>Throughout this chapter, the <command>cvsup</command> command is
+	used to obtain and update &os; sources.  To use it, you will need to
+	install a port or package like <filename
+	  role="package">net/cvsup-without-gui</filename>.  If you are using
+	&os;&nbsp;6.2-RELEASE or later, you may wish to substitute this
+	with &man.csup.1;, which is now part of the base system.</para>
+    </note>
   </sect1>
   
   <sect1 id="current-stable">
@@ -191,7 +200,7 @@
 	</indexterm>
 	<orderedlist>
 	  <listitem>
-	    <para>Join the &a.current.name; and the &a.cvsall.name; lists.  This is not
+	    <para>Join the &a.current.name; and the &a.svn-src-head.name; lists.  This is not
 	      just a good idea, it is <emphasis>essential</emphasis>.  If
 	      you are not on the <emphasis>&a.current.name;</emphasis> list,
 	      you will not see the comments that people are
@@ -201,14 +210,16 @@
 	      will miss out on important bulletins which may be critical
 	      to your system's continued health.</para>
 
-	    <para>The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
+	    <para>The &a.svn-src-head.name; 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.</para>
 
 	    <para>To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.</para>
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.</para>
 	  </listitem>
 
 	  <listitem>
@@ -239,6 +250,22 @@
  		  sources up-to-date automatically.  You have to 
  		  customize the sample <filename>supfile</filename> above, and configure 
  		  <link linkend="cvsup">cvsup</link> for your environment.</para>
+		<note>
+		  <para>The sample <filename>standard-supfile</filename> is
+		    intended for tracking a specific security branch of
+		    &os;, and not &os.current;.  You will need to edit this
+		    file and replace the following line:</para>
+
+		  <screen>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></screen>
+
+		  <para>With this one:</para>
+
+		  <screen>*default release=cvs tag=.</screen>
+
+		  <para>For a detailed explanation of usable tags, please
+		    refer to the Handbook's <link
+		      linkend="cvs-tags">CVS Tags</link> section.</para>
+		</note>
 	      </listitem>
 
               <indexterm>
@@ -371,14 +398,19 @@
 	      respond if they have any issues to raise concerning the
 	      proposed change.</para>
 
-	    <para>The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
+	    <para>Join the relevant <application>SVN</application> list for
+	      the branch you are tracking.  For example, if you are tracking
+	      the 7-STABLE branch, join the &a.svn-src-stable-7.name; list.
+	      This will allow you to view the
+	      commit log entry for each change as it is made, along with
 	      any pertinent information on possible side-effects.</para>
 
 	    <para>To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.</para>
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.</para>
 	  </listitem>
 
 	  <listitem>
@@ -611,10 +643,11 @@
 	necessary for your version of the sources and then use the following
 	procedure:</para>
 
-      <screen>&prompt.root; <userinput>make buildworld</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput>
 &prompt.root; <userinput>make buildkernel</userinput>
 &prompt.root; <userinput>make installkernel</userinput>
-&prompt.root; <userinput>reboot</userinput></screen>
+&prompt.root; <userinput>shutdown -r now</userinput></screen>
 
       <note>
 	<para>There are a few rare cases when an extra run of
@@ -630,7 +663,9 @@
 	(i.e.&nbsp;using <command>boot -s</command> from the loader
 	prompt).  Then run:</para>
 
-      <screen>&prompt.root; <userinput>mergemaster -p</userinput>
+      <screen>&prompt.root; <userinput>mount -a -t ufs</userinput>
+&prompt.root; <userinput>mergemaster -p</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput>
 &prompt.root; <userinput>mergemaster</userinput>
 &prompt.root; <userinput>reboot</userinput></screen>