diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
| commit | a9d2fdce1f1d5b4b428c215189a5b204ff91108b (patch) | |
| tree | 87870e8f3c6c66653dabe165fde5cc78a8b337e4 /doc/apt_preferences.5.xml | |
| parent | aaa7858c3583617b068bd87af4e17be4d02da0bf (diff) | |
| parent | e449f717078978396b76a2fdae844196888d0211 (diff) | |
merge with debian-sid release 0.8.15
Diffstat (limited to 'doc/apt_preferences.5.xml')
| -rw-r--r-- | doc/apt_preferences.5.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 55504f3e5..f08f92b94 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -69,8 +69,8 @@ You have been warned.</para> <para>Note that the files in the <filename>/etc/apt/preferences.d</filename> directory are parsed in alphanumeric ascending order and need to obey the -following naming convention: The files have no or "<literal>pref</literal>" -as filename extension and which only contain alphanumeric, hyphen (-), +following naming convention: The files have either no or "<literal>pref</literal>" +as filename extension and only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> @@ -265,7 +265,7 @@ APT also supports pinning by glob() expressions and regular expressions surrounded by /. For example, the following example assigns the priority 500 to all packages from experimental where the name starts with gnome (as a glob()-like -expression or contains the word kde (as a POSIX extended regular +expression) or contains the word kde (as a POSIX extended regular expression surrounded by slashes). </para> @@ -277,7 +277,7 @@ Pin-Priority: 500 <para> The rule for those expressions is that they can occur anywhere -where a string can occur. Those, the following pin assigns the +where a string can occur. Thus, the following pin assigns the priority 990 to all packages from a release starting with karmic. </para> |