summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/apt-cache.8.sgml2
-rw-r--r--doc/apt-get.8.sgml4
-rw-r--r--doc/apt_preferences.5.sgml5
4 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 5cf506459..68e6d6854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ apt (0.5.4) unstable; urgency=low
* M68k config.guess patch. Closes: #88913
* Bi-yearly test on OpenBSD and Solaris
- * Doc updates. Closes: #89121, #89854
+ * Doc updates. Closes: #89121, #89854, #99671, #98353, #95823, #93057, #97520
* Various cosmetic code updates. Closes: #89066, #89066, #89152
* Add "pre-auto" as an option for DSelect::Clean (run autoclean after
update).
@@ -11,7 +11,7 @@ apt (0.5.4) unstable; urgency=low
similar situations. Closes: #56708, #59432
* no_proxy and ftp. Closes: #89671
* Philippe Batailler's man page patches.
- * Fix for display bug. Closes: #92033
+ * Fix for display bug. Closes: #92033, #93652, #98468
* Reordered some things to make dante and FTP happier. Closes: #92757
* James R. Van Zandt's guide.sgml updates. Closes: #90027
* apt-ftparchive copes with no uncompressed package files + contents.
diff --git a/doc/apt-cache.8.sgml b/doc/apt-cache.8.sgml
index d0ca4fd69..b143ede12 100644
--- a/doc/apt-cache.8.sgml
+++ b/doc/apt-cache.8.sgml
@@ -326,7 +326,7 @@ Reverse Provides:
<ListItem><Para>
Make <literal/depends/ recursive so that all packages mentioned are
printed once.
- Configuration Item: <literal/APT::Cache::RecruseDepends/.
+ Configuration Item: <literal/APT::Cache::RecurseDepends/.
</VarListEntry>
&apt-commonoptions;
diff --git a/doc/apt-get.8.sgml b/doc/apt-get.8.sgml
index 74bd881ef..e48d9e3b6 100644
--- a/doc/apt-get.8.sgml
+++ b/doc/apt-get.8.sgml
@@ -439,8 +439,8 @@
<RefSect1><Title>See Also</>
<para>
- &apt-cache;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, The
- APT users guide in &docdir;, &apt-preferences;.
+ &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;,
+ The APT users guide in &docdir;, &apt-preferences;.
</RefSect1>
<RefSect1><Title>Diagnostics</>
diff --git a/doc/apt_preferences.5.sgml b/doc/apt_preferences.5.sgml
index 44fffabf0..3f533e282 100644
--- a/doc/apt_preferences.5.sgml
+++ b/doc/apt_preferences.5.sgml
@@ -23,7 +23,7 @@
<RefSect1><Title>Description</>
<para>
The APT preferences file controls various aspects of the APT system.
- It is ment to be user editable and manipulatable from software. The file
+ It is meant to be user editable and manipulatable from software. The file
consists of a number of records formed like the dpkg status file, space
seperated sections of text with at the start of each line tags seperated
by a colon. It is stored in <filename>/etc/apt/preferences</>.
@@ -78,7 +78,8 @@ a=stable
This is a version string with the same properties as in the Packages file.
It represents the release level of the archive. Typical Debian release
numbers look like <literal/2.1r2/ with the r designating the release of
- 2.1. New releases are limited to security updates.
+ 2.1. New releases are limited to security updates and other important
+ changes.
</VarListEntry>
<VarListEntry><term>o= Origin</term>