diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-05-02 13:40:45 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-05-02 13:40:45 +0200 |
commit | 66c8f0766ef9f2d660251ece524fcb82d5ea3813 (patch) | |
tree | 561f837db522d16779fd1201cdc0719345671911 /doc | |
parent | eaa204a9808eb2392f4a03d703b585ba3aa3b018 (diff) | |
parent | 3036f1e491ec1c71fb8fe9ff35954cebb2574320 (diff) |
* apt-pkg/acquire.{cc,h}:
* Fix broken use of awk in apt-key that caused removal of the wrong keys
from the keyring. Closes: #412572
* merged from Christian Perrier:
* mr.po: New Marathi translation Closes: #416806
* zh_CN.po: Updated by Eric Pareja Closes: #416822
* tl.po: Updated by Eric Pareja Closes: #416638
* gl.po: Updated by Jacobo Tarrio
Closes: #412828
* da.po: Updated by Claus Hindsgaul
Closes: #409483
* fr.po: Remove a non-breakable space for usability
issues. Closes: #408877
* ru.po: Updated Russian translation. Closes: #405476
* *.po: Unfuzzy after upstream typo corrections
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
* NMU
* Fix broken use of awk in apt-key that caused removal of the wrong keys
from the keyring. Closes: #412572
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apt_preferences.5.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12b03196a..ab0107d36 100644 --- 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 |