-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 @@