summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--doc/apt-cache.8.sgml6
-rw-r--r--doc/apt-cdrom.8.sgml9
-rw-r--r--doc/apt-config.8.sgml4
-rw-r--r--doc/apt-ftparchive.1.sgml4
-rw-r--r--doc/apt-get.8.sgml9
-rw-r--r--doc/apt-sortpkgs.1.sgml2
-rw-r--r--doc/apt.84
-rw-r--r--doc/apt.ent2
9 files changed, 23 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 309723246..ec61fb5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ apt (0.5.1) unstable; urgency=low
* Fixed #82894 again, or should be and.
* Process the option string right. Closes: #86921
* Alfredo's no_proxy patch
+ * Documentation fixes. Closes: #87091
-- Jason Gunthorpe <jgg@debian.org> Thu, 22 Feb 2001 00:39:15 -0500
diff --git a/doc/apt-cache.8.sgml b/doc/apt-cache.8.sgml
index 4490aea2a..05a81d378 100644
--- a/doc/apt-cache.8.sgml
+++ b/doc/apt-cache.8.sgml
@@ -23,7 +23,7 @@
<!-- Arguments -->
<refsynopsisdiv>
<cmdsynopsis>
- <command>apt-config</>
+ <command>apt-cache</>
<arg><option>-hvs</></arg>
<arg><option>-o=<replaceable/config string/</></arg>
<arg><option>-c=<replaceable/file/</></arg>
@@ -53,8 +53,8 @@
from the package metadata.
<para>
- Unless the <option/-h/, or <option/--help/ option is given one of the
- above commands must be present.
+ Unless the <option/-h/, or <option/--help/ option is given one of the
+ commands below must be present.
<VariableList>
<VarListEntry><Term>add</Term>
diff --git a/doc/apt-cdrom.8.sgml b/doc/apt-cdrom.8.sgml
index 414be4c09..ce8e4aad4 100644
--- a/doc/apt-cdrom.8.sgml
+++ b/doc/apt-cdrom.8.sgml
@@ -43,11 +43,12 @@
verifying the index files.
<para>
It is necessary to use <command/apt-cdrom/ to add CDs to the APT system,
- it cannot be done by hand. Furthermore each disk in a multi-cd set must be
- inserted and scanned separately to account for possible mis-burns.
+ it cannot be done by hand. Furthermore each disk in a multi-cd set must be
+ inserted and scanned separately to account for possible mis-burns.
+
<para>
- Unless the <option/-h/, or <option/--help/ option is given one of the
- above commands must be present.
+ Unless the <option/-h/, or <option/--help/ option is given one of the
+ commands below must be present.
<VariableList>
<VarListEntry><Term>add</Term>
diff --git a/doc/apt-config.8.sgml b/doc/apt-config.8.sgml
index 0f5324e0a..d19f03cef 100644
--- a/doc/apt-config.8.sgml
+++ b/doc/apt-config.8.sgml
@@ -41,8 +41,8 @@
configuarion file <filename>/etc/apt/apt.conf</> in a manner that is
easy to use by scripted applications.
<para>
- Unless the <option/-h/, or <option/--help/ option is given one of the above commands
- must be present.
+ Unless the <option/-h/, or <option/--help/ option is given one of the
+ commands below must be present.
</para>
<VariableList>
diff --git a/doc/apt-ftparchive.1.sgml b/doc/apt-ftparchive.1.sgml
index f05765650..ab650e74b 100644
--- a/doc/apt-ftparchive.1.sgml
+++ b/doc/apt-ftparchive.1.sgml
@@ -61,8 +61,8 @@
performs file-change checks and builds the desired compressed output files.
<para>
- Unless the <option/-h/, or <option/--help/ option is given one of the above
- commands must be present.
+ Unless the <option/-h/, or <option/--help/ option is given one of the
+ commands below must be present.
<VariableList>
<VarListEntry><term>packages</term>
diff --git a/doc/apt-get.8.sgml b/doc/apt-get.8.sgml
index cf35b65b0..d6d8bc736 100644
--- a/doc/apt-get.8.sgml
+++ b/doc/apt-get.8.sgml
@@ -23,7 +23,7 @@
<!-- Arguments -->
<refsynopsisdiv>
<cmdsynopsis>
- <command>apt-config</>
+ <command>apt-get</>
<arg><option>-hvs</></arg>
<arg><option>-o=<replaceable/config string/</></arg>
<arg><option>-c=<replaceable/file/</></arg>
@@ -47,8 +47,8 @@
<command/apt-get/ is the command-line tool for handling packages, and may be
considered the user's "back-end" to other tools using the APT library.
<para>
- Unless the <option/-h/, or <option/--help/ option is given one of the
- above commands must be present.
+ Unless the <option/-h/, or <option/--help/ option is given one of the
+ commands below must be present.
<VariableList>
<VarListEntry><Term>update</Term>
@@ -396,6 +396,9 @@
Configuration Item: <literal/APT::Get::Diff-Only/ and
<literal/APT::Get::Tar-Only/
</VarListEntry>
+
+ &apt-commonoptions;
+
</VariableList>
</RefSect1>
diff --git a/doc/apt-sortpkgs.1.sgml b/doc/apt-sortpkgs.1.sgml
index c939b973f..e0af29d2d 100644
--- a/doc/apt-sortpkgs.1.sgml
+++ b/doc/apt-sortpkgs.1.sgml
@@ -23,7 +23,7 @@
<!-- Arguments -->
<refsynopsisdiv>
<cmdsynopsis>
- <command>apt-config</>
+ <command>apt-sortpkgs</>
<arg><option>-hvs</></arg>
<arg><option>-o=<replaceable/config string/</></arg>
<arg><option>-c=<replaceable/file/</></arg>
diff --git a/doc/apt.8 b/doc/apt.8
index 8fb61c8b0..f62846099 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -38,11 +38,11 @@ apt returns zero on normal operation, decimal 100 on error.
.SH BUGS
This manpage isn't even started.
.PP
-See <http://www.debian.org/Bugs/db/pa/lapt.html>. If you wish to report a
+See <http://bugs.debian.org/apt>. If you wish to report a
bug in
.BR apt ,
please see
-.I /usr/doc/debian/bug-reporting.txt
+.I /usr/share/doc/debian/bug-reporting.txt
or the
.BR bug (1)
command.
diff --git a/doc/apt.ent b/doc/apt.ent
index fb1aa3c91..56a08a087 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -108,7 +108,7 @@
<para>
See the <ulink url='http://bugs.debian.org/apt'>APT bug page</>.
If you wish to report a bug in APT, please see
- <filename>/usr/doc/debian/bug-reporting.txt</> or the &bug; command.
+ <filename>/usr/share/doc/debian/bug-reporting.txt</> or the &bug; command.
</RefSect1>
">