Merge configuration format simplification from jak branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9da06b0543e485f3429e6658a7b5d3cea720f497..34a35b2f9dd6066bc737b98dc45e406a0eef5f47 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,14 @@ apt (0.7.25) UNRELEASED; urgency=low
     - fix overly aggressive immediate config propergation
       (thanks to David Kalnischkies)
 
+  [ Julian Andres Klode ]
+  * doc/apt.conf.5.xml:
+    - 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.
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200
 
 apt (0.7.24) unstable; urgency=low