diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-key.8.xml | 16 | ||||
| -rw-r--r-- | doc/apt-mark.8.xml | 67 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 43 | ||||
| -rw-r--r-- | doc/po/de.po | 2 |
4 files changed, 103 insertions, 25 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index f1cc3ac02..9bfab84b6 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -136,6 +136,22 @@ </listitem> </varlistentry> + + <varlistentry><term>net-update</term> + <listitem> + <para> + + Update the local keyring with the keys of a key server + and removes from the keyring the archive keys which are no + longer valid. This requires an installed wget and an APT + build configured to have a server to fetch from. APT in + Debian does not support this command, but Ubuntu's APT + does. + + </para> + + </listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index ec50d6f76..01c8665dd 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -18,7 +18,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>9 August 2009</date> + <date>21 April 2011</date> </refentryinfo> <refmeta> @@ -42,12 +42,13 @@ <group choice="plain"> <arg choice="plain"> <group choice="req"> - <arg choice="plain">markauto</arg> - <arg choice="plain">unmarkauto</arg> + <arg choice="plain">auto</arg> + <arg choice="plain">manual</arg> + <arg choice="plain">showauto</arg> + <arg choice="plain">showmanual</arg> </group> <arg choice="plain" rep="repeat"><replaceable>package</replaceable></arg> </arg> - <arg choice="plain">showauto</arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -65,27 +66,60 @@ <command>apt-get</command> or <command>aptitude</command>. </para> <variablelist> - <varlistentry><term>markauto</term> - <listitem><para><literal>markauto</literal> is used to mark a + <varlistentry><term>auto</term> + <listitem><para><literal>auto</literal> is used to mark a package as being automatically installed, which will cause the package to be removed when no more manually installed packages depend on this package. </para></listitem> </varlistentry> - <varlistentry><term>unmarkauto</term> - <listitem><para><literal>unmarkauto</literal> is used to mark a + <varlistentry><term>manual</term> + <listitem><para><literal>manual</literal> is used to mark a package as being manually installed, which will prevent the package from being automatically removed if no other packages depend on it. </para></listitem> </varlistentry> + <varlistentry><term>hold</term> + <listitem><para><literal>hold</literal> is used to mark a + package as hold back, which will prevent the package from being + automatically installed, upgraded or removed. + The command is only a wrapper around <command>dpkg --set-selections</command> + and the state is therefore maintained by &dpkg; and not effected + by the <option>--filename</option> option. + </para></listitem> + </varlistentry> + + <varlistentry><term>unhold</term> + <listitem><para><literal>unhold</literal> is used to cancel a + previously set hold on a package to allow all actions again. + </para></listitem> + </varlistentry> + <varlistentry><term>showauto</term> <listitem><para><literal>showauto</literal> is used to print a list of automatically installed packages with each package on a new line. + All automatically installed packages will be listed if no package is given. + If packages are given only those which are automatically installed will be shown. + </para></listitem> + </varlistentry> + + <varlistentry><term>showmanual</term> + <listitem><para><literal>showmanual</literal> can be used in + the same way as <literal>showauto</literal> except that it will print + a list of manually installed packages instead. </para></listitem> </varlistentry> + + <varlistentry><term>showhold</term> + <listitem><para><literal>showhold</literal> is used to print a list + of packages on hold in the same way as for the other show commands. + </para></listitem> + </varlistentry> + + </variablelist> </refsect1> @@ -102,23 +136,8 @@ is <filename>extended_status</filename> in the directory defined by the Configuration Item: <literal>Dir::State</literal>.</para></listitem> </varlistentry> - - <varlistentry><term><option>-h</option></term> - <term><option>--help</option></term> - <listitem><para>Show a short usage summary. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term><option>-v</option></term> - <term><option>--version</option></term> - <listitem><para>Show the program version. - </para> - </listitem> - </varlistentry> - + &apt-commonoptions; </variablelist> </refsect1> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 219da7cd1..55504f3e5 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -259,6 +259,49 @@ Pin-Priority: 500 </refsect2> +<refsect2><title>Regular expressions and glob() syntax</title> +<para> +APT also supports pinning by glob() expressions and regular +expressions surrounded by /. For example, the following +example assigns the priority 500 to all packages from +experimental where the name starts with gnome (as a glob()-like +expression or contains the word kde (as a POSIX extended regular +expression surrounded by slashes). +</para> + +<programlisting> +Package: gnome* /kde/ +Pin: release n=experimental +Pin-Priority: 500 +</programlisting> + +<para> +The rule for those expressions is that they can occur anywhere +where a string can occur. Those, the following pin assigns the +priority 990 to all packages from a release starting with karmic. +</para> + +<programlisting> +Package: * +Pin: release n=karmic* +Pin-Priority: 990 +</programlisting> + +If a regular expression occurs in a <literal>Package</literal> field, +the behavior is the same as if this regular expression were replaced +with a list of all package names it matches. It is undecided whether +this will change in the future, thus you should always list wild-card +pins first, so later specific pins override it. + +The pattern "<literal>*</literal>" in a Package field is not considered +a glob() expression in itself. + +</refsect2> + + + + + <refsect2> <title>How APT Interprets Priorities</title> diff --git a/doc/po/de.po b/doc/po/de.po index 75595df07..891e69964 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1912,7 +1912,7 @@ msgstr "" "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></" "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group " -"choice=\"req\"> <arg>shell</arg> <arg>Abbild</arg> </group>" +"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:51 |