Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

[ntk/apt.git] / doc / method.sgml

diff --git a/doc/method.sgml b/doc/method.sgml
index 3bee47d..5aa7b52 100644 (file)
--- 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>
@@ -246,14 +246,14 @@ pre-transfer status for Internet type methods.
 Fields: Message
 
 <tag>200 URI Start<item>
-Indicates the URI is starting to be transfered. The URI is specified
+Indicates the URI is starting to be transferred. The URI is specified
 along with stats about the file itself.
 Fields: URI, Size, Last-Modified, Resume-Point
 
 <tag>201 URI Done<item>
-Indicates that a URI has completed being transfered. It is possible
+Indicates that a URI has completed being transferred. It is possible
 to specify a <em>201 URI Done</> without a <em>URI Start</> which would
-mean no data was transfered but the file is now available. A Filename
+mean no data was transferred but the file is now available. A Filename
 field is specified when the URI is directly available in the local 
 pathname space. APT will either directly use that file or copy it into 
 another location. It is possible to return Alt-* fields to indicate that
@@ -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