- changed '..' to '.'
- replaced <quote> with something more appropriate - added missing mark up - Pentium 3 -> Pentium III - added the missing word 'file' Submitted by: Martin Heinen <martin@sumuk.de> PR: docs/37943
This commit is contained in:
		
							parent
							
								
									906ef8159a
								
							
						
					
					
						commit
						c6eba1369b
					
				
				
				Notes:
				
					svn2git
				
				2020-12-08 03:00:23 +00:00 
				
			
			svn path=/head/; revision=13042
					 1 changed files with 10 additions and 10 deletions
				
			
		|  | @ -561,7 +561,7 @@ subscribe cvs-all</programlisting> | |||
|     </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 | ||||
|  | @ -930,7 +930,7 @@ Script done, …</screen> | |||
| 
 | ||||
| 	<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 @@ Script done, …</screen> | |||
| 	</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 @@ Script done, …</screen> | |||
|         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 @@ Script done, …</screen> | |||
| 
 | ||||
| 	  <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 @@ Script done, …</screen> | |||
| 	      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 @@ Building everything.. | |||
| 	       | ||||
| 	      <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> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue