From 33ce2c1ce6019537e7ef799b11f0b607e59e82ac Mon Sep 17 00:00:00 2001
From: Artur Frysiak <artur@frysiak.net>
Date: Thu, 6 Mar 2003 18:25:22 +0000
Subject: [PATCH] - updated to 0.5.5cnc3

Changed files:
    apt-es_it.patch -> 1.5
    apt-filed.patch -> 1.3
    apt-man_fixes.patch -> 1.3
    apt-pld_man.patch -> 1.3
---
 apt-es_it.patch     |  16 +--
 apt-filed.patch     |  84 +++++-------
 apt-man_fixes.patch | 319 --------------------------------------------
 apt-pld_man.patch   |  62 ---------
 4 files changed, 38 insertions(+), 443 deletions(-)

diff --git a/apt-es_it.patch b/apt-es_it.patch
index 9d6f5ba..a91365e 100644
--- a/apt-es_it.patch
+++ b/apt-es_it.patch
@@ -1,11 +1,5 @@
---- apt-0.5.4cnc7/configure.in.wiget	Tue Jul 30 15:28:36 2002
-+++ apt-0.5.4cnc7/configure.in	Tue Jul 30 15:29:10 2002
-@@ -39,7 +39,7 @@
- AC_CHECK_TOOL(AR,ar,"ar")
- 
- dnl CNC:2002-07-08
--ALL_LINGUAS="pt_BR de_DE es_ES it_IT ru"
-+ALL_LINGUAS="pt_BR de es it ru"
- AM_GNU_GETTEXT
- LOCALEDIR="/usr/share/locale"
- AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+--- apt-0.5.5cnc3/po/LINGUAS.wiget	Thu Mar  6 17:31:11 2003
++++ apt-0.5.5cnc3/po/LINGUAS	Thu Mar  6 17:31:21 2003
+@@ -1 +1 @@
+-de_DE es_ES it_IT pt_BR ru
++de es it pt_BR ru
diff --git a/apt-filed.patch b/apt-filed.patch
index af6ccc5..88a7021 100644
--- a/apt-filed.patch
+++ b/apt-filed.patch
@@ -1,42 +1,16 @@
-diff -Nur apt-0.5.4cnc7.orig/cmdline/apt-get.cc apt-0.5.4cnc7/cmdline/apt-get.cc
---- apt-0.5.4cnc7.orig/cmdline/apt-get.cc	Thu Aug  8 22:07:33 2002
-+++ apt-0.5.4cnc7/cmdline/apt-get.cc	Tue Dec 10 17:10:42 2002
-@@ -1515,7 +1515,7 @@
- 	 c1out << 
- 	  _("Since you only requested a single operation it is extremely likely that\n"
- 	    "the package is simply not installable and a bug report against\n" 
--	    "that package should be filed.") << endl;
-+	    "that package should be filled.") << endl;
-       }
- 
-       c1out << _("The following information may help to resolve the situation:") << endl;
-diff -Nur apt-0.5.4cnc7.orig/po/apt.pot apt-0.5.4cnc7/po/apt.pot
---- apt-0.5.4cnc7.orig/po/apt.pot	Thu Sep  5 00:54:05 2002
-+++ apt-0.5.4cnc7/po/apt.pot	Tue Dec 10 17:10:55 2002
-@@ -1350,7 +1350,7 @@
+--- apt-0.5.5cnc3/po/de_DE.po.wiget	Thu Feb 27 17:18:53 2003
++++ apt-0.5.5cnc3/po/de_DE.po	Thu Mar  6 17:39:08 2003
+@@ -609,7 +609,7 @@
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
 -"that package should be filed."
 +"that package should be filled."
  msgstr ""
- 
- #: cmdline/apt-get.cc:1515
-diff -Nur apt-0.5.4cnc7.orig/po/de_DE.po apt-0.5.4cnc7/po/de_DE.po
---- apt-0.5.4cnc7.orig/po/de_DE.po	Thu Sep  5 00:54:05 2002
-+++ apt-0.5.4cnc7/po/de_DE.po	Tue Dec 10 17:11:17 2002
-@@ -1378,7 +1378,7 @@
- msgid ""
- "Since you only requested a single operation it is extremely likely that\n"
- "the package is simply not installable and a bug report against\n"
--"that package should be filed."
-+"that package should be filled."
- msgstr ""
- 
- #: cmdline/apt-get.cc:1515
-diff -Nur apt-0.5.4cnc7.orig/po/es_ES.po apt-0.5.4cnc7/po/es_ES.po
---- apt-0.5.4cnc7.orig/po/es_ES.po	Tue Jul 23 19:54:53 2002
-+++ apt-0.5.4cnc7/po/es_ES.po	Tue Dec 10 17:11:29 2002
+ "Da Sie nur eine einzelne Operation angefordert haben, ist es extrem\n"
+ "wahrscheinlich, dass das Paket schlichtweg nicht installierbar ist und\n"
+--- apt-0.5.5cnc3/po/es_ES.po.wiget	Thu Feb 27 17:18:58 2003
++++ apt-0.5.5cnc3/po/es_ES.po	Thu Mar  6 17:39:08 2003
 @@ -435,7 +435,7 @@
  msgstr "el paquete simplemente no se pueda instalar y se deba informar"
  
