From martin@sumuk.de  Fri May 10 15:46:21 2002
Return-Path: <martin@sumuk.de>
Received: from Kain.sumuk.de (Kain.sumuk.de [213.221.86.114])
	by hub.freebsd.org (Postfix) with ESMTP id BED8737B40A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 May 2002 15:46:19 -0700 (PDT)
Received: from Moses.earth.sol (Moses.earth.sol [192.168.1.1])
	by Kain.sumuk.de (8.11.6/8.11.6) with ESMTP id g4AMkI055675
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 11 May 2002 00:46:18 +0200 (CEST)
	(envelope-from martin@sumuk.de)
Received: (from vincent@localhost)
	by Moses.earth.sol (8.11.6/8.11.6) id g4AMkGt25667;
	Sat, 11 May 2002 00:46:16 +0200 (CEST)
	(envelope-from vincent)
Message-Id: <200205102246.g4AMkGt25667@Moses.earth.sol>
Date: Sat, 11 May 2002 00:46:16 +0200 (CEST)
From: Martin Heinen <martin@sumuk.de>
Reply-To: Martin Heinen <martin@sumuk.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] minor corrections for cutting-edge
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         37943
>Category:       docs
>Synopsis:       [PATCH] minor corrections for cutting-edge
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    keramida
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 10 15:50:01 PDT 2002
>Closed-Date:    Sat May 11 17:31:54 PDT 2002
>Last-Modified:  Sat May 11 17:31:54 PDT 2002
>Originator:     Martin Heinen
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD Moses.earth.sol 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Dec 22 07:35:30 CET 2001 toor@Moses.earth.sol:/usr/obj/usr/src/sys/MOSES i386


	
>Description:
	
	- changed '..' to '.'
	- replaced <quote> with something more appropriate
	- added missing mark up
	- Pentium 3 -> Pentium III
	- added the missing word 'file'
>How-To-Repeat:
	Read the chapter 'The Cutting Edge'.
>Fix:

	
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>
>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@freebsd.org>
To: Martin Heinen <martin@sumuk.de>
Cc: bug-followup@freebsd.org
Subject: Re: docs/37943: [PATCH] minor corrections for cutting-edge
Date: Sat, 11 May 2002 12:27:02 +0300

 The majority of the changes look fine.  Where I am commenting below,
 there are a few fine points I was thinking about.
 
 On 2002-05-11 00:46, Martin Heinen wrote:
 > -      <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
 
 This is also touched by patches of another PR I was reading.  One
 submitted by Greg Shapiro.  If someone commits this one or the diff I
 sent in the audit trail of that PR a little merging work will be
 necessary for this part ;)
 
 > -          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
 
 Is this really necessary?  I'm not saying it's wrong or something.
 But is III the way these processors should be referred to in written
 text?
 
 Giorgos Keramidas                       FreeBSD Documentation Project
 keramida@{freebsd.org,ceid.upatras.gr}  http://www.FreeBSD.org/docproj/

From: Martin Heinen <martin@sumuk.de>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: docs/37943: [PATCH] minor corrections for cutting-edge
Date: Sat, 11 May 2002 13:09:17 +0200

 On Sat, May 11, 2002 at 12:27:02PM +0300, Giorgos Keramidas wrote:
 > The majority of the changes look fine.  Where I am commenting below,
 > there are a few fine points I was thinking about.
 > 
 > On 2002-05-11 00:46, Martin Heinen wrote:
 > > -      <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
 > 
 > This is also touched by patches of another PR I was reading.  One
 > submitted by Greg Shapiro.  If someone commits this one or the diff I
 > sent in the audit trail of that PR a little merging work will be
 > necessary for this part ;)
 
 As Greg noted, this section needs some work.  Therefore we can drop
 my suggestions and use PR 36773 instead.
 
 > > -          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
 > 
 > Is this really necessary?  I'm not saying it's wrong or something.
 > But is III the way these processors should be referred to in written
 > text?
 
 I compared with Intels Website:
 
   http://www.intel.com/products/browse/processor.htm?iid=ipp_nav+browse_proc&
 
 According to this page it's Pentium III (note the Pentium 4 !).
 
 -- 
 Marxpitn

From: Giorgos Keramidas <keramida@FreeBSD.org>
To: Martin Heinen <martin@sumuk.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: docs/37943: [PATCH] minor corrections for cutting-edge
Date: Sat, 11 May 2002 16:01:46 +0300

 On 2002-05-11 13:09, Martin Heinen wrote:
 > > This is also touched by patches of another PR I was reading.  One
 > > submitted by Greg Shapiro.  If someone commits this one or the diff I
 > > sent in the audit trail of that PR a little merging work will be
 > > necessary for this part ;)
 >
 > As Greg noted, this section needs some work.  Therefore we can drop
 > my suggestions and use PR 36773 instead.
 
 If Greg says 'aye' to that other patch, I'll do the merge of the two :>
 
 > > > -          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
 > >
 > > Is this really necessary?  I'm not saying it's wrong or something.
 > > But is III the way these processors should be referred to in written
 > > text?
 >
 > I compared with Intels Website:
 >
 >   http://www.intel.com/products/browse/processor.htm?iid=ipp_nav+browse_proc&
 
 I guess it's settled then.  If Intel calls it a Pentium III, this is
 what we should call it too, IMHO.
 
 - Giorgos
 
State-Changed-From-To: open->closed 
State-Changed-By: keramida 
State-Changed-When: Sat May 11 17:30:18 PDT 2002 
State-Changed-Why:  
Changes partially committed.  I left out the 'recent example' part 
since this will shortly change after I make the changes Greg suggests. 
No need to increase the diffs with that part :) 

Thanks for your submission and comments. 


Responsible-Changed-From-To: freebsd-doc->keramida 
Responsible-Changed-By: keramida 
Responsible-Changed-When: Sat May 11 17:30:18 PDT 2002 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=37943 
>Unformatted:
