From jcamou@opensea.malexa.org.mx  Wed Feb  9 01:58:53 2005
Return-Path: <jcamou@opensea.malexa.org.mx>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6C45A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Feb 2005 01:58:53 +0000 (GMT)
Received: from fed1rmmtao07.cox.net (fed1rmmtao07.cox.net [68.230.241.32])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 057D443D41
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Feb 2005 01:58:53 +0000 (GMT)
	(envelope-from jcamou@opensea.malexa.org.mx)
Received: from opensea.cox.net ([68.0.141.123]) by fed1rmmtao07.cox.net
          (InterMail vM.6.01.04.00 201-2131-117-20041022) with ESMTP
          id <20050209015852.HXKB1747.fed1rmmtao07.cox.net@opensea.cox.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 8 Feb 2005 20:58:52 -0500
Received: from opensea.cox.net (localhost [127.0.0.1])
	by opensea.cox.net (8.13.1/8.13.1) with ESMTP id j19221pa014833
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 Feb 2005 19:02:02 -0700 (MST)
	(envelope-from jcamou@opensea.malexa.org.mx)
Received: (from jcamou@localhost)
	by opensea.cox.net (8.13.1/8.12.11/Submit) id j19221EL014832;
	Tue, 8 Feb 2005 19:02:01 -0700 (MST)
	(envelope-from jcamou)
Message-Id: <200502090202.j19221EL014832@opensea.cox.net>
Date: Tue, 8 Feb 2005 19:02:01 -0700 (MST)
From: "Jesus R. Camou" <jcamou@cox.net>
Reply-To: "Jesus R. Camou" <jcamou@cox.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] use US english spelling and fix a sentence		
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77288
>Category:       docs
>Synopsis:       [PATCH] use US english spelling and fix a sentence
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    trhodes
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 09 02:00:39 GMT 2005
>Closed-Date:    Thu Feb 24 04:07:22 GMT 2005
>Last-Modified:  Thu Feb 24 04:07:22 GMT 2005
>Originator:     Jesus R. Camou
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD opensea.cox.net 4.11-STABLE FreeBSD 4.11-STABLE #4: Sun Jan 30 06:26:38 MST 2005 root@opensea.cox.net:/usr/obj/usr/src/sys/OPENSEA i386

>Description:

	doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml:

		o s/defence/defense/g  (US english spelling)
		o sentence correction:
		  to mark up a command's options -> to mark up a command's option

>How-To-Repeat:
>Fix:

--- chap.sgml-markup.diff begins here ---
Index: chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v
retrieving revision 1.68
diff -u -r1.68 chapter.sgml
--- chapter.sgml	6 Jan 2005 05:07:25 -0000	1.68
+++ chapter.sgml	9 Feb 2005 01:48:17 -0000
@@ -218,7 +218,7 @@
 
 <blockquote>We the People of the United States, in Order to form
   a more perfect Union, establish Justice, insure domestic
-  Tranquility, provide for the common defence, promote the general
+  Tranquility, provide for the common defense, promote the general
   Welfare, and secure the Blessings of Liberty to ourselves and our
   Posterity, do ordain and establish this Constitution for the
   United States of America.</blockquote>]]></programlisting>
@@ -1038,7 +1038,7 @@
 	    
   <para>We the People of the United States, in Order to form a more perfect
     Union, establish Justice, insure domestic Tranquility, provide for the
-    common defence, promote the general Welfare, and secure the Blessings
+    common defense, promote the general Welfare, and secure the Blessings
     of Liberty to ourselves and our Posterity, do ordain and establish this
     Constitution for the United States of America.</para>
 </blockquote>]]></programlisting>
@@ -1052,7 +1052,7 @@
 	    
 	    <para>We the People of the United States, in Order to form a more
 	      perfect Union, establish Justice, insure domestic Tranquility,
-	      provide for the common defence, promote the general Welfare, and
+	      provide for the common defense, promote the general Welfare, and
 	      secure the Blessings of Liberty to ourselves and our Posterity,
 	      do ordain and establish this Constitution for the United States
 	      of America.</para>
