summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-09-28 15:21:08 +0200
committerJulian Andres Klode <jak@debian.org>2009-09-28 15:21:08 +0200
commit334459abb1f5fa7f8a6be694cf9ecb05d692f01e (patch)
tree61c6bac6c7f19f17b8f86cb3ef7a6b2bd1e619c7
parent31f113db16fc6854be90ca7ec3f7321fd65e99f3 (diff)
doc/apt.conf.5.xml: Deprecate #include, we have apt.conf.d nowadays which should be
sufficient.
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt.conf.5.xml3
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 018b072d8..10e70b8d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apt (0.7.25) UNRELEASED; urgency=low
- Deprecate unquoted values, string concatenation and explain what should
not be written inside a value (quotes,backslash).
- Restrict option names to alphanumerical characters and "/-:._+".
+ - Deprecate #include, we have apt.conf.d nowadays which should be
+ sufficient.
-- Julian Andres Klode <jak@debian.org> Sat, 26 Sep 2009 15:00:28 +0200
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 661f97ab1..a12524328 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -95,7 +95,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
new entry will simply add a new option to the list. If you specify a name you can override
the option as every other option by reassigning a new value to the option.</para>
- <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>:
+ <para>Two specials are allowed, <literal>#include</literal> (which is deprecated
+ and not supported by alternative implementations) and <literal>#clear</literal>:
<literal>#include</literal> will include the given file, unless the filename
ends in a slash, then the whole directory is included.
<literal>#clear</literal> is used to erase a part of the configuration tree. The