@@ -46,9 +20,8 @@ diff -Nur apt-0.5.4cnc7.orig/po/es_ES.po apt-0.5.4cnc7/po/es_ES.po
  msgstr "de un error acerca de este paquete."
  
  #: cmdline/apt-get.cc:1386
-diff -Nur apt-0.5.4cnc7.orig/po/it_IT.po apt-0.5.4cnc7/po/it_IT.po
---- apt-0.5.4cnc7.orig/po/it_IT.po	Tue Jul 23 19:54:53 2002
-+++ apt-0.5.4cnc7/po/it_IT.po	Tue Dec 10 17:11:34 2002
+--- apt-0.5.5cnc3/po/it_IT.po.wiget	Thu Feb 27 17:18:30 2003
++++ apt-0.5.5cnc3/po/it_IT.po	Thu Mar  6 17:39:08 2003
 @@ -435,7 +435,7 @@
  msgstr "il pacchetto sia semplicemente non installabile e"
  
@@ -58,21 +31,19 @@ diff -Nur apt-0.5.4cnc7.orig/po/it_IT.po apt-0.5.4cnc7/po/it_IT.po
  msgstr "che debba essere inviato un bug report per il pacchetto."
  
  #: cmdline/apt-get.cc:1386
-diff -Nur apt-0.5.4cnc7.orig/po/pt_BR.po apt-0.5.4cnc7/po/pt_BR.po
---- apt-0.5.4cnc7.orig/po/pt_BR.po	Tue Jul 23 19:54:53 2002
-+++ apt-0.5.4cnc7/po/pt_BR.po	Tue Dec 10 17:11:40 2002
-@@ -1037,7 +1037,7 @@
- msgstr "o pacote simplesmente não esteja instalado e um relatório de bug"
- 
- #: cmdline/apt-get.cc:1424
--msgid "that package should be filed."
-+msgid "that package should be filled."
- msgstr "deste pacote deve ser preenchido."
- 
- #: cmdline/apt-get.cc:1427
-diff -Nur apt-0.5.4cnc7.orig/po/ru.po apt-0.5.4cnc7/po/ru.po
---- apt-0.5.4cnc7.orig/po/ru.po	Tue Jul 23 19:54:53 2002
-+++ apt-0.5.4cnc7/po/ru.po	Tue Dec 10 17:11:44 2002
+--- apt-0.5.5cnc3/po/pt_BR.po.wiget	Thu Feb 27 17:18:39 2003
++++ apt-0.5.5cnc3/po/pt_BR.po	Thu Mar  6 17:39:27 2003
+@@ -606,7 +606,7 @@
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
+ msgstr ""
+ "Já que você solicitou uma única operação é extremamente provável que\n"
+ "o pacote esteja simplesmente não instalável e um relato de erro sobre\n"
+--- apt-0.5.5cnc3/po/ru.po.wiget	Thu Feb 27 17:18:46 2003
++++ apt-0.5.5cnc3/po/ru.po	Thu Mar  6 17:39:08 2003
 @@ -1040,7 +1040,7 @@
  msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ É ÔÒÅÂÕÅÔÓÑ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ"
  
@@ -82,3 +53,14 @@ diff -Nur apt-0.5.4cnc7.orig/po/ru.po apt-0.5.4cnc7/po/ru.po
  msgstr "Ó ÜÔÉÍ ÐÁËÅÔÏÍ ÒÁÚÒÁÂÏÔÞÉËÁÍ."
  
  #: cmdline/apt-get.cc:1416
+--- apt-0.5.5cnc3/cmdline/apt-get.cc.wiget	Thu Feb 27 17:19:29 2003
++++ apt-0.5.5cnc3/cmdline/apt-get.cc	Thu Mar  6 17:39:08 2003
+@@ -1552,7 +1552,7 @@
+ 	 c1out << 
+ 	  _("Since you only requested a single operation it is extremely likely that\n"
+ 	    "the package is simply not installable and a bug report against\n" 
+-	    "that package should be filed.") << endl;
++	    "that package should be filled.") << endl;
+       }
+ 
+       c1out << _("The following information may help to resolve the situation:") << endl;
diff --git a/apt-man_fixes.patch b/apt-man_fixes.patch
index 2be3db0..6052985 100644
--- a/apt-man_fixes.patch
+++ b/apt-man_fixes.patch
@@ -1,88 +1,3 @@
-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.
- 
- 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
@@ -152,68 +67,6 @@ diff -Nur apt-0.5.4cnc7.orig/doc/apt-cache.8.sgml apt-0.5.4cnc7/doc/apt-cache.8.
       <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
