From a0a1ce6df590187fff6e0e1c8c2783c49d910683 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 23 Mar 2011 02:09:14 +0100
Subject: * doc/apt_preferences.5.xml:   - correct typo spotted by Charles
 Plessy (Closes: #619088)

---
 doc/apt_preferences.5.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt_preferences.5.xml')

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 0d22d0413..903d27da2 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -127,7 +127,7 @@ files are marked as "NotAutomatic: yes" like the debian experimental archive.</s
 
 <para>If the target release has not been specified then APT simply assigns
 priority 100 to all installed package versions and priority 500 to all
-uninstalled package versions, expect versions coming from archives which
+uninstalled package versions, except versions coming from archives which
 in their <filename>Release</filename> files are marked as "NotAutomatic: yes" -
 these versions get the priority 1.</para>
 
-- 
cgit v1.2.3


From fcaf14fe20f743549ce968bdd2f511684ceb2394 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 23 Mar 2011 02:21:58 +0100
Subject: document ButAutomaticUpgrades together with NotAutomatic as suggested
 by Charles Plessy (Closes: #619083)

---
 doc/apt_preferences.5.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'doc/apt_preferences.5.xml')

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 903d27da2..219da7cd1 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -105,12 +105,16 @@ algorithm to set the priorities of the versions of a package.  Assign:
 <varlistentry>
 <term>priority 1</term>
 <listitem><simpara>to the versions coming from archives which in their <filename>Release</filename>
-files are marked as "NotAutomatic: yes" like the debian experimental archive.</simpara></listitem>
+files are marked as "NotAutomatic: yes" but <emphasis>not</emphasis> as "ButAutomaticUpgrades: yes"
+like the debian <literal>experimental</literal> archive.</simpara></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>priority 100</term>
-<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
+<listitem><simpara>to the version that is already installed (if any) and to the versions coming
+from archives which in their <filename>Release</filename> files are marked as "NotAutomatic: yes" and
+"ButAutomaticUpgrades: yes" like the debian backports archive since <literal>squeeze-backports</literal>.
+</simpara></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -129,7 +133,8 @@ files are marked as "NotAutomatic: yes" like the debian experimental archive.</s
 priority 100 to all installed package versions and priority 500 to all
 uninstalled package versions, except versions coming from archives which
 in their <filename>Release</filename> files are marked as "NotAutomatic: yes" -
-these versions get the priority 1.</para>
+these versions get the priority 1 or priority 100 if it is additionally marked
+as "ButAutomaticUpgrades: yes".</para>
 
 <para>APT then applies the following rules, listed in order of precedence,
 to determine which version of a package to install.
-- 
cgit v1.2.3