* huge merge to bring the apt debian-sid and ubuntu branches as close

[apt.git] / doc / apt_preferences.5.xml

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 2aacc174af288787345d77769640c83a45161e09..ab0107d36d9a77268e37169d544d4d29c92717a1 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -143,10 +143,11 @@ separated by blank lines.  Records can have one of two forms, a specific form
 and a general form.
 <itemizedlist>
 <listitem>
-<simpara>The specific form assigns a priority (a "Pin-Priority") to a
-specified package and specified version or version range.  For example,
+<simpara>The specific form assigns a priority (a "Pin-Priority") to one or more
+specified packages and specified version or version range.  For example,
 the following record assigns a high priority to all versions of
-the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara>
+the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".
+Multiple packages can be separated by spaces.</simpara>
 
 <programlisting>
 Package: perl
@@ -183,7 +184,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal>
 <programlisting>
 Package: *
 Pin: release a=unstable
-Pin-Priority: 50
+Pin-Priority: 500
 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions
@@ -192,8 +193,8 @@ and whose release Version number is "<literal>3.0</literal>".</simpara>
 
 <programlisting>
 Package: *
-Pin: release a=unstable, v=3.0
-Pin-Priority: 50
+Pin: release a=stable, v=3.0
+Pin-Priority: 500
 </programlisting>
 </listitem>
 </itemizedlist>