From jcamou@opensea.mephis.org  Mon Feb 14 23:46:14 2005
Return-Path: <jcamou@opensea.mephis.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F281F16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Feb 2005 23:46:13 +0000 (GMT)
Received: from fed1rmmtao02.cox.net (fed1rmmtao02.cox.net [68.230.241.37])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FEF343D31
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Feb 2005 23:46:13 +0000 (GMT)
	(envelope-from jcamou@opensea.mephis.org)
Received: from opensea.mephis.org ([68.0.141.123]) by fed1rmmtao02.cox.net
          (InterMail vM.6.01.04.00 201-2131-117-20041022) with ESMTP
          id <20050214234610.PAFK9332.fed1rmmtao02.cox.net@opensea.mephis.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Mon, 14 Feb 2005 18:46:10 -0500
Received: from opensea.mephis.org (localhost [127.0.0.1])
	by opensea.mephis.org (8.13.1/8.13.1) with ESMTP id j1ENmfnc005099
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Feb 2005 16:48:41 -0700 (MST)
	(envelope-from jcamou@opensea.mephis.org)
Received: (from jcamou@localhost)
	by opensea.mephis.org (8.13.1/8.13.1/Submit) id j1ENmeao005098;
	Mon, 14 Feb 2005 16:48:40 -0700 (MST)
	(envelope-from jcamou)
Message-Id: <200502142348.j1ENmeao005098@opensea.mephis.org>
Date: Mon, 14 Feb 2005 16:48:40 -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] s/CD-ROM/CDROM/g in ports chapter of the handbook	
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77535
>Category:       docs
>Synopsis:       [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 14 23:50:16 GMT 2005
>Closed-Date:    Sun Feb 20 16:59:34 GMT 2005
>Last-Modified:  Sun Feb 20 16:59:34 GMT 2005
>Originator:     Jesus R. Camou
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD opensea.mephis.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Sun Feb 13 21:22:53 MST 2005 jcamou@opensea.mephis.org:/usr/obj/usr/src/sys/HACKED i386

>Description:

	s/CD-ROM/CDROM/g in ports chapter of the handbook

>How-To-Repeat:

>Fix:

--- handbook.ports.diff begins here ---
Index: chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v
retrieving revision 1.237
diff -u -r1.237 chapter.sgml
--- chapter.sgml	13 Jan 2005 15:48:00 -0000	1.237
+++ chapter.sgml	9 Feb 2005 00:51:39 -0000
@@ -399,7 +399,7 @@
       </example>
 
       <para>If you do not have a source of local packages (such as a
-        FreeBSD CD-ROM set) then it will probably be easier to use the
+        FreeBSD CDROM set) then it will probably be easier to use the
         <option>-r</option> option to &man.pkg.add.1;.  This will
         cause the utility to automatically determine the correct
         object format and release and then fetch and install the
@@ -442,7 +442,7 @@
       <para>Package files are distributed in <filename>.tgz</filename>
           and <filename>.tbz</filename> formats.  You can find them at <ulink
           url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/"></ulink>,
-          or on the FreeBSD CD-ROM distribution.  Every CD on the
+          or on the FreeBSD CDROM distribution.  Every CD on the
           FreeBSD 4-CD set (and the PowerPak, etc.) contains packages
           in the <filename>/packages</filename> directory.  The layout
           of the packages is similar to that of the
@@ -757,7 +757,7 @@
 
       <para>The port includes instructions on how to build source
         code, but does not include the actual source code.  You can
-        get the source code from a CD-ROM or from the Internet.
+        get the source code from a CDROM or from the Internet.
         Source code is distributed in whatever manner the software
         author desires.  Frequently this is a tarred and gzipped file,
         but it might be compressed with some other tool or even
@@ -790,22 +790,22 @@
       </warning>
 
       <sect3 id="ports-cd">
-        <title>Installing Ports from a CD-ROM</title>
+        <title>Installing Ports from a CDROM</title>
 
         <indexterm>
           <primary>ports</primary>
