[SCM] UNNAMED PROJECT branch, master, updated. 20090201-1-45-g46c2aeb

[Chris Lamb]

The following commit has been merged in the master branch:
commit 53d719a46900d5edaa52fd4960656febef4470ef
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Feb 22 14:16:06 2009 +0000

    Plural of CD is "CDs", not "CD's" (etc.)

diff --git a/xml/chapters/about/manual.xml b/xml/chapters/about/manual.xml
index 2e9881c..102be96 100644
--- a/xml/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -15,7 +15,7 @@
 
 <variablelist>
 <varlistentry><term>Live system</term>
-<listitem><para>An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CD's or DVD's, some may also boot with USB sticks or over the network (via netboot images).</para></listitem>
+<listitem><para>An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs or DVDs, some may also boot with USB sticks or over the network (via netboot images).</para></listitem>
 </varlistentry>
 
 <varlistentry><term>Debian Live</term>
@@ -23,7 +23,7 @@
 </varlistentry>
 
 <varlistentry><term>Debian Live system</term>
-<listitem><para>A live system that uses software from the Debian operating system that may be booted from CD's, DVD's, USB sticks, over the network (via netboot images), and over the internet (via boot parameter fetch=URL)</para></listitem>
+<listitem><para>A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter fetch=URL)</para></listitem>
 </varlistentry>
 
 <varlistentry><term>Build system / host system</term>

-- 
UNNAMED PROJECT