diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cdrom.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 12 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index e57942610..423569fc1 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -65,7 +65,7 @@ <varlistentry><term>add</term> <listitem><para><literal>add</literal> is used to add a new disc to the source list. It will unmount the - CDROM device, prompt for a disk to be inserted and then procceed to + CDROM device, prompt for a disk to be inserted and then proceed to scan it and copy the index files. If the disc does not have a proper <filename>disk</filename> directory you will be prompted for a descriptive title. diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index eb61eae51..f88dbe631 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -39,6 +39,7 @@ <arg><option>--delink</option></arg> <arg><option>--readonly</option></arg> <arg><option>--contents</option></arg> + <arg><option>--arch <replaceable>architecture</replaceable></option></arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice="req"> @@ -542,11 +543,18 @@ for i in Sections do <listitem><para> Make the caching databases read only. Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem> - </varlistentry> + </varlistentry> + + <varlistentry><term><option>-a</option></term><term><option>--arch</option></term> + <listitem><para>Accept in the <literal>packages</literal> and <literal>contents</literal> + commands only package files matching <literal>*_arch.deb</literal> or + <literal>*_all.deb</literal> instead of all package files in the given path. + Configuration Item: <literal>APT::FTPArchive::Architecture</literal>.</para></listitem> + </varlistentry> <varlistentry><term><option>APT::FTPArchive::AlwaysStat</option></term> <listitem><para> - &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + &apt-ftparchive; caches as much as possible of metadata in a cachedb. If packages are recompiled and/or republished with the same version again, this will lead to problems as the now outdated cached metadata like size and checksums will be used. With this option enabled this will no longer happen as it will be checked if the file was changed. diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 9a4791c08..3d7896226 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>04 May 2009</date> + <date>16 February 2010</date> </refentryinfo> <refmeta> @@ -53,6 +53,14 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version.</para> +<para>Preferences are a strong power in the hands of a system administrator +but they can become also their biggest nightmare if used without care! +APT will not questioning the preferences so wrong settings will therefore +lead to uninstallable packages or wrong decisions while upgrading packages. +Even more problems will arise if multiply distribution releases are mixed +without a good understanding of the following paragraphs. +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>" |