-          <secondary>installing from CD-ROM</secondary>
+          <secondary>installing from CDROM</secondary>
         </indexterm>
-        <para>The FreeBSD Project's official CD-ROM images no longer
+        <para>The FreeBSD Project's official CDROM images no longer
 	  include distfiles.  They take up a lot of room that is
-	  better used for precompiled packages.  CD-ROM products such as
+	  better used for precompiled packages.  CDROM products such as
 	  the FreeBSD PowerPak do include distfiles, and you can
 	  order these sets from a vendor such as the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.
-	  This section assumes you have such a FreeBSD CD-ROM
+	  This section assumes you have such a FreeBSD CDROM
 	  set.</para>
 
-        <para>Place your FreeBSD CD-ROM in the drive.  Mount it on
+        <para>Place your FreeBSD CDROM in the drive.  Mount it on
 	  <filename>/cdrom</filename>.  (If you use a different mount
 	  point, set <makevar>CD_MOUNTPTS</makevar> make variable.)
 	  To begin, change to the
@@ -889,11 +889,11 @@
 
         <note>
           <para>Please be aware that the licenses of a few ports do
-            not allow for inclusion on the CD-ROM.  This could be
+            not allow for inclusion on the CDROM.  This could be
             because a registration form needs to be filled out before
             downloading or redistribution is not allowed, or for
             another reason.  If you wish to install a port not
-            included on the CD-ROM, you will need to be online in
+            included on the CDROM, you will need to be online in
             order to do so (see the <link linkend="ports-inet">next
             section</link>).</para>
 	</note>
@@ -905,15 +905,15 @@
         <para>As with the last section, this section makes an
           assumption that you have a working Internet connection.  If
           you do not, you will need to perform the <link
-          linkend="ports-cd">CD-ROM installation</link>, or put a copy
+          linkend="ports-cd">CDROM installation</link>, or put a copy
           of the distfile into
           <filename>/usr/ports/distfiles</filename> manually.</para>
 
         <para>Installing a port from the Internet is done exactly the
 	  same way as it would be if you were installing from a
-	  CD-ROM.  The only difference between the two is that the
+	  CDROM.  The only difference between the two is that the
 	  distfile is downloaded from the Internet instead of read
-	  from the CD-ROM.</para>
+	  from the CDROM.</para>
 
         <para>The steps involved are identical:</para>
 
--- handbook.ports.diff ends here ---


>Release-Note:
>Audit-Trail:

From: David Adam <zanchey@ucc.gu.uwa.edu.au>
To: "Jesus R. Camou" <jcamou@cox.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-doc@FreeBSD.org
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the
 handbook 
Date: Tue, 15 Feb 2005 09:12:43 +0800 (WST)

 Hi Jesus,
 
 Seeing this patch triggered my memory - the issue has been brought up
 before. I think we need to examine docs/38225
 (http://www.freebsd.org/cgi/query-pr.cgi?pr=38225) first.
 
 My personal preference is with O'Reilly Publishing's recommendation of
 CD-ROM - http://www.oreilly.com/oreilly/author/stylesheet.html (see the
 word list at the bottom of the page).
 
 docs/38225 is almost three years old and hasn't been touched for over two
 years. Perhaps the doc committers (ceri?) can let us know?
 
 David Adam
 zanchey@ucc.gu.uwa.edu.au
 

From: Marc Fonvieille <blackend@FreeBSD.org>
To: David Adam <zanchey@ucc.gu.uwa.edu.au>
Cc: "Jesus R. Camou" <jcamou@cox.net>, freebsd-doc@FreeBSD.org,
	FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
