fix compiler warning in the new mirror code

[apt.git] / doc / apt-key.8.xml

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 7b0691b5efdaac67ce86adbbd630abb5cc55a563..8f445b7f95e8e8a0e258fe78b5c0752186b53af6 100644 (file)
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -26,7 +26,8 @@
  <refsynopsisdiv>
    <cmdsynopsis>
       <command>apt-key</command>
  <refsynopsisdiv>
    <cmdsynopsis>
       <command>apt-key</command>

-      <arg><replaceable>command</replaceable>/</arg>
+      <arg><option>--keyring <replaceable>filename</replaceable></option></arg>
+      <arg><replaceable>command</replaceable></arg>

       <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
    </cmdsynopsis>
  </refsynopsisdiv>
       <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
    </cmdsynopsis>
  </refsynopsisdiv>


@@ -135,11 +136,24 @@
    </variablelist>
 </refsect1>
 
    </variablelist>
 </refsect1>
 

+ <refsect1><title>Options</title>
+<para>Note that options need to be defined before the commands described in the previous section.</para>
+   <variablelist>
+      <varlistentry><term>--keyring <replaceable>filename</replaceable></term>
+      <listitem><para>With this option it is possible to specify a specific keyring
+      file the command should operate on. The default is that a command is executed
+      on the <filename>trusted.gpg</filename> file as well as on all parts in the
+      <filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</filename>
+      is the primary keyring which means that e.g. new keys are added to this one.
+      </para></listitem>
+      </varlistentry>
+   </variablelist>
+ </refsect1>
+

  <refsect1><title>Files</title>
    <variablelist>
  <refsect1><title>Files</title>
    <variablelist>

-     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
-     <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
-     </varlistentry>
+
+     &file-trustedgpg;

 
      <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
      <listitem><para>Local trust database of archive keys.</para></listitem>
 
      <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
      <listitem><para>Local trust database of archive keys.</para></listitem>


@@ -153,8 +167,6 @@
      <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
      </varlistentry>
 
      <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
      </varlistentry>
 

-
-

    </variablelist>
 
 </refsect1>
    </variablelist>
 
 </refsect1>