diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-key.8.xml | 24 | ||||
| -rw-r--r-- | doc/apt.ent | 13 | ||||
| -rw-r--r-- | doc/examples/configure-index | 7 |
3 files changed, 33 insertions, 11 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 7b0691b5e..8f445b7f9 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -26,7 +26,8 @@ <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> @@ -135,11 +136,24 @@ </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> - <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> @@ -153,8 +167,6 @@ <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem> </varlistentry> - - </variablelist> </refsect1> diff --git a/doc/apt.ent b/doc/apt.ent index 0b341ec14..da43d8f3d 100644 --- 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> +"> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index be461aaad..87cf97ffe 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -90,11 +90,6 @@ APT TrustCDROM "false"; // consider the CDROM always trusted }; - GPGV - { - TrustedKeyring "/etc/apt/trusted.gpg"; - }; - // Some general options Ignore-Hold "false"; Clean-Installed "true"; @@ -320,6 +315,8 @@ Dir "/" SourceParts "sources.list.d"; VendorList "vendors.list"; VendorParts "vendors.list.d"; + Trusted "trusted.gpg"; + TrustedParts "trusted.gpg.d"; }; // Locations of binaries |