docs/77535: [PATCH] s/CD-ROM/CDROM/g in ports chapter of the handbook

[Jesus R. Camou]

>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:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 14 23:50:16 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: