Attachment 21711 Details for Bug 37943 – file.diff

[patch] file.diff

file.diff (text/plain), 4.41 KB, created by Martin Heinen on 2002-05-10 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Heinen

Created: 2002-05-10 23:50:01 UTC

Size: 4.41 KB

patch

obsolete

>Index: chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
>retrieving revision 1.121
>diff -u -r1.121 chapter.sgml
>--- chapter.sgml	10 May 2002 16:12:14 -0000	1.121
>+++ chapter.sgml	10 May 2002 22:34:45 -0000
>@@ -561,7 +561,7 @@
>     </indexterm>
>     <para><application>CTM</application>, on the other hand, does not
>       interactively compare the sources you have with those on the master
>-      archive or otherwise pull them across..  Instead, a script which
>+      archive or otherwise pull them across.  Instead, a script which
>       identifies changes in files since its previous run is executed
>       several times a day on the master CTM machine, any detected changes
>       being compressed, stamped with a sequence-number and encoded for
>@@ -699,8 +699,8 @@
> 	to exist.  When performing an upgrade it is likely that these
> 	groups did not exist. This caused problems when upgrading.</para>
> 
>-      <para>The most recent example of this is when the <quote/ppp/ group
>-	(later renamed <quote/network/) was added.  Users had the
>+      <para>The most recent example of this is when the <groupname>ppp</groupname> group
>+	(later renamed <groupname>network</groupname>) was added.  Users had the
> 	installation process fail for them when parts of the
> 	<filename>ppp</filename> subsystem were installed using a
> 	non-existent (for them) group name.</para>
>@@ -930,7 +930,7 @@
> 
> 	<screen>&prompt.root; <userinput>make buildworld</userinput></screen>
>  
>-        <para>It is now possible to specify a -j option to
>+        <para>It is now possible to specify a <option>-j</option> option to
>           <command>make</command> which will cause it to spawn several
>           simultaneous processes.  This is most useful on multi-CPU machines.
>           However, since much of the compiling process is IO bound rather
>@@ -962,7 +962,7 @@
> 	</indexterm>
> 
>         <para>Many factors influence the build time, but currently a 500 MHz
>-          Pentium 3 with 128 MB of RAM takes about 2 hours to build
>+          Pentium III with 128 MB of RAM takes about 2 hours to build
>           the &os.stable; tree, with no tricks or shortcuts used during the
>           process.  A &os.current; tree will take somewhat longer.</para>
>       </sect3>
>@@ -1099,7 +1099,7 @@
>         merge the temporary file with the currently installed file, or view the
>         &man.diff.1; results again.</para>
> 
>-      <para>Choosing to delete the temporary will tell &man.mergemaster.8; that we
>+      <para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we
>         wish to keep our current file unchanged, and to delete the one that is
>         new.  This option is not the most recommended one, unless you see no
>         reason to change the current file.  You can get help at any time by
>@@ -1418,7 +1418,7 @@
> 
> 	  <answer>
>             <para>There is no easy answer to this one, as it depends on the
>-	      nature of the change.  For example, if you just ran CVSup, and
>+	      nature of the change.  For example, if you just ran <application>CVSup</application>, and
> 	      it has shown the following files as being updated,</para>
>       
> 	    <screen><filename>src/games/cribbage/instr.c</filename>
>@@ -1500,7 +1500,7 @@
> 	      corners.</para>
>       
> 	    <para>If you want to live dangerously then make the world, passing
>-	      the <makevar>NOCLEAN</makevar> definition to make, like
>+	      the <makevar>NOCLEAN</makevar> definition to <command>make</command>, like
> 	      this:</para>
> 
> 	    <screen>&prompt.root; <userinput>make -DNOCLEAN world</userinput></screen>
>@@ -1601,11 +1601,11 @@
> 	      
> 	      <listitem>
> 		<para>Also in <filename>/etc/make.conf</filename>, set
>-		  <makevar>CFLAGS</makevar> to something like <quote>-O
>-		  -pipe</quote>.  The optimization <quote>-O2</quote> is much
>+		  <makevar>CFLAGS</makevar> to something like <option>-O
>+		  -pipe</option>.  The optimization <option>-O2</option> is much
> 		  slower, and the optimization difference between
>-		  <quote>-O</quote> and <quote>-O2</quote> is normally
>-		  negligible.  <quote>-pipe</quote> lets the compiler use
>+		  <option>-O</option> and <option>-O2</option> is normally
>+		  negligible.  <option>-pipe</option> lets the compiler use
> 		  pipes rather than temporary files for communication, which
> 		  saves disk access (at the expense of memory).</para>
> 	      </listitem>

Actions: View | Diff

Attachments on bug 37943: 21711