diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
| commit | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch) | |
| tree | 3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /doc/apt-key.8.xml | |
| parent | b10b0c4aac5d0648125d4203eea6900032efb7ba (diff) | |
| parent | 7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
debian/control
doc/apt-key.8.xml
doc/makefile
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
Diffstat (limited to 'doc/apt-key.8.xml')
| -rw-r--r-- | doc/apt-key.8.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 9d51f4f7b..5dbbaaf26 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> @@ -130,7 +132,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>ubuntu-archive-keyring</literal> package in Ubuntu. + distribution, e.g. the &keyring-package; package in &keyring-distro;. </para> @@ -180,12 +182,12 @@ <listitem><para>Local trust database of archive keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term> - <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem> + <varlistentry><term>&keyring-filename;</term> + <listitem><para>Keyring of &keyring-distro; archive trusted keys.</para></listitem> </varlistentry> - <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><term>&keyring-removed-filename;</term> + <listitem><para>Keyring of &keyring-distro; archive removed trusted keys.</para></listitem> </varlistentry> </variablelist> |