-diff -ur apt-0.3.19cnc52.orig/doc/apt-cache.8 apt-0.3.19cnc52/doc/apt-cache.8
---- apt-0.3.19cnc52.orig/doc/apt-cache.8 Tue Nov 27 00:31:59 2001
-+++ apt-0.3.19cnc52/doc/apt-cache.8 Wed Nov 28 23:52:11 2001
-@@ -3,7 +3,7 @@
- apt-cache \- APT package handling utility -- cache manipulator
- .PP
- .SH "SYNOPSIS"
--apt-cache command [argument \&.\&.\&.]
-+apt-cache [options] [command [argument \&.\&.\&.]]
- .PP
- .SH "DESCRIPTION"
- \fBapt-cache\fP performs a variety of operations on APT\'s package cache\&.
-@@ -12,11 +12,11 @@
- .PP
- \fIcommand\fP is one of:
- .IP o
--add file1 [file2] [\&.\&.\&.]
-+add file1 [file2 [\&.\&.\&.]]
- .IP o
- gencaches
- .IP o
--showpkg package1 [package2] [\&.\&.\&.]
-+showpkg package1 [package2 [\&.\&.\&.]]
- .IP o
- stats
- .IP o
-@@ -47,7 +47,7 @@
- \fBadd\fP adds the names package index files to the package cache\&.
- .IP
- .IP "\fBgencaches\fP"
--\fBgencaches\fP performs the same opration as \fBapt-get check\fP\&. It builds
-+\fBgencaches\fP performs the same operation as \fBapt-get check\fP\&. It builds
- the source and package caches from thes sources in \fB/etc/apt/sources\&.list\fP
- and from \fB/var/lib/dpkg/status\fP (or the RPM database)\&.
- .IP
-@@ -92,7 +92,7 @@
-
-
- .IP
--Thus it may be seen that libreadline2, version 2\&.1-8, depends on libc5,
-+Thus it may be seen that libreadline2, version 2\&.1-12, depends on libc5,
- ncurses3\&.0, and ldso, which must be installed for libreadline2 to work\&. In
- turn, libreadlineg2 and libreadline2-altdev depend on libreadline2\&. If
- libreadline2 is installed, libc5, ncurses3\&.0, and ldso must also be
-@@ -135,7 +135,7 @@
- .IP o
- \fBMissing\fP is the number of package names that were referenced in a
- dependency but were not provided by any package\&. Missing packages may be
--in evidence if a full distribution is not accesssed, or if a package
-+in evidence if a full distribution is not accessed, or if a package
- (real or virtual) has been dropped from the distribution\&.
- .IP
- .IP o
-@@ -174,7 +174,7 @@
- .IP
- .IP "\fBsearch\fP"
- \fBsearch\fP performs a full text search on all available package files for
--the pattern given\&. It searchs the package names and the descriptions for
-+the pattern given\&. It searches the package names and the descriptions for
- an occurance of the string and prints out the package name and the short
- description\&. If --full is given then output identical to \fBshow\fP is produced
- for each matched package and if --names-only is given then the long
-@@ -187,11 +187,11 @@
- .IP "\fBpkgnames\fP"
- This command prints the name of each package in the system\&. The optional
- argument is a prefix match to filter the name list\&. The output is suitable
--for use in a shell tab complete function and the output is generated extremly
-+for use in a shell tab complete function and the output is generated extremely
- quickly\&. This command is best used with the \fB--no-generate\fP option\&.
- .IP
- .IP "\fBdotty\fP"
--\fBdotty\fP Takes a list of packages on the command line and gernerates output
-+\fBdotty\fP Takes a list of packages on the command line and generates output
- suitable for use by dotty from the GraphVis
- (http://www\&.research\&.att\&.com/sw/tools/graphviz/) package\&. The result will be
- a set of nodes and edges representing the relationships between the
-@@ -199,10 +199,10 @@
- which can produce a very large graph\&. This can be turned off by setting the
- APT::Cache::GivenOnly option\&.
- .IP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-cache.8 apt-0.5.4cnc7/doc/apt-cache.8
+--- apt-0.5.4cnc7.orig/doc/apt-cache.8 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-cache.8 Tue Dec 10 16:34:49 2002
+@@ -23,7 +23,7 @@
+ add adds the names package index files to the package cache.
+ .TP
+ \fBgencaches\fR
+-gencaches performs the same opration as
++gencaches performs the same operation as
+ \fBapt-get check\fR. It builds the source and package caches from
+ the sources in \fB\fIsources.list\fB\fR(5) and from \fI/var/lib/dpkg/status\fR.
+ .TP
+@@ -101,7 +101,7 @@
+ \(bu
+ Missing is the number of package names that were referenced in
+ a dependency but were not provided by any package. Missing packages may
+-be in evidence if a full distribution is not accesssed, or if a package
++be in evidence if a full distribution is not accessed, or if a package
+ (real or virtual) has been dropped from the distribution. Usually they
+ are referenced from Conflicts statements.
+ .TP 0.2i
+@@ -137,7 +137,7 @@
+ .TP
+ \fBsearch\fR
+ search performs a full text search on all available package
+-files for the regex pattern given. It searchs the package names and the
++files for the regex pattern given. It searches the package names and the
+ descriptions for an occurance of the string and prints out the package
+ name and the short description. If \fB--full\fR is given then output
+ identical to show is produced for each matched package and
+@@ -155,12 +155,12 @@
+ This command prints the name of each package in the system. The optional
+ argument is a prefix match to filter the name list. The output is suitable
+ for use in a shell tab complete function and the output is generated
+-extremly quickly. This command is best used with the
++extremely quickly. This command is best used with the
+ \fB--generate\fR option.
+ .TP
+ \fBdotty\fR
+ dotty takes a list of packages on the command line and
+-gernerates output suitable for use by dotty from the
++generates output suitable for use by dotty from the
+ GraphVis <URL:http://www.research.att.com/sw/tools/graphviz/>
+ package. The result will be a set of nodes and edges representing the
+ relationships between the packages. By default the given packages will
+@@ -168,10 +168,10 @@
+ This can be turned off by setting the
+ APT::Cache::GivenOnly option.
+
-The resulting nodes will have several shapse, normal packages are boxes,
+The resulting nodes will have several shapes, normal packages are boxes,
pure provides are triangles, mixed provides are diamonds,
- hexagons are missing packages\&. Orange boxes mean recursion was stopped
--[leaf packages], blue lines are prre-depends, green lines are conflicts\&.
-+[leaf packages], blue lines are pre-depends, green lines are conflicts\&.
- .IP
- Caution, dotty cannot graph larger sets of packages\&.
- .IP
-@@ -213,43 +213,43 @@
- options you can override the config file by using something like \fB-f-\fP,
- \fB--no-f\fP, \fB-f=no\fP or several other variations\&.
- .PP
--.IP "\fB-h, --help\fP"
-+.IP "\fB-h\fP, \fB--help\fP"
- Show a short usage summary\&.
- .IP
--.IP "\fB-v, --version\fP"
--Show the program verison\&.
-+.IP "\fB-v\fP, \fB--version\fP"
-+Show the program version\&.
- .IP
--.IP "\fB-p --pkg-cache\fP"
-+.IP "\fB-p\fP, \fB--pkg-cache\fP"
- Select the file to store the package cache\&. The package cache is the primary
- cache used by all operations\&.
- Configuration Item: \fBDir::Cache::pkgcache\fP\&.
- .IP
--.IP "\fB-s --src-cache\fP"
-+.IP "\fB-s\fP, \fB--src-cache\fP"
- Select the file to store the source cache\&. The source is used only by
- \fBgencaches\fP and it stores a parsed version of the package information from
- remote sources\&. When building the package cache the source cache is used
- to advoid reparsing all of the package files\&.
- Configuration Item: \fBDir::Cache::srcpkgcache\fP\&.
- .IP
--.IP "\fB-q, --quiet\fP"
-+.IP "\fB-q\fP, \fB--quiet\fP"
- Quiet; produces output suitable for logging, omitting progress indicators\&.
--More qs will produce more quite up to a maximum of 2\&. You can also use
-+More qs will produce more quiet up to a maximum of 2\&. You can also use
- \fB-q=#\fP to set the quiet level, overriding the configuration file\&.
- Configuration Item: \fBquiet\fP\&.
- .IP
--.IP "\fB-i --important\fP"
-+.IP "\fB-i\fP, \fB--important\fP"
- Print only important deps; for use with unmet causes only \fIDepends\fP and
- \fIPre-Depends\fP relations to be printed\&.
- Configuration Item: \fBAPT::Cache::Important\fP\&.
- .IP
--.IP "\fB-f --full\fP"
-+.IP "\fB-f\fP, \fB--full\fP"
- Print full package records when searching\&. Configuration Item: \fBAPT::Cache::ShowFull\fP\&.
- .IP
--.IP "\fB-a --all-versions\fP"
-+.IP "\fB-a\fP, \fB--all-versions\fP"
- Print full records for all available versions, this is only applicable to the
--show command\&. Configuration Item: \fBAPT::Cache::AllVersions\fP
-+show command\&. Configuration Item: \fBAPT::Cache::AllVersions\fP\&.
- .IP
--.IP "\fB-g --no-generate\fP"
-+.IP "\fB-g\fP, \fB--no-generate\fP"
- Do not perform automatic package cache regeneration, use the cache as it is\&.
- Configuration Item: \fBAPT::Cache::NoGenerate\fP\&.
- .IP
-@@ -261,13 +261,13 @@
- Make \fBpkgnames\fP print all names, including virtual packages and missing
- dependencies\&. Configuration Item: \fBAPT::Cache::AllNames\fP\&.
- .IP
--.IP "\fB-c, --config-file\fP"
--Configuration File; Specify a configuration file to use\&. \fBapt-get\fP will
-+.IP "\fB-c\fP, \fB--config-file\fP"
-+Configuration File; Specify a configuration file to use\&. \fBapt-cache\fP will
- read the default configuration file and then this configuration file\&. See
- \fBapt\&.conf(5)\fP for syntax information\&.
- .IP
--.IP "\fB-o, --option\fP"
--Set a Configuration Option; This will set an arbitary configuration option\&.
-+.IP "\fB-o\fP, \fB--option\fP"
-+Set a Configuration Option; This will set an arbitrary configuration option\&.
- The syntax is
-
- .nf
-@@ -285,6 +285,7 @@
- .IP o
- /var/lib/apt/lists/
- storage area for state information for each package resource specified in
-+the source list
- .IP
- .IP o
- /var/lib/apt/lists/partial/
-@@ -305,7 +306,7 @@
- system, please use http://distro\&.conectiva\&.com\&.br/bugzilla/\&.
- .PP
- .SH "AUTHOR"
--apt-get was written by the APT team <apt@packages\&.debian\&.org>
-+apt-cache was written by the APT team <apt@packages\&.debian\&.org>
- and ported to RPM based systems by
- Alfredo K. Kojima, Conectiva S.A. <kojima@conectiva\&.com\&.br>\&.
+ hexagons are missing packages. Orange boxes mean recursion was stopped
+-[leaf packages], blue lines are prre-depends, green lines are conflicts.
++[leaf packages], blue lines are pre-depends, green lines are conflicts.
-diff -ur apt-0.3.19cnc52.orig/doc/apt-cdrom.8 apt-0.3.19cnc52/doc/apt-cdrom.8
---- apt-0.3.19cnc52.orig/doc/apt-cdrom.8 Tue Nov 27 00:31:59 2001
-+++ apt-0.3.19cnc52/doc/apt-cdrom.8 Wed Nov 28 23:50:18 2001
-@@ -3,7 +3,7 @@
- apt-cdrom \- APT CDROM managment utility
- .PP
- .SH "SYNOPSIS"
--apt-cdrom command
-+apt-cdrom [options] [command]
- .PP
- .SH "DESCRIPTION"
- \fBapt-cdrom\fP is used to add a new CDROM to APTs list of available sources\&.
-@@ -13,16 +13,16 @@
- be done by hand\&. Furthermore each disk in a multi-cd set must be inserted
- and scanned seperately to account for possible mis-burns\&.
- .PP
--\fIcommand\fP is one of:
-+\fIcommand\fP is:
- .IP o
- add
- .PP
--Unless the -h, or --help option is given one of the above commands
-+Unless the -h, or --help option is given the above command
- must be present\&.
- .PP
- .IP "\fBadd\fP"
- \fBadd\fP is used to add a new disc to the source list\&. It will unmount the
--CDROM device, prompt for a disk to be inserted and then procceed to scan it
-+CDROM device, prompt for a disk to be inserted and then proceed to scan it
- and copy the index files\&. If the disc does not have a proper \fB\&.disk/\fP
- directory you will be prompted for a descriptive title\&.
- .IP
-@@ -36,50 +36,50 @@
- options you can override the config file by using something like \fB-f-\fP,
- \fB--no-f\fP, \fB-f=no\fP or several other variations\&.
- .PP
--.IP "\fB-h, --help\fP"
-+.IP "\fB-h\fP, \fB--help\fP"
- Show a short usage summary\&.
- .IP
--.IP "\fB-v, --version\fP"
--Show the program verison\&.
-+.IP "\fB-v\fP, \fB--version\fP"
-+Show the program version\&.
- .IP
--.IP "\fB-d --cdrom\fP"
-+.IP "\fB-d\fP, \fB--cdrom\fP"
- Mount point; specify the location to mount the cdrom\&. This mount point must
- be listed in \fB/etc/fstab\fP and propely configured\&.
- Configuration Item: \fBAcquire::cdrom::mount\fP\&.
- .IP
--.IP "\fB-r --rename\fP"
-+.IP "\fB-r\fP, \fB--rename\fP"
- Rename a disc; change the label of a disk or override the disks given label\&.
--This option will cause \fBapt-cdrom\fP to prompt for a new label
-+This option will cause \fBapt-cdrom\fP to prompt for a new label\&.
- Configuration Item: \fBAPT::CDROM::Rename\fP\&.
- .IP
--.IP "\fB-m, --no-mount\fP"
-+.IP "\fB-m\fP, \fB--no-mount\fP"
- No mounting; prevent \fBapt-cdrom\fP from mounting and unmounting the mount
- point\&.
- Configuration Item: \fBAPT::CDROM::NoMount\fP\&.
- .IP
--.IP "\fB-f, --fast\fP"
--Fast Copy; Assume the package files are valid and do not check every package\&.
-+.IP "\fB-f\fP, \fB--fast\fP"
-+Fast Copy; assume the package files are valid and do not check every package\&.
- This option should be used only if \fBapt-cdrom\fP has been run on this disc
- before and did not detect any errors\&.
- Configuration Item: \fBAPT::CDROM::Fast\fP\&.
- .IP
--.IP "\fB-a, --thorough\fP"
--Thorough Package Scan; This option may be needed with some old Debian 1\&.1/1\&.2
-+.IP "\fB-a\fP, \fB--thorough\fP"
-+Thorough Package Scan; this option may be needed with some old Debian 1\&.1/1\&.2
- burns that have Package files in strange places\&. It takes much longer to
- scan the CD but will pick them all up\&.
- .IP
--.IP "\fB-n --just-print, --recon, --no-act\fP"
--No Changes; Do not change the sources\&.list and do not write package files\&.
-+.IP "\fB-n\fP, \fB--just-print\fP, \fB--recon\fP, \fB--no-act\fP"
-+No Changes; do not change the sources\&.list and do not write package files\&.
- Everything is still checked however\&.
- Configuration Item: \fBAPT::CDROM::NoAct\fP\&.
- .IP
--.IP "\fB-c, --config-file\fP"
--Configuration File; Specify a configuration file to use\&. \fBapt-get\fP will
-+.IP "\fB-c\fP, \fB--config-file\fP"
-+Configuration File; specify a configuration file to use\&. \fBapt-cdrom\fP will
- read the default configuration file and then this configuration file\&. See
- \fBapt\&.conf(5)\fP for syntax information\&.
- .IP
--.IP "\fB-o, --option\fP"
--Set a Configuration Option; This will set an arbitary configuration option\&.
-+.IP "\fB-o\fP, \fB--option\fP"
-+Set a Configuration Option; this will set an arbitrary configuration option\&.
- The syntax is
+ Caution, dotty cannot graph larger sets of packages.
+ .TP
+@@ -208,7 +208,7 @@
+ .TP
+ \fB--quiet\fR
+ Quiet; produces output suitable for logging, omitting progress indicators.
+-More qs will produce more quite up to a maximum of 2. You can also use
++More qs will produce more quiet up to a maximum of 2. You can also use
+ \fB-q=#\fR to set the quiet level, overriding the configuration file.
+ Configuration Item: quiet.
+ .TP
+@@ -261,7 +261,7 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+@@ -273,7 +273,7 @@
+ \fB-o\fR
+ .TP
+ \fB--option\fR
+-Set a Configuration Option; This will set an arbitary configuration
++Set a Configuration Option; This will set an arbitrary configuration
+ option. The syntax is \fB-o Foo::Bar=bar\fR.
+ .SH "FILES"
+ .TP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-cache.8.sgml apt-0.5.4cnc7/doc/apt-cache.8.sgml
+--- apt-0.5.4cnc7.orig/doc/apt-cache.8.sgml Thu Jul 25 20:07:18 2002
++++ apt-0.5.4cnc7/doc/apt-cache.8.sgml Tue Dec 10 16:41:34 2002
+@@ -67,7 +67,7 @@
+
+ <VarListEntry><Term>gencaches</Term>
+ <ListItem><Para>
+- <literal/gencaches/ performs the same opration as
++ <literal/gencaches/ performs the same operation as
+ <command/apt-get check/. It builds the source and package caches from
+ the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>.
+ </VarListEntry>
+@@ -152,7 +152,7 @@
+ <listitem><para>
+ <literal/Missing/ is the number of package names that were referenced in
+ a dependency but were not provided by any package. Missing packages may
+- be in evidence if a full distribution is not accesssed, or if a package
++ be in evidence if a full distribution is not accessed, or if a package
+ (real or virtual) has been dropped from the distribution. Usually they
+ are referenced from Conflicts statements.
+ </listitem>
+@@ -208,7 +208,7 @@
+ <VarListEntry><Term>search</Term>
+ <ListItem><Para>
+ <literal/search/ performs a full text search on all available package
+- files for the regex pattern given. It searchs the package names and the
++ files for the regex pattern given. It searches the package names and the
+ descriptions for an occurance of the string and prints out the package
+ name and the short description. If <option/--full/ is given then output
+ identical to <literal/show/ is produced for each matched package and
+@@ -230,14 +230,14 @@
+ This command prints the name of each package in the system. The optional
+ argument is a prefix match to filter the name list. The output is suitable
+ for use in a shell tab complete function and the output is generated
+- extremly quickly. This command is best used with the
++ extremely quickly. This command is best used with the
+ <option/--generate/ option.
+ </VarListEntry>
+
+ <VarListEntry><Term>dotty</Term>
+ <ListItem><Para>
+ <literal/dotty/ takes a list of packages on the command line and
+- gernerates output suitable for use by dotty from the
++ generates output suitable for use by dotty from the
+ <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
+ package. The result will be a set of nodes and edges representing the
+ relationships between the packages. By default the given packages will
+@@ -246,10 +246,10 @@
+ <literal>APT::Cache::GivenOnly</> option.
- .nf
-@@ -97,6 +97,7 @@
- .IP o
- /var/lib/apt/lists/
- storage area for state information for each package resource specified in
-+the source list
- .IP
- .IP o
- /var/lib/apt/lists/partial/
-@@ -121,7 +122,7 @@
- system, please use http://distro\&.conectiva\&.com\&.br/bugzilla/\&.
- .PP
- .SH "AUTHOR"
--apt-get was written by the APT team <apt@packages\&.debian\&.org>
-+apt-cdrom was written by the APT team <apt@packages\&.debian\&.org>
- and ported to RPM based systems by Conectiva S.A.
- <kojima@conectiva\&.com\&.br>\&.
+ <para>
+- The resulting nodes will have several shapse, normal packages are boxes,
++ The resulting nodes will have several shapes, normal packages are boxes,
+ pure provides are triangles, mixed provides are diamonds,
+ hexagons are missing packages. Orange boxes mean recursion was stopped
+- [leaf packages], blue lines are prre-depends, green lines are conflicts.
++ [leaf packages], blue lines are pre-depends, green lines are conflicts.
-diff -ur apt-0.3.19cnc52.orig/doc/apt-config.8 apt-0.3.19cnc52/doc/apt-config.8
---- apt-0.3.19cnc52.orig/doc/apt-config.8 Thu Oct 26 18:22:51 2000
-+++ apt-0.3.19cnc52/doc/apt-config.8 Wed Nov 28 23:50:18 2001
-@@ -3,11 +3,11 @@
- apt-config \- APT Configuration Query program
- .PP
- .SH "SYNOPSIS"
--apt-config command
-+apt-config [options] [command [argument \&.\&.\&.]]
- .PP
- .SH "DESCRIPTION"
- \fBapt-config\fP is an internal program used by various portions of the APT
--suite to provide consistent configurability\&. It accesses the main configuarion
-+suite to provide consistent configurability\&. It accesses the main configuration
- file /etc/apt/apt\&.conf in a manner that is easy to use by scripted
- applications\&.
- .PP
-@@ -57,19 +57,19 @@
- options you can override the config file by using something like \fB-f-\fP,
- \fB--no-f\fP, \fB-f=no\fP or several other variations\&.
- .PP
--.IP "\fB-h, --help\fP"
-+.IP "\fB-h\fP, \fB--help\fP"
- Show a short usage summary\&.
- .IP
--.IP "\fB-v, --version\fP"
--Show the program verison\&.
-+.IP "\fB-v\fP, \fB--version\fP"
-+Show the program version\&.
- .IP
--.IP "\fB-c, --config-file\fP"
--Configuration File; Specify a configuration file to use\&. \fBapt-get\fP will
-+.IP "\fB-c\fP, \fB--config-file\fP"
-+Configuration File; Specify a configuration file to use\&. \fBapt-config\fP will
- read the default configuration file and then this configuration file\&. See
- \fBapt\&.conf(5)\fP for syntax information\&.
- .IP
--.IP "\fB-o, --option\fP"
--Set a Configuration Option; This will set an arbitary configuration option\&.
-+.IP "\fB-o\fP, \fB--option\fP"
-+Set a Configuration Option; This will set an arbitrary configuration option\&.
- The syntax is
-
- .nf
-@@ -92,6 +92,6 @@
- system, please use http://distro\&.conectiva\&.com\&.br/bugzilla/\&.
- .PP
- .SH "AUTHOR"
--apt-get was written by the APT team <apt@packages\&.debian\&.org>
-+apt-config was written by the APT team <apt@packages\&.debian\&.org>
- and ported to RPM based systems by Conectiva S.A.
- <kojima@conectiva\&.com\&.br>\&.
-diff -ur apt-0.3.19cnc52.orig/doc/apt-get.8 apt-0.3.19cnc52/doc/apt-get.8
---- apt-0.3.19cnc52.orig/doc/apt-get.8 Tue Nov 27 00:31:59 2001
-+++ apt-0.3.19cnc52/doc/apt-get.8 Wed Nov 28 23:51:36 2001
-@@ -3,7 +3,7 @@
- apt-get \- APT package handling utility -- command-line interface
- .PP
- .SH "SYNOPSIS"
--apt-get [options] [command] [package \&.\&.\&.]
-+apt-get [options] [command [package \&.\&.\&.]]
- .PP
- .SH "DESCRIPTION"
- .PP
-@@ -20,11 +20,11 @@
- .IP o
- dist-upgrade
- .IP o
--install package1 [package2] [\&.\&.\&.]
-+install package1 [package2 [\&.\&.\&.]]
- .IP o
--remove package1 [package2] [\&.\&.\&.]
-+remove package1 [package2 [\&.\&.\&.]]
- .IP o
--source package1 [package2] [\&.\&.\&.]
-+source package1 [package2 [\&.\&.\&.]]
- .IP o
- check
- .IP o
-@@ -71,7 +71,7 @@
- This command is only available on Debian systems.
- .IP
- .IP "\fBdist-upgrade\fP"
--\fBdist-upgrade\fP,in addition to performing the function of \fBupgrade\fP,
-+\fBdist-upgrade\fP, in addition to performing the function of \fBupgrade\fP,
- also intelligently handles changing dependencies with new versions of
- packages; \fBapt-get\fP has a "smart" conflict resolution system, and it will
- attempt to upgrade the most important packages at the expense of less
-@@ -143,11 +143,11 @@
- options you can override the config file by using something like \fB-f-\fP,
- \fB--no-f\fP, \fB-f=no\fP or several other variations\&.
- .PP
--.IP "\fB-d, --download-only\fP"
-+.IP "\fB-d\fP, \fB--download-only\fP"
- Download only; package files are only retrieved, not unpacked or installed\&.
- Configuration Item: \fBAPT::Get::Download-Only\fP\&.
- .IP
--.IP "\fB-f, --fix-broken\fP"
-+.IP "\fB-f\fP, \fB--fix-broken\fP"
- Fix; attempt to correct a system with broken dependencies in
- place\&. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely solition\&. Any Package that are specified
-@@ -159,13 +159,13 @@
- the offending packages)\&. Use of this option together with -m may produce an
- error in some situations\&. Configuration Item: \fBAPT::Get::Fix-Broken\fP\&.
- .IP
--.IP "\fB-h, --help\fP"
-+.IP "\fB-h\fP, \fB--help\fP"
- Help; display a helpful usage message and exits\&.
- .IP
--.IP "\fB-v, --version\fP"
-+.IP "\fB-v\fP, \fB--version\fP"
- Show the program version\&.
- .IP
--.IP "\fB-m, --ignore-missing, --fix-missing\fP"
-+.IP "\fB-m\fP, \fB--ignore-missing\fP, \fB--fix-missing\fP"
- Ignore missing packages; If packages cannot be retrieved or fail the
- integrity check after retrieval (corrupted package files), hold back
- those packages and handle the result\&. Use of this option together with
-@@ -174,7 +174,7 @@
- could not be downloaded then it will be silently held back\&.
- Configuration Item: \fBAPT::Get::ignore-missing\fP\&.
- .IP
--.IP "\fB-S, --summary\fP"
-+.IP "\fB-S\fP, \fB--summary\fP"
- When used with the upgrade or dist-upgrade commands,
- displays information of what would be upgraded, with importance
- and a summary of changes (when such data is available) and stops.
-@@ -190,46 +190,46 @@
- More q\'s will produce more quiet up to a maximum of 2\&. You can also use
- \fB-q=#\fP to set the quiet level, overriding the configuration file\&. Note that
- quiet level 2 implies -y, you should never use -qq without a no-action
--modifier such as -d, --print-uris or -s as APT may decided to do something
-+modifier such as -d, --print-uris or -s as APT may decide to do something
- you did not expect\&.
- Configuration Item: \fBquiet\fP
- .IP
--.IP "\fB-s, --simulate, --just-print, --dry-run, --recon, --no-act\fP"
-+.IP "\fB-s\fP, \fB--simulate\fP, \fB--just-print\fP, \fB--dry-run\fP, \fB--recon\fP, \fB--no-act\fP"
- No action; perform a simulation of events that would occur but do not
- actually change the system\&. Configuration Item: \fBAPT::Get::Simulate\fP\&.
- .IP
+ <para>
+ Caution, dotty cannot graph larger sets of packages.
+@@ -287,7 +287,7 @@
+ <VarListEntry><term><option/-q/</><term><option/--quiet/</>
+ <ListItem><Para>
+ Quiet; produces output suitable for logging, omitting progress indicators.
+- More qs will produce more quite up to a maximum of 2. You can also use
++ More qs will produce more quiet up to a maximum of 2. You can also use
+ <option/-q=#/ to set the quiet level, overriding the configuration file.
+ Configuration Item: <literal/quiet/.
+ </VarListEntry>
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-cdrom.8 apt-0.5.4cnc7/doc/apt-cdrom.8
+--- apt-0.5.4cnc7.orig/doc/apt-cdrom.8 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-cdrom.8 Tue Dec 10 16:32:41 2002
+@@ -25,7 +25,7 @@
+ .TP
+ \fBadd\fR
+ add is used to add a new disc to the source list. It will unmount the
+-CDROM device, prompt for a disk to be inserted and then procceed to
++CDROM device, prompt for a disk to be inserted and then proceed to
+ scan it and copy the index files. If the disc does not have a proper
+ \fI\&.disk/\fR directory you will be prompted for a descriptive
+ title.
+@@ -70,7 +70,7 @@
+ \fB-f\fR
+ .TP
+ \fB--fast\fR
+-Fast Copy; Assume the package files are valid and do not check
++Fast Copy; assume the package files are valid and do not check
+ every package. This option should be used only if
+ \fBapt-cdrom\fR has been run on this disc before and did not detect
+ any errors.
+@@ -79,7 +79,7 @@
+ \fB-a\fR
+ .TP
+ \fB--thorough\fR
+-Thorough Package Scan; This option may be needed with some old
++Thorough Package Scan; this option may be needed with some old
+ Debian 1.1/1.2 discs that have Package files in strange places. It
+ takes much longer to scan the CD but will pick them all up.
+ .TP
+@@ -90,7 +90,7 @@
+ \fB--recon\fR
+ .TP
+ \fB--no-act\fR
+-No Changes; Do not change the \fB\fIsources.list\fB\fR(5) file and do not
++No Changes; do not change the \fB\fIsources.list\fB\fR(5) file and do not
+ write index files. Everything is still checked however.
+ Configuration Item: APT::CDROM::NoAct.
+ .TP
+@@ -102,19 +102,19 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+ \fB--config-file\fR
+-Configuration File; Specify a configuration file to use.
++Configuration File; specify a configuration file to use.
+ The program will read the default configuration file and then this
+ configuration file. See \fB\fIapt.conf\fB\fR(5) for syntax information.
+ .TP
+ \fB-o\fR
+ .TP
+ \fB--option\fR
+-Set a Configuration Option; This will set an arbitary configuration
++Set a Configuration Option; this will set an arbitary configuration
+ option. The syntax is \fB-o Foo::Bar=bar\fR.
+ .SH "SEE ALSO"
+ .PP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-cdrom.8.sgml apt-0.5.4cnc7/doc/apt-cdrom.8.sgml
+--- apt-0.5.4cnc7.orig/doc/apt-cdrom.8.sgml Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-cdrom.8.sgml Tue Dec 10 16:43:13 2002
+@@ -54,7 +54,7 @@
+ <VarListEntry><Term>add</Term>
+ <ListItem><Para>
+ <literal/add/ is used to add a new disc to the source list. It will unmount the
+- CDROM device, prompt for a disk to be inserted and then procceed to
++ CDROM device, prompt for a disk to be inserted and then proceed to
+ scan it and copy the index files. If the disc does not have a proper
+ <filename>.disk/</> directory you will be prompted for a descriptive
+ title.
+@@ -101,7 +101,7 @@
+
+ <VarListEntry><term><option/-f/</><term><option/--fast/</>
+ <ListItem><Para>
+- Fast Copy; Assume the package files are valid and do not check
++ Fast Copy; assume the package files are valid and do not check
+ every package. This option should be used only if
+ <command/apt-cdrom/ has been run on this disc before and did not detect
+ any errors.
+@@ -110,7 +110,7 @@
+
+ <VarListEntry><term><option/-a/</><term><option/--thorough/</>
+ <ListItem><Para>
+- Thorough Package Scan; This option may be needed with some old
++ Thorough Package Scan; this option may be needed with some old
+ Debian 1.1/1.2 discs that have Package files in strange places. It
+ takes much longer to scan the CD but will pick them all up.
+ </VarListEntry>
+@@ -120,7 +120,7 @@
+ <term><option/--recon/</>
+ <term><option/--no-act/</>
+ <ListItem><Para>
+- No Changes; Do not change the &sources-list; file and do not
++ No Changes; do not change the &sources-list; file and do not
+ write index files. Everything is still checked however.
+ Configuration Item: <literal/APT::CDROM::NoAct/.
+ </VarListEntry>
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-config.8 apt-0.5.4cnc7/doc/apt-config.8
+--- apt-0.5.4cnc7.orig/doc/apt-config.8 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-config.8 Tue Dec 10 16:34:38 2002
+@@ -13,7 +13,7 @@
+ .PP
+ \fBapt-config\fR is an internal program used by various portions of
+ the APT suite to provide consistent configurability. It accesses the main
+-configuarion file \fI/etc/apt/apt.conf\fR in a manner that is
++configuration file \fI/etc/apt/apt.conf\fR in a manner that is
+ easy to use by scripted applications.
+ .PP
+ Unless the \fB-h\fR, or \fB--help\fR option is given one of the
+@@ -58,7 +58,7 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+@@ -70,7 +70,7 @@
+ \fB-o\fR
+ .TP
+ \fB--option\fR
+-Set a Configuration Option; This will set an arbitary configuration
++Set a Configuration Option; This will set an arbitrary configuration
+ option. The syntax is \fB-o Foo::Bar=bar\fR.
+ .SH "SEE ALSO"
+ .PP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-extracttemplates.1 apt-0.5.4cnc7/doc/apt-extracttemplates.1
+--- apt-0.5.4cnc7.orig/doc/apt-extracttemplates.1 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-extracttemplates.1 Tue Dec 10 16:35:06 2002
+@@ -45,7 +45,7 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-ftparchive.1 apt-0.5.4cnc7/doc/apt-ftparchive.1
+--- apt-0.5.4cnc7.orig/doc/apt-ftparchive.1 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-ftparchive.1 Tue Dec 10 16:35:11 2002
+@@ -381,7 +381,7 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-get.8 apt-0.5.4cnc7/doc/apt-get.8
+--- apt-0.5.4cnc7.orig/doc/apt-get.8 Tue Dec 10 16:22:06 2002
++++ apt-0.5.4cnc7/doc/apt-get.8 Tue Dec 10 16:37:35 2002
+@@ -218,7 +218,7 @@
Simulate prints out
a series of lines each one representing a dpkg operation, Configure (Conf),
- Remove (Remv), Unpack (Inst)\&. Square brackets indicate broken packages with
+ Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
-and empty set of square brackets meaning breaks that are of no consequence
+an empty set of square brackets meaning breaks that are of no consequence
- (rare)\&.
- .IP
--.IP "\fB-y, --yes, --assume-yes\fP"
-+.IP "\fB-y\fP, \fB--yes\fP, \fB--assume-yes\fP"
- Automatic yes to prompts; assume "yes" as answer to all prompts and run
- non-interactively\&. If an undesirable situation, such as changing a held
- package or removing an essential package occurs then \fBapt-get\fP will
- abort\&. Configuration Item: \fBAPT::Get::Assume-Yes\fP\&.
- .IP
--.IP "\fB-u, --show-upgraded\fP"
+ (rare).
+ .TP
+ \fB-y\fR
+@@ -235,7 +235,7 @@
+ \fB-u\fR
+ .TP
+ \fB--show-upgraded\fR
-Show upgraded packages; Print out a list of all packages that are to be
-+.IP "\fB-u\fP, \fB--show-upgraded\fP"
+Show upgraded packages; print out a list of all packages that are to be
- upgraded\&. Configuration Item: \fBAPT::Get::Show-Upgraded\fP\&.
- .IP
--.IP "\fB-b, --compile, --build\fP"
-+.IP "\fB-b\fP, \fB--compile\fP, \fB--build\fP"
- Compile source packages after downloading them\&.
- Configuration Item: \fBAPT::Get::Compile\fP\&.
- .IP
- .IP "\fB--ignore-hold\fP"
--Ignore package Holds; This causes \fBapt-get\fP to ignore a hold placed on
-+Ignore package Holds; this causes \fBapt-get\fP to ignore a hold placed on
- a package\&. This may be useful in conjunction with \fBdist-upgrade\fP to
- override a large number of undesired holds\&. Configuration Item: \fBAPT::Ignore-Hold\fP\&.
- .IP
- .IP "\fB--no-upgrade\fP"
--Do not upgrade packages; When used in conjunction with \fBinstall\fP
-+Do not upgrade packages; when used in conjunction with \fBinstall\fP
- \fBno-upgrade\fP will prevent packages listed from being upgraded if they
- are already installed\&. Configuration Item: \fBAPT::Get::no-upgrade\fP\&.
- .IP
- .IP "\fB--force-yes\fP"
--Force yes; This is a dangerous option that will cause apt to continue without
-+Force yes; this is a dangerous option that will cause apt to continue without
- prompting if it is doing something potentially harmful\&. It should not be used
- except in very special situations\&. Using \fBforce-yes\fP can potentially destroy
- your system! Configuration Item: \fBAPT::Get::force-yes\fP\&.
-@@ -254,28 +254,28 @@
- When on apt-get will automatically manage the contents of
- /var/lib/apt/lists to ensure that obsolete files are erased\&. The only
- reason to turn it off is if you frequently change your source list\&.
--Configuration Item: \fBAPT::Get::List-Cleanup\fP
-+Configuration Item: \fBAPT::Get::List-Cleanup\fP\&.
- .IP
- .IP "\fB--trivial-only\fP"
- Only perform operations are \'trivial\'\&. Logically this can be considered
- related to --assume-yes, where --assume-yes will answer yes to any prompt,
----trivial-only will answer no\&. Configuration Item: \fBAPT::Get::Trivial-Only\fP
-+--trivial-only will answer no\&. Configuration Item: \fBAPT::Get::Trivial-Only\fP\&.
- .IP
- .IP "\fB--no-remove\fP"
- If any packages are to be removed apt-get immediately aborts without
--prompting\&. Configuration Item: \fBAPT::Get::No-Remove\fP
-+prompting\&. Configuration Item: \fBAPT::Get::No-Remove\fP\&.
- .IP
- .IP "\fB--diff-only\fP, \fB--tar-only\fP"
- Download only the diff or tar file of a source archive\&.
--Configuration Item: \fBAPT::Get::Diff-Only\fP
-+Configuration Item: \fBAPT::Get::Diff-Only\fP\&.
- .IP
--.IP "\fB-c, --config-file\fP"
--Configuration File; Specify a configuration file to use\&. \fBapt-get\fP will
-+.IP "\fB-c\fP, \fB--config-file\fP"
-+Configuration File; specify a configuration file to use\&. \fBapt-get\fP will
- read the default configuration file and then this configuration file\&. See
- \fBapt\&.conf(5)\fP for syntax information\&.
- .IP
--.IP "\fB-o, --option\fP"
--Set a Configuration Option; This will set an arbitrary configuration option\&.
-+.IP "\fB-o\fP, \fB--option\fP"
-+Set a Configuration Option; this will set an arbitrary configuration option\&.
- The syntax is
+ upgraded.
+ Configuration Item: APT::Get::Show-Upgraded.
+ .TP
+@@ -248,19 +248,19 @@
+ Configuration Item: APT::Get::Compile.
+ .TP
+ \fB--ignore-hold\fR
+-Ignore package Holds; This causes \fBapt-get\fR to ignore a hold
++Ignore package Holds; this causes \fBapt-get\fR to ignore a hold
+ placed on a package. This may be useful in conjunction with
+ dist-upgrade to override a large number of undesired holds.
+ Configuration Item: APT::Ignore-Hold.
+ .TP
+ \fB--no-upgrade\fR
+-Do not upgrade packages; When used in conjunction with install
++Do not upgrade packages; when used in conjunction with install
+ no-upgrade will prevent packages listed from being upgraded
+ if they are already installed.
+ Configuration Item: APT::Get::Upgrade.
+ .TP
+ \fB--force-yes\fR
+-Force yes; This is a dangerous option that will cause apt to continue
++Force yes; this is a dangerous option that will cause apt to continue
+ without prompting if it is doing something potentially harmful. It
+ should not be used except in very special situations. Using
+ force-yes can potentially destroy your system!
+@@ -333,19 +333,19 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+ \fB--config-file\fR
+-Configuration File; Specify a configuration file to use.
++Configuration File; specify a configuration file to use.
+ The program will read the default configuration file and then this
+ configuration file. See \fB\fIapt.conf\fB\fR(5) for syntax information.
+ .TP
+ \fB-o\fR
+ .TP
+ \fB--option\fR
+-Set a Configuration Option; This will set an arbitary configuration
++Set a Configuration Option; this will set an arbitary configuration
+ option. The syntax is \fB-o Foo::Bar=bar\fR.
+ .SH "FILES"
+ .TP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-get.8.sgml apt-0.5.4cnc7/doc/apt-get.8.sgml
+--- apt-0.5.4cnc7.orig/doc/apt-get.8.sgml Thu Jul 25 20:07:18 2002
++++ apt-0.5.4cnc7/doc/apt-get.8.sgml Tue Dec 10 16:45:51 2002
+@@ -270,7 +270,7 @@
+ Simulate prints out
+ a series of lines each one representing a dpkg operation, Configure (Conf),
+ Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+- and empty set of square brackets meaning breaks that are of no consequence
++ an empty set of square brackets meaning breaks that are of no consequence
+ (rare).
+ </VarListEntry>
+
+@@ -286,7 +286,7 @@
+
+ <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</>
+ <ListItem><Para>
+- Show upgraded packages; Print out a list of all packages that are to be
++ Show upgraded packages; print out a list of all packages that are to be
+ upgraded.
+ Configuration Item: <literal/APT::Get::Show-Upgraded/.
+ </VarListEntry>
+@@ -300,7 +300,7 @@
+
+ <VarListEntry><term><option/--ignore-hold/</>
+ <ListItem><Para>
+- Ignore package Holds; This causes <command/apt-get/ to ignore a hold
++ Ignore package Holds; this causes <command/apt-get/ to ignore a hold
+ placed on a package. This may be useful in conjunction with
+ <literal/dist-upgrade/ to override a large number of undesired holds.
+ Configuration Item: <literal/APT::Ignore-Hold/.
+@@ -308,7 +308,7 @@
+
+ <VarListEntry><term><option/--no-upgrade/</>
+ <ListItem><Para>
+- Do not upgrade packages; When used in conjunction with <literal/install/
++ Do not upgrade packages; when used in conjunction with <literal/install/
+ <literal/no-upgrade/ will prevent packages listed from being upgraded
+ if they are already installed.
+ Configuration Item: <literal/APT::Get::Upgrade/.
+@@ -316,7 +316,7 @@
- .nf
-diff -ur apt-0.3.19cnc52.orig/doc/apt.conf.5 apt-0.3.19cnc52/doc/apt.conf.5
---- apt-0.3.19cnc52.orig/doc/apt.conf.5 Tue Nov 27 00:31:59 2001
-+++ apt-0.3.19cnc52/doc/apt.conf.5 Wed Nov 28 23:39:50 2001
-@@ -62,7 +62,7 @@
- compiled for\&.
- .IP
- .IP "\fBIgnore-Hold\fP"
--Ignore Held packages; This global options causes the problem resolver to
-+Ignore Held packages; this global options causes the problem resolver to
- ignore held packages in its decision making\&.
- .IP
- .IP "\fBClean-Installed\fP"
-@@ -72,7 +72,7 @@
- note that APT provides no direct means to reinstall them\&.
- .IP
- .IP "\fBImmediate-Configure\fP"
+ <VarListEntry><term><option/--force-yes/</>
+ <ListItem><Para>
+- Force yes; This is a dangerous option that will cause apt to continue
++ Force yes; this is a dangerous option that will cause apt to continue
+ without prompting if it is doing something potentially harmful. It
+ should not be used except in very special situations. Using
+ <literal/force-yes/ can potentially destroy your system!
+diff -Nur apt-0.5.4cnc7.orig/doc/apt-sortpkgs.1 apt-0.5.4cnc7/doc/apt-sortpkgs.1
+--- apt-0.5.4cnc7.orig/doc/apt-sortpkgs.1 Tue Jul 23 19:54:52 2002
++++ apt-0.5.4cnc7/doc/apt-sortpkgs.1 Tue Dec 10 16:37:48 2002
+@@ -38,7 +38,7 @@
+ \fB-v\fR
+ .TP
+ \fB--version\fR
+-Show the program verison.
++Show the program version.
+ .TP
+ \fB-c\fR
+ .TP
+diff -Nur apt-0.5.4cnc7.orig/doc/apt.conf.5 apt-0.5.4cnc7/doc/apt.conf.5
+--- apt-0.5.4cnc7.orig/doc/apt.conf.5 Tue Dec 10 16:22:06 2002
++++ apt-0.5.4cnc7/doc/apt.conf.5 Tue Dec 10 16:39:25 2002
+@@ -73,7 +73,7 @@
+ a trailing :: to the list name.
+ .SH "THE APT GROUP"
+ .PP
+-This group of options controls general APT behavoir as well as holding the
++This group of options controls general APT behaviour as well as holding the
+ options for all of the tools.
+ .TP
+ \fBArchitecture\fR
+@@ -82,7 +82,7 @@
+ compiled for.
+ .TP
+ \fBIgnore-Hold\fR
+-Ignore Held packages; This global option causes the problem resolver to
++Ignore Held packages; this global option causes the problem resolver to
+ ignore held packages in its decision making.
+ .TP
+ \fBClean-Installed\fR
+@@ -92,7 +92,7 @@
+ note that APT provides no direct means to reinstall them.
+ .TP
+ \fBImmediate-Configure\fR
-Disable Immedate Configuration; This dangerous option disables some
+Disable Immedate Configuration; this dangerous option disables some
- of APT\'s ordering code to cause it to make fewer dpkg calls\&. Doing
+ of APT's ordering code to cause it to make fewer dpkg calls. Doing
so may be necessary on some extremely slow single user systems but
- is very dangerous and may cause package install scripts to fail or worse\&.
-@@ -120,7 +120,7 @@
- .IP
- .IP "\fBSource-Symlinks\fP"
- Use symlinks for source archives\&. If set to true then source archives will
--be symlinked when possible instead of copying\&. True is the default
-+be symlinked when possible instead of copying\&. True is the default\&.
- .IP
- .IP "\fBhttp\fP"
- HTTP URIs; http::Proxy is the default http proxy to use\&. It is in the standard
-@@ -129,7 +129,7 @@
- \fIDIRECT\fP meaning to use no proxies\&. The \fI$http_proxy\fP environment variable
- will override all settings\&.
- .IP
--Three settings are provided for cache control with HTTP/1\&.1 complient proxy
-+Three settings are provided for cache control with HTTP/1\&.1 compliant proxy
- caches\&. \fBNo-Cache\fP tells the proxy to not used its cached response under
- any circumstances, \fBMax-Age\fP is sent only for index files and tells the
- cache to refresh its object if it is older than the given number of seconds\&.
-@@ -165,7 +165,7 @@
- to leave passive mode on, it works in nearly every environment\&. However some
- situations require that passive mode be disabled and port mode ftp used
- instead\&. This can be done globally, for connections that go through a proxy
--or for a specific host (See the sample config file for examples)
-+or for a specific host (See the sample config file for examples)\&.
- .IP
- It is possible to proxy FTP over HTTP by setting the \fIftp_proxy\fP
- environment variable to a http url - see the discussion of the http method
-@@ -192,11 +192,11 @@
- \fBDir::Cache\fP contains locations pertaining to local cache information, such
- as the two package caches \fBsrcpkgcache\fP and \fBpkgcache\fP as well as the
- location to place downloaded archives, \fBDir::Cache::archives\fP\&. Like
--\fBDir::State\fP the default directory is contained in \fBDir::Cache\fP
-+\fBDir::State\fP the default directory is contained in \fBDir::Cache\fP\&.
- .PP
- \fBDir::Etc\fP contains the location of configuration files, \fBsourcelist\fP
- gives the location of the sourcelist and \fBmain\fP is the default configuration
--file (setting has no effect)
-+file (setting has no effect)\&.
- .PP
- Binary programs are pointed to by \fBDir::Bin\fP\&. \fBmethods\fP specifies the
- location of the method handlers and \fBgzip\fP, \fBdpkg\fP, \fBrpm\fP,
-@@ -205,13 +205,13 @@
- .PP
- .SH "APT in DSelect"
- When APT is used as a \fBdselect(8)\fP method several configuration directives
--control the default behavoir\&. These are in the \fBDSelect\fP section\&.
-+control the default behavior\&. These are in the \fBDSelect\fP section\&.
- .PP
- .IP "\fBClean\fP"
- Cache Clean mode; this value may be one of always, auto, prompt and never\&.
- always will remove all archives after they have been downloaded while auto
- will only remove things that are no longer downloadable (replaced with a new
--version for instance)
-+version for instance).
- .IP
- .IP "\fBOptions\fP"
- The contents of this variable is passed to \fBapt-get(8)\fP as command line
+ is very dangerous and may cause package install scripts to fail or worse.
+@@ -150,7 +150,7 @@
+ meaning to use no proxies. The \fBhttp_proxy\fR environment variable
+ will override all settings.
+
+-Three settings are provided for cache control with HTTP/1.1 complient
++Three settings are provided for cache control with HTTP/1.1 compliant
+ proxy caches. No-Cache tells the proxy to not used its cached
+ response under any circumstances, Max-Age is sent only for
+ index files and tells the cache to refresh its object if it is older than
+diff -Nur apt-0.5.4cnc7.orig/doc/apt.conf.5.sgml apt-0.5.4cnc7/doc/apt.conf.5.sgml
+--- apt-0.5.4cnc7.orig/doc/apt.conf.5.sgml Tue Dec 10 16:22:06 2002
++++ apt-0.5.4cnc7/doc/apt.conf.5.sgml Tue Dec 10 16:47:05 2002
+@@ -76,7 +76,7 @@
+
+ <RefSect1><Title>The APT Group</>
+ <para>
+- This group of options controls general APT behavior as well as holding the
++ This group of options controls general APT behaviour as well as holding the
+ options for all of the tools.
+
+ <VariableList>
+@@ -89,7 +89,7 @@
+
+ <VarListEntry><Term>Ignore-Hold</Term>
+ <ListItem><Para>
+- Ignore Held packages; This global option causes the problem resolver to
++ Ignore Held packages; this global option causes the problem resolver to
+ ignore held packages in its decision making.
+ </VarListEntry>
+
+@@ -103,7 +103,7 @@
+
+ <VarListEntry><Term>Immediate-Configure</Term>
+ <ListItem><Para>
+- Disable Immedate Configuration; This dangerous option disables some
++ Disable Immedate Configuration; this dangerous option disables some
+ of APT's ordering code to cause it to make fewer dpkg calls. Doing
+ so may be necessary on some extremely slow single user systems but
+ is very dangerous and may cause package install scripts to fail or worse.
+@@ -187,7 +187,7 @@
+ meaning to use no proxies. The <envar/http_proxy/ environment variable
+ will override all settings.
+ <para>
+- Three settings are provided for cache control with HTTP/1.1 complient
++ Three settings are provided for cache control with HTTP/1.1 compliant
+ proxy caches. <literal/No-Cache/ tells the proxy to not use its cached
+ response under any circumstances, <literal/Max-Age/ is sent only for
+ index files and tells the cache to refresh its object if it is older than
+diff -Nur apt-0.5.4cnc7.orig/doc/apt.ent apt-0.5.4cnc7/doc/apt.ent
+--- apt-0.5.4cnc7.orig/doc/apt.ent Tue Dec 10 16:22:06 2002
++++ apt-0.5.4cnc7/doc/apt.ent Tue Dec 10 16:44:47 2002
+@@ -121,14 +121,14 @@
+
+ <VarListEntry><term><option/-c/</><term><option/--config-file/</>
+ <ListItem><Para>
+- Configuration File; Specify a configuration file to use.
++ Configuration File; specify a configuration file to use.
+ The program will read the default configuration file and then this
+ configuration file. See &apt-conf; for syntax information.
+ </VarListEntry>
+
+ <VarListEntry><term><option/-o/</><term><option/--option/</>
+ <ListItem><Para>
+- Set a Configuration Option; This will set an arbitary configuration
++ Set a Configuration Option; this will set an arbitrary configuration
+ option. The syntax is <option>-o Foo::Bar=bar</>.
+ </VarListEntry>
+ ">