11 files changed, 27 insertions, 18 deletions
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 29bf96751..e00b6417a 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -44,7 +44,8 @@
      display a list of packages. It supports shell pattern for matching 
      package names and the following options:
        <option>--installed</option>, 
-       <option>--upgradable</option>, 
+       <option>--upgradable</option>,
+       <option>--upgradeable</option>,
        <option>--all-versions</option>
      are supported.
      </para></listitem>
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 5ea59bf9c..28b795d43 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -339,14 +339,21 @@ only if there is no installed version of the package</simpara></listitem>
 <term>P &lt; 0</term>
 <listitem><simpara>prevents the version from being installed</simpara></listitem>
 </varlistentry>
+<varlistentry>
+<term>P = 0</term>
+<listitem><simpara>has undefined behaviour, do not use it.</simpara></listitem>
+</varlistentry>
 </variablelist>
 </para>
 
-<para>If any specific-form records match an available package version then the
-first such record determines the priority of the package version.  
-Failing that,
-if any general-form records match an available package version then the
-first such record determines the priority of the package version.</para>
+<para>
+The first specific-form record matching an available package version determines
+the priority of the package version.
+Failing that, the priority of the package is defined as the maximum of all
+priorities defined by generic-form records matching the version.
+Records defined using patterns in the Pin field other than "*" are treated like
+specific-form records.
+</para>
 
 <para>For example, suppose the APT preferences file contains the three
 records presented earlier:</para>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fc3b5a6c6..35db9571d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -531,7 +531,8 @@ msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
 "<option>--installed</option>, <option>--upgradable</option>, "
-"<option>--all-versions</option> are supported."
+"<option>--upgradeable</option>, <option>--all-versions</option> are "
+"supported."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 12d6a4c4d..4f001b85e 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -662,13 +662,13 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
 "unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
 "folgenden Optionen werden unterstützt: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:54
diff --git a/doc/po/es.po b/doc/po/es.po
index 9ace0bd4f..84dd3a127 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -742,7 +742,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 8d7c29f37..d1e60a655 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -658,7 +658,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "La commande <literal>list</literal> est utilisée pour afficher une liste de "
diff --git a/doc/po/it.po b/doc/po/it.po
index 21d5611ea..af5fa2914 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -710,13 +710,13 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
 "Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
 "pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:54
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 5d6c183cb..a74d2af3a 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -704,12 +704,12 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
 "のマッチングにシェルパターン、そしてオプション <option>--installed</"
-"option>、 <option>--upgradable</option>、 <option>--all-versions</option> を"
+"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 <option>--all-versions</option> を"
 "サポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 3d89db060..229ac02c1 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index dc91fddca..35efdfe30 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -707,7 +707,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b6bd0fe09..9a9f8ec56 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -523,7 +523,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""