Date: Tue, 15 Feb 2005 08:24:32 +0100

 On Tue, Feb 15, 2005 at 09:12:43AM +0800, David Adam wrote:
 > Hi Jesus,
 > 
 > Seeing this patch triggered my memory - the issue has been brought up
 > before. I think we need to examine docs/38225
 > (http://www.freebsd.org/cgi/query-pr.cgi?pr=38225) first.
 > 
 > My personal preference is with O'Reilly Publishing's recommendation of
 > CD-ROM - http://www.oreilly.com/oreilly/author/stylesheet.html (see the
 > word list at the bottom of the page).
 > 
 > docs/38225 is almost three years old and hasn't been touched for over two
 > years. Perhaps the doc committers (ceri?) can let us know?
 >
 
 Well, this is a "sensitive" problem that has been massively discussed on
 -doc in past; for historic reason CDROM has been used in FreeBSD docs
 (see Walnuts Creek CDs set...).
 For consistency, it will be a huge work to change every
 instance of the word in the doc/ tree, and I'm not sure it'll worth the
 pain, the time, the bits used, etc.
 
 Marc

From: "Jesus R. Camou" <jcamou@cox.net>
To: David Adam <zanchey@ucc.gu.uwa.edu.au>
Cc: freebsd-gnats-submit@freebsd.org, freebsd-doc@freebsd.org
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
Date: Tue, 15 Feb 2005 01:26:53 -0700

 On Tue, Feb 15, 2005 at 01:20:20AM +0000, David Adam wrote:
 > The following reply was made to PR docs/77535; it has been noted by GNATS.
 > 
 > From: David Adam <zanchey@ucc.gu.uwa.edu.au>
 > To: "Jesus R. Camou" <jcamou@cox.net>
 > Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-doc@FreeBSD.org
 > Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the
 >  handbook 
 > Date: Tue, 15 Feb 2005 09:12:43 +0800 (WST)
 > 
 >  Hi Jesus,
 >  
 >  Seeing this patch triggered my memory - the issue has been brought up
 >  before. I think we need to examine docs/38225
 >  (http://www.freebsd.org/cgi/query-pr.cgi?pr=38225) first.
 >  
 >  My personal preference is with O'Reilly Publishing's recommendation of
 >  CD-ROM - http://www.oreilly.com/oreilly/author/stylesheet.html (see the
 >  word list at the bottom of the page).
 >  
 >  docs/38225 is almost three years old and hasn't been touched for over two
 >  years. Perhaps the doc committers (ceri?) can let us know?
 
 This change-request is due to the word list in the fdp primer book.
 According to it, the FreeBSD Documentation Project should write  
 CDROM instead of CD-ROM.  I remember your pr, as well as some others
 trying to substitute CDROM with CD-ROM.  I have followed up prs to
 use the same rule but at this point it is hard to change everything
 to an specific way to spell it (even more if we are talking about
 changing everything to CD-ROM), that is why I requested this change. 
 
 It is hard to really tell how it should be written right now, I'm
 just trying to follow the rule stated.  Thanks for the comment, I
 think it would be a great idea to define how this should be done.
  
 -- 
 Jesus R. Camou <jcamou@COX.net>
 jcamou@es.FreeBSD.org
 
 

From: Marc Fonvieille <blackend@FreeBSD.org>
To: David Adam <zanchey@ucc.gu.uwa.edu.au>,
	"Jesus R. Camou" <jcamou@cox.net>, freebsd-doc@FreeBSD.org,
	FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
Date: Tue, 15 Feb 2005 11:53:07 +0100

 On Tue, Feb 15, 2005 at 08:24:32AM +0100, Marc Fonvieille wrote:
 > 
 > Well, this is a "sensitive" problem that has been massively discussed on
 > -doc in past; for historic reason CDROM has been used in FreeBSD docs
 > (see Walnuts Creek CDs set...).
 > For consistency, it will be a huge work to change every
 > instance of the word in the doc/ tree, and I'm not sure it'll worth the
 > pain, the time, the bits used, etc.
 >
 
 I was not clear enough; CD-ROM seems to be the more widely used
 spelling, most of new additions use CD-ROM, "legacy" docs use CDROM.
 Since CD-ROM may be seen as the right solution, let's keep the old
 spelling for the moment and just use CD-ROM in every new additions.
 
 Marc

