summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--doc/apt-key.8.xml10
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index e2e895c97..d5bcaee67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp5ubuntu14.2) UNRELEASED; urgency=low
+
+ [ Daniel Hahler ]
+ * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200
+
apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
* apt-pkg/edsp.cc:
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index f17f0c45e..88d26684b 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -131,7 +131,7 @@
Update the local keyring with the archive keyring and remove from
the local keyring the archive keys which are no longer valid.
The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
- distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+ distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
</para>
@@ -181,12 +181,12 @@
<listitem><para>Local trust database of archive keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
- <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
- <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
</varlistentry>
</variablelist>