X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/076b71228a1439b7c871246c8cc29066ac2aaa70..178dd062eeaa1d7e56770455e005dc27aa71f026:/doc/apt_preferences.5.xml
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.
Note that the files in the /etc/apt/preferences.d
directory are parsed in alphanumeric ascending order and need to obey the
-following naming convention: The files have no or "pref"
-as filename extension and which only contain alphanumeric, hyphen (-),
+following naming convention: The files have either no or "pref"
+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 Dir::Ignore-Files-Silently
@@ -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).
@@ -277,7 +277,7 @@ Pin-Priority: 500
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.