From 7e798dd739883c1f47216578ba8df34dced24777 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:03 +0000
Subject: Sync Author: jgg Date: 1998-10-08 04:54:58 GMT Sync

---
 doc/examples/apt.conf |  4 ++--
 doc/method.sgml       | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index 0a6477c6e..9b96a30c5 100644
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.1 1998/10/02 04:39:59 jgg Exp $
+// $Id: apt.conf,v 1.2 1998/10/08 04:55:07 jgg Exp $
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file.
@@ -43,5 +43,5 @@ DSelect {
 }
 
 Debug {
-  pkgProblemResolver "true";
+  pkgProblemResolver "false";
 }
diff --git a/doc/method.sgml b/doc/method.sgml
index f5b21786d..023bac40e 100644
--- 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>
-<version>$Id: method.sgml,v 1.2 1998/10/06 05:24:20 jgg Exp $</version>
+<version>$Id: method.sgml,v 1.3 1998/10/08 04:55:06 jgg Exp $</version>
 
 <abstract>
 This document describes the interface that APT uses to the archive
@@ -32,7 +32,7 @@ For more details, on Debian GNU/Linux systems, see the file
 <sect>General
 
 <p>
-The APT method interface allows APT to aquire archive files (.deb), index
+The APT method interface allows APT to acquire archive files (.deb), index
 files (Packages, Revision, Mirrors) and source files (.tar.gz, .diff). It
 is a general, extensible system designed to satisfy all of these
 requirements:
@@ -108,9 +108,9 @@ communication lines. The first line should have the form xxx TAG
 where xxx are digits forming the status code and TAG is an informational
 string
 
-<tag>aquire<item>
+<tag>acquire<item>
 The act of bring a URI into the local pathname space. This may simply
-be verifiying the existance of the URI or actually downloading it from
+be verifiying the existence of the URI or actually downloading it from
 a remote site.
 
 </taglist>
@@ -164,14 +164,14 @@ status code is an informational string provided for visual debugging.
 <item>100 Capabilities - Method capabilities
 <item>101 Log - General Logging
 <item>102 Status - Inter-URI status reporting (login progress)
-<item>200 URI Start - URI is starting aquire
-<item>201 URI Done - URI is finished aquire
-<item>400 URI Failure - URI has failed to aquire
+<item>200 URI Start - URI is starting acquire
+<item>201 URI Done - URI is finished acquire
+<item>400 URI Failure - URI has failed to acquire
 <item>401 General Failure - Method did not like something sent to it
 <item>402 Authorization Required - Method requires authorization
         to access the URI. Authorization is User/Pass
 <item>403 Media Failure - Method requires a media change	
-<item>600 URI Aquire - Request a URI be aquired
+<item>600 URI Acquire - Request a URI be acquired
 <item>601 Configuration - Sends the configuration space
 <item>602 Authorization Credentials - Response to the 402 message
 <item>603 Media Changed - Response to the 403 message
@@ -187,10 +187,10 @@ capable of handling an unlimited number of 600 messages.
 <p>
 The flow of messages starts with the method sending out a 
 <em>100 Capabilities</> and APT sending out a <em>601 Configuration</>.
-After that APT begins sending <em>600 URI Aquire</> and the method
+After that APT begins sending <em>600 URI Acquire</> and the method
 sends out <em>200 URI Start</>, <em>201 URI Done</> or 
 <em>400 URI Failure</>. No syncronization is performed, it is expected
-that APT will send <em>600 URI Aquire</> messages at -any- time and
+that APT will send <em>600 URI Acquire</> messages at -any- time and
 that the method should queue the messages. This allows methods like http
 to pipeline requests to the remote server. It should be noted however
 that APT will buffer messages so it is not neccessary for the method
@@ -284,10 +284,10 @@ A method that deals with multiple media requires that a new media be inserted.
 The Media field contains the name of the media to be inserted.
 Fields: Media
 
-<tag>600 URI Aquire<item>
-APT is requesting that a new URI be added to the aquire list. Last-Modified
+<tag>600 URI Acquire<item>
+APT is requesting that a new URI be added to the acquire list. Last-Modified
 has the time stamp of the currently cache file if applicable. Filename
-is the name of the file that the aquired URI should be written to.
+is the name of the file that the acquired URI should be written to.
 Fields: URI, Filename Last-Modified
 
 <tag>601 Configuration<item>
-- 
cgit v1.2.3