diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 10 | ||||
| -rw-r--r-- | doc/apt-key.8.xml | 32 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
3 files changed, 28 insertions, 15 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index e603ec5bb..a7b786dfe 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -545,6 +545,16 @@ Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--mark-auto</option></term> + <listitem><para> + After successful installation, mark all freshly installed packages as + automatically installed, which will cause each of the packages to be + removed when no more manually installed packages depend on this package. + This is equally to running <command>apt-mark auto</command> for all + installed packages. + Configuration Item: <literal>APT::Get::Mark-Auto</literal>.</para></listitem> + </varlistentry> + <varlistentry><term><option>--no-remove</option></term> <listitem><para>If any packages are to be removed apt-get immediately aborts without prompting. diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 1ab4d784e..2c8c3f655 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -25,7 +25,7 @@ <!-- Man page title --> <refnamediv> <refname>apt-key</refname> - <refpurpose>APT key management utility</refpurpose> + <refpurpose>Deprecated APT key management utility</refpurpose> </refnamediv> &synopsis-command-apt-key; @@ -37,13 +37,15 @@ authenticated using these keys will be considered trusted. </para> <para> - Note that if usage of <command>apt-key</command> is desired the additional + Use of <command>apt-key</command> is deprecated, except for the use of + <command>apt-key del</command> in maintainer scripts to remove existing + keys from the main keyring. + If such usage of <command>apt-key</command> is desired the additional installation of the GNU Privacy Guard suite (packaged in - <package>gnupg</package>) is required. For this reason alone the programmatic - usage (especially in package maintainer scripts!) is strongly discouraged. - Further more the output format of all commands is undefined and can and does - change whenever the underlying commands change. <command>apt-key</command> will - try to detect such usage and generates warnings on stderr in these cases. + <package>gnupg</package>) is required. + </para> + <para> + apt-key(8) will last be available in Debian 11 and Ubuntu 22.04. </para> </refsect1> @@ -63,7 +65,7 @@ <refsect1><title>Commands</title> <variablelist> - <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option></term> + <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option> (deprecated)</term> <listitem> <para> Add a new key to the list of trusted keys. @@ -85,7 +87,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option></term> + <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option> (mostly deprecated)</term> <listitem> <para> @@ -96,7 +98,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option></term> + <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option> (deprecated)</term> <listitem> <para> @@ -107,7 +109,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>exportall</option></term> + <varlistentry><term><option>exportall</option> (deprecated)</term> <listitem> <para> @@ -118,7 +120,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>list</option>, <option>finger</option></term> + <varlistentry><term><option>list</option>, <option>finger</option> (deprecated)</term> <listitem> <para> @@ -129,7 +131,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>adv</option></term> + <varlistentry><term><option>adv</option> (deprecated)</term> <listitem> <para> Pass advanced options to gpg. With <command>adv --recv-key</command> you @@ -160,7 +162,7 @@ </listitem> </varlistentry> - <varlistentry><term><option>net-update</option></term> + <varlistentry><term><option>net-update</option> (deprecated)</term> <listitem> <para> @@ -183,7 +185,7 @@ <refsect1><title>Options</title> <para>Note that options need to be defined before the commands described in the previous section.</para> <variablelist> - <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term> + <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option> (deprecated)</term> <listitem><para>With this option it is possible to specify a particular 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 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f04e32502..d9f269344 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -73,6 +73,7 @@ APT Assume-Yes "<BOOL>"; // not as dangerous, but use with care still Assume-No "<BOOL>"; Trivial-Only "<BOOL>"; + Mark-Auto "<BOOL>"; Remove "<BOOL>"; AllowUnauthenticated "<BOOL>"; // skip security |