From 25838be607c1a61783060c352d1842cd23b2677f Mon Sep 17 00:00:00 2001
From: Justin B Rye <jbr@edlug.org.uk>
Date: Fri, 25 May 2012 09:45:59 +0200
Subject: * doc/apt-cdrom.8.xml:   - replace CDROM with the proper CD-ROM in
 text

---
 doc/apt.conf.5.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc/apt.conf.5.xml')

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index bb538c660..299cc7b2a 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -427,8 +427,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>cdrom</option></term>
-     <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point, 
-     <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive 
+     <listitem><para>CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, 
+     <literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM drive 
      as specified in <filename>/etc/fstab</filename>. It is possible to provide 
      alternate mount and unmount commands if your mount point cannot be listed 
      in the fstab (such as an SMB mount and old mount packages). The syntax 
@@ -773,7 +773,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        <listitem>
 	 <para>
 	   <literal>Debug::IdentCdrom</literal> disables the inclusion
-	   of statfs data in CDROM IDs.  <!-- TODO: provide a
+	   of statfs data in CD-ROM IDs.  <!-- TODO: provide a
 	   motivating example, except I haven't a clue why you'd want
 	   to do this. -->
 	 </para>
-- 
cgit v1.2.3