Attachment 132203 Details for Bug 176451 – file.diff

[patch] file.diff

file.diff (text/plain), 2.98 KB, created by Tom on 2013-02-26 20:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom

Created: 2013-02-26 20:50:00 UTC

Size: 2.98 KB

patch

obsolete

>--- /usr/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	2013-02-18 13:25:18.000000000 -0500
>+++ chapter.xml	2013-02-26 14:42:20.000000000 -0500
>@@ -1813,8 +1813,8 @@
> 	up-to-date, refer to <xref linkend="synching"/> for detailed
> 	help about synchronizing to a newer version.</para>
> 
>-      <para>Updating the system from source is a more subtle than
>-	it might initially seem to be, and the &os; developers have
>+      <para>Updating the system from source is a more subtle process 
>+        than it might initially seem to be, and the &os; developers have
> 	found it necessary over the years to change the recommended
> 	approach fairly dramatically as new kinds of unavoidable
> 	dependencies come to light.  The rest of this section
>@@ -1858,7 +1858,7 @@
> 	</listitem>
> 
> 	<listitem>
>-	  <para>Some configuration changes must be done before the new
>+	  <para>Some configuration changes must be made before the new
> 	    world is installed, but others might break the old world.
> 	    Hence, two different configuration upgrade steps are
> 	    generally needed.</para>
>@@ -1946,7 +1946,7 @@
> 	  <para><command>mergemaster</command></para>
> 
> 	  <para>Repeated to update the remaining configuration files,
>-	    not that the new world is on disk.</para>
>+	    now that the new world is on disk.</para>
> 	</listitem>
> 
> 	<listitem>
>@@ -2217,7 +2217,7 @@
> 	<para><emphasis>Do not</emphasis> save the output in <filename
> 	    class="directory">/tmp</filename> as this directory may be
> 	  cleared at next reboot.  A better place to save the file is
>-	  <filename class="directory">/var/tmp</filename>or in
>+	  <filename class="directory">/var/tmp</filename> or in
> 	  <username>root</username>'s home directory.</para>
>       </sect3>
> 
>@@ -2234,8 +2234,7 @@
> 	<para>To rebuild the world, use &man.make.1;.  This command
> 	  reads instructions from the <filename>Makefile</filename>,
> 	  which describes how the programs that comprise &os; should
>-	  be rebuilt and the order in which they should be
>-	  built.</para>
>+	  be built and the order in which they should be built.</para>
> 
> 	<para>The general format of the command is as follows:</para>
> 
>@@ -2542,7 +2541,7 @@
>       <sect3>
> 	<title>Manual Update</title>
> 
>-	<para>To instead perform the update manually, do not just copy
>+	<para>To perform the update manually instead, do not just copy
> 	  over the files from
> 	  <filename class="directory">/usr/src/etc</filename> to
> 	  <filename class="directory">/etc</filename> and expect it to
>@@ -2580,7 +2579,7 @@
> 
> 	<para>Next, build a dummy set of directories to install the
> 	  new <filename class="directory">/etc</filename> and other
>-	  files into.  <filename
>+	  files into <filename
> 	    class="directory">/var/tmp/root</filename> is a reasonable
> 	  choice:</para>
> 
>@@ -2898,7 +2897,7 @@
> 	      <listitem>
> 		<para>Turn off profiling by setting
> 		  <quote>NO_PROFILE=true</quote> in
>-		  <filename>/etc/make.conf</filename>).</para>
>+		  <filename>/etc/make.conf</filename>.</para>
> 	      </listitem>
> 
> 	      <listitem>

Actions: View | Diff

Attachments on bug 176451: 132203