Merge configuration format simplification from jak branch

diff --cc debian/changelog
index 9da06b0543e485f3429e6658a7b5d3cea720f497,10e70b8d4ba9113002b3f3a46442bc4f608b59ea..34a35b2f9dd6066bc737b98dc45e406a0eef5f47
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,21 -3,16 +3,29 @@@ apt (0.7.25) UNRELEASED; urgency=lo
    [ Christian Perrier ]
    * Fix apt-ftparchive(1) wrt description of the "-o" option.
      Thanks to Dann Frazier for the patch. Closes: #273100
 +  * po/LINGUAS. Re-disable Hebrew. Closes: #534992
 +  * po/LINGUAS. Enable Asturian and Lithuanian
 +  * Fix typo in apt-cache.8.xml: nessasarily
 +  * Fix "with with" in apt-get.8.xml
 +  * Fix some of the typos mentioned by the german team
 +    Closes: #479997
 +  * Polish translation update by Wiktor Wandachowicz
 +    Closes: #548571
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.cc:
 +    - fix overly aggressive immediate config propergation
 +      (thanks to David Kalnischkies)
  
 - -- Julian Andres Klode <jak@debian.org>  Sat, 26 Sep 2009 15:00:28 +0200
+   [ 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