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

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 17a770b730a5b2c1095223bf5e6174f305d4d64c..313ae28650ca4206fdb9f32701d555a663948e75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,19 @@ apt (0.7.25) UNRELEASED; urgency=low
   * 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