From: "Simon L. Nielsen" <simon@FreeBSD.org>
To: David Adam <zanchey@ucc.gu.uwa.edu.au>,
	"Jesus R. Camou" <jcamou@cox.net>, FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
Date: Tue, 15 Feb 2005 19:09:35 +0100

 --OBd5C1Lgu00Gd/Tn
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2005.02.15 11:53:07 +0100, Marc Fonvieille wrote:
 > On Tue, Feb 15, 2005 at 08:24:32AM +0100, Marc Fonvieille wrote:
 > >=20
 > > Well, this is a "sensitive" problem that has been massively discussed on
 > > -doc in past; for historic reason CDROM has been used in FreeBSD docs
 > > (see Walnuts Creek CDs set...).
 > > For consistency, it will be a huge work to change every
 > > instance of the word in the doc/ tree, and I'm not sure it'll worth the
 > > pain, the time, the bits used, etc.
 >=20
 > I was not clear enough; CD-ROM seems to be the more widely used
 > spelling, most of new additions use CD-ROM, "legacy" docs use CDROM.
 > Since CD-ROM may be seen as the right solution, let's keep the old
 > spelling for the moment and just use CD-ROM in every new additions.
 
 If that is the general sentiment (I don't really care), I think we
 should update the FDP word list to reflect this.
 
 BTW. semi-intresting google stats:
 
 9,950,000 for CDROM
 28,800,000 for "CD-ROM"
 
 --=20
 Simon L. Nielsen
 
 --OBd5C1Lgu00Gd/Tn
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQFCEjrfh9pcDSc1mlERAj+jAKDFOXjWs3CojivNIWG1BBmmlkb/8gCdHLxj
 1ll8CXxy9AnJa0eVvLgtuFU=
 =8+7k
 -----END PGP SIGNATURE-----
 
 --OBd5C1Lgu00Gd/Tn--

From: "Jesus R. Camou" <jcamou@cox.net>
To: "Simon L. Nielsen" <simon@FreeBSD.org>
Cc: David Adam <zanchey@ucc.gu.uwa.edu.au>, freebsd-doc@FreeBSD.org,
	FreeBSD-gnats-submit@FreeBSD.org, blackend@FreeBSD.org
Subject: Re: docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook
Date: Tue, 15 Feb 2005 15:20:37 -0700

 --xgyAXRrhYN0wYx8y
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Tue, Feb 15, 2005 at 07:09:35PM +0100, Simon L. Nielsen wrote:
 > If that is the general sentiment (I don't really care), I think we
 > should update the FDP word list to reflect this.
 > 
 > BTW. semi-intresting google stats:
 > 
 > 9,950,000 for CDROM
 > 28,800,000 for "CD-ROM"
 > 
 > -- 
 > Simon L. Nielsen
 
 That is exactly what I thought while reading Marc's email.
 
 Here's a patch.
 
 -- 
 Jesus R. Camou <jcamou@COX.net>
 jcamou@es.FreeBSD.org
 
 
 
 --xgyAXRrhYN0wYx8y
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="writing-style.diff"
 
 Index: chapter.sgml
 ===================================================================
 RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v
 retrieving revision 1.42
 diff -u -r1.42 chapter.sgml
 --- chapter.sgml	11 Nov 2004 14:41:59 -0000	1.42
 +++ chapter.sgml	15 Feb 2005 22:00:03 -0000
 @@ -400,7 +400,7 @@
        </listitem>
  
        <listitem>
 -	<para>CDROM</para>
 +	<para>CD-ROM</para>
        </listitem>
  
        <listitem>
 
 --xgyAXRrhYN0wYx8y--
State-Changed-From-To: open->closed 
State-Changed-By: simon 
State-Changed-When: Sun Feb 20 16:58:56 GMT 2005 
State-Changed-Why:  
I committed the update to the FDP word list.  Thanks! 

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