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

[apt.git] / doc / method.sgml

diff --git a/doc/method.sgml b/doc/method.sgml
index 5e782d008a5a4accf0394e42d7ecb29670dee8a7..27db501732f5bddc944b23f4a850cea9de2dcf5c 100644 (file)
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -4,7 +4,7 @@
 <title>APT Method Interface </title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>
 <title>APT Method Interface </title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>

-<version>$Id: method.sgml,v 1.9 2002/09/15 23:14:34 jgg Exp $</version>
+<version>$Id: method.sgml,v 1.10 2003/02/12 15:05:46 doogie Exp $</version>

 
 <abstract>
 This document describes the interface that APT uses to the archive
 
 <abstract>
 This document describes the interface that APT uses to the archive


@@ -20,8 +20,8 @@ by the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
 
 <p>
 option) any later version.
 
 <p>

-For more details, on Debian GNU/Linux systems, see the file
-/usr/doc/copyright/GPL for the full license.
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.

 </copyright>
 
 <toc sect>
 </copyright>
 
 <toc sect>


@@ -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
 <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>
 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>
 <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
 <item>copy - (internal) For copying files around the filesystem
 <item>file - For local files
 <item>gzip - (internal) For decompression