diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-27 00:01:34 +0100 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-27 00:01:34 +0100 |
commit | b569b4650c647c3aef5341c40d208a37211b57aa (patch) | |
tree | 0560257bc6a7b90fff154ed99beccccd89fd71dc | |
parent | 4fb6fdaf95de3db51ef386de7b494ed4c889bedc (diff) |
remove wrong pin-priority is optional remark (Closes: #574944)
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | doc/apt_preferences.5.xml | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 9bae5210e..17affee4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! - origin can be used to match a hostname (Closes: #352667) + - remove wrong pin-priority is optional remark (Closes: #574944) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c927f327a..77b7776e8 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -476,10 +476,6 @@ distribution.</para> <para>Each record in the APT preferences file can optionally begin with 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 -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> |