Merge my tree and the remote tree (no change, I guess)

[apt.git] / doc / apt_preferences.5.xml

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index f08f92b94464a4740382d0e40e894ecd5ea2d517..7df7b0ed79b1b97b58e3394f740d9b32f3f62f45 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -17,7 +17,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>16 February 2010</date>
+   <date>2010-02-16T00:00:00Z</date>

  </refentryinfo>
 
  <refmeta>
  </refentryinfo>
 
  <refmeta>


@@ -287,6 +287,7 @@ Pin: release n=karmic*
 Pin-Priority: 990
 </programlisting>
 
 Pin-Priority: 990
 </programlisting>
 

+<para>

 If a regular expression occurs in a <literal>Package</literal> field,
 the behavior is the same as if this regular expression were replaced
 with a list of all package names it matches. It is undecided whether
 If a regular expression occurs in a <literal>Package</literal> field,
 the behavior is the same as if this regular expression were replaced
 with a list of all package names it matches. It is undecided whether


@@ -295,7 +296,7 @@ pins first, so later specific pins override it.
 
 The pattern "<literal>*</literal>" in a Package field is not considered
 a glob() expression in itself.
 
 The pattern "<literal>*</literal>" in a Package field is not considered
 a glob() expression in itself.

-
+</para>

 </refsect2>
 
 
 </refsect2>