@@ -253,127 +106,6 @@ diff -Nur apt-0.5.4cnc7.orig/doc/apt-cdrom.8.sgml apt-0.5.4cnc7/doc/apt-cdrom.8.
       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
--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).
- .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
-+Show upgraded packages; print out a list of all packages that are to be
- 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
@@ -422,57 +154,6 @@ diff -Nur apt-0.5.4cnc7.orig/doc/apt-get.8.sgml apt-0.5.4cnc7/doc/apt-get.8.sgml
       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
- 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.
-@@ -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
diff --git a/apt-pld_man.patch b/apt-pld_man.patch
index ed47f30..d65855b 100644
--- a/apt-pld_man.patch
+++ b/apt-pld_man.patch
@@ -1,45 +1,3 @@
-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 Jul 23 19:54:52 2002
-+++ apt-0.5.4cnc7/doc/apt-get.8	Tue Dec 10 16:08:46 2002
-@@ -384,7 +384,7 @@
- .SH "SEE ALSO"
- .PP
- \fBapt-cache\fR(8), \fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fB\fIsources.list\fB\fR(5), \fB\fIapt.conf\fB\fR(5), 
--The APT users guide in /usr/share/doc/apt/, \fBapt_preferences\fR(5).
-+The APT users guide in /usr/share/doc/apt*/, \fBapt_preferences\fR(5).
- .SH "DIAGNOSTICS"
- .PP
- \fBapt-get\fR returns zero on normal operation, decimal 100 on error.
-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 Jul 23 19:54:52 2002
-+++ apt-0.5.4cnc7/doc/apt.conf.5	Tue Dec 10 16:16:50 2002
-@@ -58,7 +58,7 @@
- .fi
- .PP
- In general the sample configuration file in 
--\fI/usr/share/doc/apt//examples/apt.conf\fR \fI/usr/share/doc/apt/examples/configure-index.gz\fR
-+\fI/usr/share/doc/apt*/examples/apt.conf\fR \fI/usr/share/doc/apt*/examples/configure-index.gz\fR
- is a good guide for how it should look.
- .PP
- Two specials are allowed, #include and #clear. 
-@@ -178,7 +178,7 @@
- proxy you will have to set the ftp::ProxyLogin script in the 
- configuration file. This entry specifies the commands to send to tell 
- the proxy server what to connect to. Please see 
--\fI/usr/share/doc/apt/examples/configure-index.gz\fR for an example of 
-+\fI/usr/share/doc/apt*/examples/configure-index.gz\fR for an example of 
- how to do this. The subsitution variables available are 
- $(PROXY_USER), $(PROXY_PASS), $(SITE_USER),
- $(SITE_PASS), $(SITE), and $(SITE_PORT).
-@@ -329,7 +329,7 @@
- disable the inclusion of statfs data in CDROM IDs.
- .SH "EXAMPLES"
- .PP
--\fI/usr/share/doc/apt/examples/configure-index.gz\fR contains a 
-+\fI/usr/share/doc/apt*/examples/configure-index.gz\fR contains a 
- sample configuration file showing the default values for all possible 
- options.
- .SH "FILES"
 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	Thu Jul 25 20:07:18 2002
 +++ apt-0.5.4cnc7/doc/apt.conf.5.sgml	Tue Dec 10 16:19:21 2002
@@ -76,24 +34,4 @@ diff -Nur apt-0.5.4cnc7.orig/doc/fr/apt.ent.fr apt-0.5.4cnc7/doc/fr/apt.ent.fr
  <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
  <!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
  <!ENTITY statedir "/var/lib/apt">
-diff -Nur apt-0.5.4cnc7.orig/doc/makefile apt-0.5.4cnc7/doc/makefile
---- apt-0.5.4cnc7.orig/doc/makefile	Tue Jul 23 19:54:52 2002
-+++ apt-0.5.4cnc7/doc/makefile	Tue Dec 10 16:20:41 2002
-@@ -1,6 +1,6 @@
- # -*- make -*-
- BASE=..
--SUBDIR=doc
-+SUBDIR=doc doc/pl
- 
- # Bring in the default rules
- include ../buildlib/defaults.mak
-@@ -13,7 +13,8 @@
- # Man pages
- SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
-          apt-config.8 apt-sortpkgs.1 apt-ftparchive.1 apt_preferences.5 \
--	 apt-extracttemplates.1 vendors.list.5
-+	 apt-extracttemplates.1 vendors.list.5 \
-+	 pl/apt-cache.8 pl/apt-get.8 pl/apt-cdrom.8
- INCLUDES = apt.ent	 
- include $(SGML_MANPAGE_H)
  
-- 
2.44.0