summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt_preferences.5.xml10
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c5a786919..eebef40ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ apt (0.7.24) UNRELEASED; urgency=low
a bit and improve the documentation for this option group.
* doc/apt.ent, all man pages:
- move the description of files to globally usable entities
+ * doc/apt_preferences.5.xml:
+ - document the new preferences.d folder (Closes: #544017)
-- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200
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
@@ -611,6 +612,13 @@ apt-get install <replaceable>package</replaceable>/sid
</refsect1>
<refsect1>
+<title>Files</title>
+ <variablelist>
+ &file-preferences;
+ </variablelist>
+</refsect1>
+
+<refsect1>
<title>See Also</title>
<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
</para>