Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / doc / method.sgml

diff --git a/doc/method.sgml b/doc/method.sgml
index d71ef02ea57418126d75ba13ae4e95cfed3c6926..27db501732f5bddc944b23f4a850cea9de2dcf5c 100644 (file)
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -20,7 +20,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
 
 <p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
 /usr/share/common-licenses/GPL for the full license.
 </copyright>
 
@@ -220,7 +220,7 @@ the ones it wants.
 <tag>Local<item>The method only returns Filename: fields.
 <tag>Send-Config<item>Send configuration to the method.
 <tag>Needs-Cleanup<item>The process is kept around while the files it returned
-are being used. This is primarily intended for CDROM and File URIs that need
+are being used. This is primarily intended for CD-ROM and File URIs that need
 to unmount filesystems.
 <tag>Version<item>Version string for the method
 </taglist>
@@ -318,7 +318,7 @@ Fields: Media, Fail
 <p>
 The methods supplied by the stock apt are:
 <enumlist>
-<item>cdrom - For Multi-Disc CDROMs
+<item>cdrom - For Multi-Disc CD-ROMs
 <item>copy - (internal) For copying files around the filesystem
 <item>file - For local files
 <item>gzip - (internal) For decompression