merge Julians changes from lp:~mvo/apt/debian-sid

diff --cc debian/changelog
index fc5965d3d284a224ad5e6b5c1439c0eb3d466287,68ee83bac8c23642f9142ebe0c796d004c82dce3..313ae28650ca4206fdb9f32701d555a663948e75
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -11,18 -11,23 +11,29 @@@ apt (0.7.25) UNRELEASED; urgency=lo
      Closes: #479997
    * Polish translation update by Wiktor Wandachowicz
      Closes: #548571
 -  
 -  [ Michael Vogt ]
 +
 +  [ David Kalnischkies ]
    * apt-pkg/packagemanager.cc:
 -    - fix overly aggressive immediate config propergation
 -      (thanks to David Kalnischkies)
 +    - better debug output for ImmediateAdd with depth and why
 +    - improve the message shown for failing immediate configuration
 +  * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
 +  * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
 +  * doc/apt.conf.5.xml:
 +    - provide a few more details about APT::Immediate-Configure
 +  * doc/sources.list.5.xml:
 +    - add note about additional apt-transport-methods
  
+   [ 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.
+   * methods/https.cc:
+     - Add support for authentication using netrc (Closes: #518473), patch
+       by Jussi Hakala <jussi.hakala@hut.fi>.
+ 
   -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200
  
  apt (0.7.24) unstable; urgency=low

diff --cc doc/apt.conf.5.xml
Simple merge