merge again with lp:~mvo/apt/debian-sid to get a buildable fr again

[apt.git] / doc / apt.ent

diff --git a/doc/apt.ent b/doc/apt.ent
index 0b341ec14550c1e8a3178341c11891e1962fc732..da43d8f3d42204f3c3bab313eb068e6cea6bbe81 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -353,3 +353,16 @@
      Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
      </varlistentry>
 ">
+
+<!ENTITY file-trustedgpg "
+     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+     <listitem><para>Keyring of local trusted keys, new keys will be added here.
+     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>
+     <listitem><para>File fragments for the trusted keys, additional keyrings can
+     be stored here (by other packages or the administrator).
+     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
+     </varlistentry>
+">