doc/apt.conf.5.xml: Deprecate #include, we have apt.conf.d nowadays which should be

sufficient.

diff --git a/debian/changelog b/debian/changelog
index 018b072d866dc106259cd8d0a8c1ea016fc12bb8..10e70b8d4ba9113002b3f3a46442bc4f608b59ea 100644 (file)
--- 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 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
 
 
  -- 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 661f97ab1ca5ea30be265f2cb916c3c798eed093..a1252432800aff2c3030d9fb4073947ea9de8aad 100644 (file)
--- 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>
 
    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
    <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