doc-el commit 979:961962ce756e - Initial version of a patch for ...

[freebsd-doc-el at lists.hellug.gr]

changeset: 979:961962ce756e
user:      Manolis Kiagias <sonicy at otenet.gr>
date:      2008-10-30 01:14 +0200
details:   http://hg.hellug.gr/freebsd/doc-el/?cmd=changeset;node=961962ce756e

description:
	Initial version of a patch for the en_US cutting-edge chapter

diffstat:

1 file changed, 18 insertions(+), 6 deletions(-)
en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml |   24 ++++++++++----

diffs (71 lines):

diff -r cf95174438c0 -r 961962ce756e en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	Tue Oct 28 11:52:37 2008 +0200
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	Thu Oct 30 01:14:25 2008 +0200
@@ -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.0-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-all.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,7 +210,7 @@
 	      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
+	    <para>The &a.svn-src-all.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>
 
@@ -387,7 +396,7 @@
 	      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
+	    <para>The &a.svn-src-all.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>
 
@@ -627,10 +636,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
@@ -646,7 +656,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>