debian/changelog: fix changelog

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

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 12b03196a80c0247c9e7fe0689dec00d519310df..162c2f00e1525e94e6cf0dfc3c7de70156aadcd7 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -60,6 +60,9 @@ belongs.  It is possible to single out a distribution, "the target release",
 which receives a higher priority than other distributions do by default.
 The target release can be set on the <command>apt-get</command> command
 line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>.
 which receives a higher priority than other distributions do by default.
 The target release can be set on the <command>apt-get</command> command
 line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>.

+Note that this has precedence over any general priority you set in the
+<filename>/etc/apt/preferences</filename> file described later, but not
+over specifically pinned packages.

 For example,
 
 <programlisting>
 For example,
 
 <programlisting>


@@ -143,10 +146,11 @@ separated by blank lines.  Records can have one of two forms, a specific form
 and a general form.
 <itemizedlist>
 <listitem>
 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 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
 
 <programlisting>
 Package: perl


@@ -183,7 +187,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal>
 <programlisting>
 Package: *
 Pin: release a=unstable
 <programlisting>
 Package: *
 Pin: release a=unstable

-Pin-Priority: 500
+Pin-Priority: 50

 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions
 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions


@@ -421,7 +425,7 @@ one or more lines beginning with the word <literal>Explanation:</literal>.
 This provides a place for comments.</para>
 
 <para>The <literal>Pin-Priority:</literal> line in each APT preferences record is
 This provides a place for comments.</para>
 
 <para>The <literal>Pin-Priority:</literal> line in each APT preferences record is

-optional.  If omitted, APT assigs a priority of 1 less than the last value
+optional.  If omitted, APT assigns a priority of 1 less than the last value

 specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para>
 </refsect2>
 </refsect1>
 specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para>
 </refsect2>
 </refsect1>