From f0599b9c2ee704f97dbea17262107c55f527bbf0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 26 Aug 2009 12:21:54 +0200
Subject: =?UTF-8?q?[=20Nicolas=20Fran=C3=A7ois=20]=20*=20doc/*.=3F.xml=20(?=
 =?UTF-8?q?manpages):=20=20=20-=20add=20contrib=20to=20author=20tags=20and?=
 =?UTF-8?q?=20also=20add=20refmiscinfo=20to=20fix=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/apt_preferences.5.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/apt_preferences.5.xml')

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index ff63f1dd3..12ea606b7 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -20,6 +20,7 @@
  <refmeta>
    <refentrytitle>apt_preferences</refentrytitle>
    <manvolnum>5</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
 
  <!-- Man page title -->
-- 
cgit v1.2.3


From daa4aa525a9d0de9a9a64be59615fc4be044bb83 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 8 Sep 2009 17:47:59 +0200
Subject: document the new preferences.d folder in apt_preferences(Closes:
 #544017)

---
 doc/apt_preferences.5.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'doc/apt_preferences.5.xml')

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 12ea606b7..159d61f2b 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -32,7 +32,8 @@
 <refsect1>
 <title>Description</title>
 <para>The APT preferences file <filename>/etc/apt/preferences</filename>
-can be used to control which versions of packages will be selected
+and the fragment files in the <filename>/etc/apt/preferences.d/</filename>
+folder can be used to control which versions of packages will be selected
 for installation.</para>
 
 <para>Several versions of a package may be available for installation when
@@ -610,6 +611,13 @@ apt-get install <replaceable>package</replaceable>/sid
 </refsect2>
 </refsect1>
 
+<refsect1>
+<title>Files</title>
+  <variablelist>
+    &file-preferences;
+  </variablelist>
+</refsect1>
+
 <refsect1>
 <title>See Also</title>
 <para>&apt-get; &apt-cache; &apt-conf; &sources-list;
-- 
cgit v1.2.3