In the Creating and Using Optical Media (CDs) section:

- s/acd0c/acd0/ and mention in various places 4.X needs the
  trailing c [1]
- The ATAPI/CAM section is just a cut&paste from an article I wrote for
  bsdnews.org, so let's mention the author.

PR:		docs/62097 [1]
Submitted by:	Marc Blanchet <marc.blanchet@viagenie.qc.ca>

1 files changed, 23 insertions, 13 deletions

diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
index e100733275..c74c30f5b8 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
@@ -907,7 +907,7 @@ ar0: ATA RAID1 subdisks: ad4 ad6 status: REBUILDING 0% completed</screen>
 
       <para>Will burn a copy of <replaceable>imagefile.iso</replaceable> on
 	<replaceable>cddevice</replaceable>. The default device is
-	<filename>/dev/acd0c</filename>. See &man.burncd.8; for options to
+	<filename>/dev/acd0</filename> (or <filename>/dev/acd0c</filename> under &os;&nbsp;4.X). See &man.burncd.8; for options to
 	set the write speed, eject the CD after burning, and write audio
 	data.</para>
     </sect2>
@@ -1044,7 +1044,7 @@ scsibus1:
 	    files, and that <command>burncd</command> should fixate the disk
 	    when finished.</para>
 
-	  <screen>&prompt.root; <userinput>burncd -f <replaceable>/dev/acd0c</replaceable> audio track1.cdr track2.cdr <replaceable>...</replaceable> fixate</userinput></screen>
+	  <screen>&prompt.root; <userinput>burncd -f <replaceable>/dev/acd0</replaceable> audio track1.cdr track2.cdr <replaceable>...</replaceable> fixate</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1057,11 +1057,11 @@ scsibus1:
 	<filename role="package">sysutils/mkisofs</filename>, and you can use it to duplicate
 	any data CD.  The example given here assumes that your CDROM
 	device is <devicename>acd0</devicename>.  Substitute your
-	correct CDROM device.  A <literal>c</literal> must be appended
+	correct CDROM device.  Under &os;&nbsp;4.X, a <literal>c</literal> must be appended
 	to the end of the device name to indicate the entire partition
 	or, in the case of CDROMs, the entire disc.</para>
 
-      <screen>&prompt.root; <userinput>dd if=/dev/acd0c of=file.iso bs=2048</userinput></screen>
+      <screen>&prompt.root; <userinput>dd if=/dev/acd0 of=file.iso bs=2048</userinput></screen>
 
       <para>Now that you have an image, you can burn it to CD as
 	described above.</para>
@@ -1075,7 +1075,7 @@ scsibus1:
 	default, &man.mount.8; assumes that a file system is of type
 	<literal>ufs</literal>.  If you try something like:</para>
 
-      <screen>&prompt.root; <userinput>mount /dev/cd0c /mnt</userinput></screen>
+      <screen>&prompt.root; <userinput>mount /dev/cd0 /mnt</userinput></screen>
 
       <para>you will get a complaint about <errorname>Incorrect super
 	  block</errorname>, and no mount. The CDROM is not a
@@ -1085,19 +1085,19 @@ scsibus1:
 	  everything will work.  You do this by specifying the
 	  <option>-t cd9660</option> option &man.mount.8;. For
 	  example, if you want to mount the CDROM device,
-	  <devicename>/dev/cd0c</devicename>, under
+	  <devicename>/dev/cd0</devicename>, under
 	  <filename>/mnt</filename>, you would execute:</para>
 
-          <screen>&prompt.root; <userinput>mount -t cd9660 /dev/cd0c /mnt</userinput></screen>
+          <screen>&prompt.root; <userinput>mount -t cd9660 /dev/cd0 /mnt</userinput></screen>
 
       <para>Note that your device name
-	(<devicename>/dev/cd0c</devicename> in this example) could be
+	(<devicename>/dev/cd0</devicename> in this example) could be
 	different, depending on the interface your CDROM uses. Also,
 	the <option>-t cd9660</option> option just executes
 	&man.mount.cd9660.8;. The above example could be shortened
 	to:</para>
 
-<screen>&prompt.root; <userinput>mount_cd9660 /dev/cd0c /mnt</userinput></screen>
+<screen>&prompt.root; <userinput>mount_cd9660 /dev/cd0 /mnt</userinput></screen>
 
       <para>You can generally use data CDROMs from any vendor in this
 	way.  Disks with certain ISO 9660 extensions might behave
@@ -1117,7 +1117,7 @@ scsibus1:
 	It can take a couple of seconds for a CDROM drive to realize
 	that it has been fed, so be patient.</para>
 
-      <para>Sometimes, a SCSI CDROM may be missed because it didn't
+      <para>Sometimes, a SCSI CDROM may be missed because it did not
 	have enough time to answer the bus reset.  If you have a SCSI
 	CDROM please add the following option to your kernel
 	configuration and <link linkend="kernelconfig-building">rebuild your kernel</link>.</para>
@@ -1137,12 +1137,12 @@ scsibus1:
 	backup purposes.  This runs more quickly than burning a
 	standard CD:</para>
 
-      <screen>&prompt.root; <userinput>burncd -f /dev/acd1c -s 12 data archive.tar.gz fixate</userinput></screen>
+      <screen>&prompt.root; <userinput>burncd -f /dev/acd1 -s 12 data archive.tar.gz fixate</userinput></screen>
 
       <para>In order to retrieve the data burned to such a CD, you
 	  must read data from the raw device node:</para>
 
-      <screen>&prompt.root; <userinput>tar xzvf /dev/acd1c</userinput></screen>
+      <screen>&prompt.root; <userinput>tar xzvf /dev/acd1</userinput></screen>
 
       <para>You cannot mount this disk as you would a normal CDROM.
 	  Such a CDROM cannot be read under any operating system
@@ -1152,6 +1152,16 @@ scsibus1:
     </sect2>
 
     <sect2 id="atapicam">
+      <sect2info>
+	<authorgroup>
+	  <author>
+	    <firstname>Marc</firstname>
+	    <surname>Fonvieille</surname>
+	    <contrib>Contributed by </contrib>
+	  </author>
+	</authorgroup>
+      </sect2info>
+
       <indexterm>
 	<primary>CD burner</primary>
 	<secondary>ATAPI/CAM driver</secondary>
@@ -1195,7 +1205,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	mount a CD-ROM on <filename>/mnt</filename>, just type the
 	following:</para>
 
-      <screen>&prompt.root; <userinput>mount -t cd9660 <replaceable>/dev/cd0c</replaceable> /mnt</userinput></screen>
+      <screen>&prompt.root; <userinput>mount -t cd9660 <replaceable>/dev/cd0</replaceable> /mnt</userinput></screen>
 
       <para>As <username>root</username>, you can run the following
 	command to get the SCSI address of the burner:</para>