summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2006-01-20 12:51:36 +0000
committerChristian Perrier <bubulle@debian.org>2006-01-20 12:51:36 +0000
commitdbe5505ecb4180bc3d850193aa2458bd04df1896 (patch)
tree5739bcf32d2c7bee58bc235f97c894bc157c501f /doc
parent9b7f38f18c97808022f15ce496479c94126bd169 (diff)
parent011d9176844e1817f1dc64cf61c375ab77646d0e (diff)
Resync with Michael
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118 * merged from bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119 * fix http data corruption (#280844) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120 * added debian-archive-keyring to recommends * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122 * fix apt-key to ask for the correct package * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123 * fix typo in apt-cache.8 manpage * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124 * fixed another typo in doc/apt-secure.8.xml * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125 * merged the debian-sid changes back * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126 * fixed the changelog yet again * mvo@debian.org--2005/apt--debian-experimental--0--patch-12 * added http data corruption fix patch (#280844) * mvo@debian.org--2005/apt--debian-sid--0--patch-17 * merged with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-18 * merged with apt--mvo
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt-secure.8.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 0e1d2f8d9..789c3d228 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -191,7 +191,7 @@ Reverse Provides:
<varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
<listitem><para><literal>show</literal> performs a function similar to
- <command>dpkg --print-avail</command>i; it displays the package records for the
+ <command>dpkg --print-avail</command>; it displays the package records for the
named packages.</para></listitem>
</varlistentry>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e22446030..fa13ddc0f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -120,7 +120,7 @@
<listitem><para><literal>Mirror network compromise</literal>.
Without signature checking, a malicious agent can compromise a
- mirror host and modify the files in it to propage malicious
+ mirror host and modify the files in it to propagate malicious
software to all users downloading packages from that
host.</para></listitem>
</itemizedlist>