@@ -1745,7 +1745,7 @@
 	  user should type in.</para>
 
 	<para>Use <sgmltag>option</sgmltag> to mark up a command's
-	  options.</para>
+	  option.</para>
 
 	<para>When referring to the same command multiple times in
 	  close proximity it is preferred to use the
--- chap.sgml-markup.diff ends here ---


>Release-Note:
>Audit-Trail:

From: "Matthew D. Fuller" <fullermd@over-yonder.net>
To: "Jesus R. Camou" <jcamou@cox.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/77288: [PATCH] use US english spelling and fix a sentence
Date: Tue, 8 Feb 2005 21:48:46 -0600

 On Tue, Feb 08, 2005 at 07:02:01PM -0700 I heard the voice of
 Jesus R. Camou, and lo! it spake thus:
 > >Category:       docs
 > >Synopsis:       [PATCH] use US english spelling and fix a sentence
 
 I'm not sure either of these are actually correct...
 
 > 		o s/defence/defense/g  (US english spelling)
 
 Since this is a quote, what matters isn't contemporary US English
 spelling, but rather what's in the document, which in this case IS
 'defence'.
 
 > 		o sentence correction:
 > 		  to mark up a command's options -> to mark up a command's option
 
 This reads right to me as it is (pluralized).
 
 
 -- 
 Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
 Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
 
 "The only reason I'm burning my candle at both ends, is because I
       haven't figured out how to light the middle yet"

From: "Jesus R. Camou" <jcamou@COX.net>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: docs/77288: [PATCH] use US english spelling and fix a sentence
Date: Tue, 8 Feb 2005 23:45:36 -0700

 > On Wed, Feb 09, 2005 at 03:50:22AM +0000, Matthew D. Fuller wrote:
 >  > >Category:       docs
 >  > >Synopsis:       [PATCH] use US english spelling and fix a sentence
 >  
 >  I'm not sure either of these are actually correct...
  
 I'm certain that defense is the correct spelling for US english.
 The FDP Primer states that US english spelling style should be used
 in the documentantion.
   
 >  
 >  > 		o s/defence/defense/g  (US english spelling)
 >  
 >  Since this is a quote, what matters isn't contemporary US English
 >  spelling, but rather what's in the document, which in this case IS
 >  'defence'.
  
 It is a quote, but having everything spelled the same way makes it
 look organized.  Plus, the quote is talking about the people of the
 United States :-).
  
 >  
 >  > 		o sentence correction:
 >  > 		  to mark up a command's options -> to mark up a command's option
 >  
 >  This reads right to me as it is (pluralized).
 
 Your right about this one.  I was reading this from a different
 perspective.  This should be ignored since it would only occupy
 space in the repo.   
 
 I was suppose to send more fixes for the entire book, I'll attach
 them all together in the same pr next time.  I wonder what would
 be a committer's criteria on this particularly change-request (the
 defence/defense change).
 
 Thanks for reviewing it!
 
 -- 
 Jesus R. Camou <jcamou@COX.net>
 jcamou@es.FreeBSD.org
 
 
State-Changed-From-To: open->closed 
State-Changed-By: trhodes 
State-Changed-When: Thu Feb 24 04:04:27 GMT 2005 
State-Changed-Why:  
None of the diff committed, sorry.  While yes, the document 
being quoted is discussing the US and is from the US, at that 
time there was no US English.  And direct quotes MUST contain 
original text unless you are paraphrasing, of which you can 
snip parts and replace with dots, like "blah ... blah." 

Your last diff chunk, I just restructured the sentence a bit, 
as I agree it was a bit awkward.  Thanks for the submission! 


Responsible-Changed-From-To: freebsd-doc->trhodes 
Responsible-Changed-By: trhodes 
Responsible-Changed-When: Thu Feb 24 04:04:27 GMT 2005 
Responsible-Changed-Why:  
Over to me. 

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