summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/examples/configure-index8
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9024f687d..615a0efcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,9 @@ apt (0.7.22) UNRELEASED; urgency=low
* apt-pkg/contrib/configuration.cc: Fix a small memory leak in
ReadConfigFile.
* Introduce support for the Enhances field. (Closes: #137583)
- * Support /etc/apt/preferences.d (Closes: #535512)
+ * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
+ * configure-index: document Dir::Etc::SourceParts and some other options
+ (Closes: #459605)
-- Julian Andres Klode <jak@debian.org> Fri, 03 Jul 2009 08:27:35 +0200
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index cea0dcc09..c2b1bb272 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -219,10 +219,14 @@ Dir "/"
// Config files
Etc "etc/apt/" {
- SourceList "sources.list";
Main "apt.conf";
- Preferences "preferences";
Parts "apt.conf.d/";
+ Preferences "preferences";
+ PreferencesParts "preferences.d";
+ SourceList "sources.list";
+ SourceParts "sources.list.d";
+ VendorList "vendors.list";
+ VendorParts "vendors.list.d";
};
// Locations of binaries