diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 5 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-mark.8.xml | 67 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 6 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 8 |
6 files changed, 55 insertions, 35 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9c6c64dac..431ef8704 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -315,7 +315,7 @@ Reverse Provides: <term><option>--no-replaces</option></term> <term><option>--no-enhances</option></term> <listitem><para>Per default the <literal>depends</literal> and - <literal>rdepends</literal> print all dependencies. This can be twicked with + <literal>rdepends</literal> print all dependencies. This can be tweaked with these flags which will omit the specified dependency type. Configuration Item: <literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::Cache::ShowRecommends</literal>.</para></listitem> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 8e5df1f36..b08ebe80f 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -532,8 +532,9 @@ for i in Sections do index files will not have the checksum fields where possible. Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> where - <literal>Index</literal> can be <literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</literal> and - <literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem> + <literal><replaceable>Index</replaceable></literal> can be <literal>Packages</literal>, <literal>Sources</literal> or + <literal>Release</literal> and <literal><replaceable>Checksum</replaceable></literal> can be <literal>MD5</literal>, + <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem> </varlistentry> <varlistentry><term><option>-d</option></term><term><option>--db</option></term> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 18f26e569..11b53e5e7 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -280,7 +280,7 @@ <varlistentry><term>download</term> <listitem><para><literal>download</literal> will download the given - binary package into the current directoy. + binary package into the current directory. </para></listitem> </varlistentry> 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.conf.5.xml b/doc/apt.conf.5.xml index 477507598..02de89f3b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -50,7 +50,7 @@ <listitem><para>the file specified by the <envar>APT_CONFIG</envar> environment variable (if any)</para></listitem> <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in - alphanumeric ascending order which have no or "<literal>conf</literal>" + alphanumeric ascending order which have either no or "<literal>conf</literal>" as filename extension and which only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file @@ -441,13 +441,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para> <para>Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be checked: If this setting exists the method will only be used if this file exists, e.g. for - the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> + the bzip2 method (the inbuilt) setting is: <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> Note also that list entries specified on the command line will be added at the end of the list specified in the configuration files, but before the default entries. To prefer a type in this case over the ones specified in the configuration files you can set the option direct - not in list style. This will not override the defined list, it will only prefix the list with this type.</para> <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a - preference, but note that most archives doesn't provide uncompressed files so this is mostly only + preference, but note that most archives don't provide uncompressed files so this is mostly only useable for local mirrors.</para></listitem> </varlistentry> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 55504f3e5..f08f92b94 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -69,8 +69,8 @@ You have been warned.</para> <para>Note that the files in the <filename>/etc/apt/preferences.d</filename> directory are parsed in alphanumeric ascending order and need to obey the -following naming convention: The files have no or "<literal>pref</literal>" -as filename extension and which only contain alphanumeric, hyphen (-), +following naming convention: The files have either no or "<literal>pref</literal>" +as filename extension and only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> @@ -265,7 +265,7 @@ 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) or contains the word kde (as a POSIX extended regular expression surrounded by slashes). </para> @@ -277,7 +277,7 @@ Pin-Priority: 500 <para> The rule for those expressions is that they can occur anywhere -where a string can occur. Those, the following pin assigns the +where a string can occur. Thus, the following pin assigns the priority 990 to all packages from a release starting with karmic. </para> |