summaryrefslogtreecommitdiff
path: root/doc/method.sgml
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2012-06-11 15:13:24 -0700
committerSteve Langasek <steve.langasek@canonical.com>2012-06-11 15:13:24 -0700
commit825098c2740b2d5ebea0c16c43685f55da201315 (patch)
treeb3a43f792cca021a79f541a9454e0223e4dca9cb /doc/method.sgml
parent310ed3c13d5cfd2a3c46741539f652d69bda5d30 (diff)
parente08c5854bb9b5f352b0856533f95c12e858728ca (diff)
Merge version 0.9.6 from Debian
Diffstat (limited to 'doc/method.sgml')
-rw-r--r--doc/method.sgml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/method.sgml b/doc/method.sgml
index 3bee47d3a..27db50173 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -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