origin can be used to match a hostname (Closes: #352667)

diff --git a/debian/changelog b/debian/changelog
index f48cbf2753e2ddd5189ddc8c1d65e3667b81ae90..9bae5210e119760ba3e9d658203a0f2f8400f09b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ apt (0.7.26) UNRELEASED; urgency=low
     - fix two typos and be more verbose in the novice warning.
       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)
   * 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 c4f18d90afd4ed52f9fe6cb5c099087a346ccf52..c927f327a4a1d0fc080d4f2bda80a712ba88d4db 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -195,8 +195,15 @@ Pin: origin ""
 Pin-Priority: 999
 </programlisting>
 
-<simpara>A note of caution: the keyword used here is "<literal>origin</literal>".
-This should not be confused with the Origin of a distribution as
+<simpara>A note of caution: the keyword used here is "<literal>origin</literal>"
+which can be used to match a hostname. The following record will assign a high priority
+to all versions available from the server identified by the hostname "ftp.de.debian.org"</simpara>
+<programlisting>
+Package: *
+Pin: origin "ftp.de.debian.org"
+Pin-Priority: 999
+</programlisting>
+<simpara>This should <emphasis>not</emphasis> be confused with the Origin of a distribution as
 specified in a <filename>Release</filename> file.  What follows the "Origin:" tag
 in a <filename>Release</filename> file is not an Internet address
 but an author or vendor name, such as "Debian" or "Ximian".</simpara>