From 319810767180e5c57c296b06c93e3ebec9f36a8e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 18 Feb 2010 00:05:14 +0100
Subject:   - add --arch option for apt-ftparchive packages and contents
 commands   - if an arch is given accept only *_all.deb and *_arch.deb instead
     of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710)

---
 doc/apt-ftparchive.1.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'doc')

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.
-- 
cgit v1.2.3


From d9dedf304b384763278f5b39aa0dc29e112185c3 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 18 Feb 2010 00:37:52 +0100
Subject: * doc/apt_preferences.5.xml:   - explicitly warn against careless use
 (Closes: #567669)

---
 debian/changelog          |  2 ++
 doc/apt_preferences.5.xml | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index b91bbdfd3..f0ab5025b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ apt (0.7.26) UNRELEASED; urgency=low
     - include all existing Translation files in the Cache (Closes: 564137)
   * debian/control:
     - update with no changes to debian policy 3.8.4
+  * doc/apt_preferences.5.xml:
+    - explicitly warn against careless use (Closes: #567669)
 
   [ Ivan Masár ]
   * Slovak translation update. Closes: #568294
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>"
-- 
cgit v1.2.3


From 3c5a611808e7af5aec4c2ab12ce0bce79f74928d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 18 Feb 2010 02:15:23 +0100
Subject: * doc/apt-cdrom.8.xml:   - fix typo spotted by lintian: proc(c)eed

---
 debian/changelog    | 2 ++
 doc/apt-cdrom.8.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 856e356b7..dbeed4502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low
     - explicitly warn against careless use (Closes: #567669)
   * debian/rules:
     - remove creation of empty dir /usr/share/apt
+  * doc/apt-cdrom.8.xml:
+    - fix typo spotted by lintian: proc(c)eed
 
   [ Ivan Masár ]
   * Slovak translation update. Closes: #568294
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.
-- 
cgit v1.2.3