Merged with debian-sid branch.

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 35a8fb2b4f68e9236546d0c5d6425770aa2fba82..5b57c96a326b86569cf0be3d4847a02eba999509 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ apt (0.7.20) unstable; urgency=low
     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
       (Closes: #438559)
     - Mentioned '/* ... */' comments. (Closes: #507601)
+  * methods/{http,https,ftp}, doc/apt.conf.5.xml:
+    - Changed and unified the code that determines which proxy to use. Now
+      'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
+      and '{http,ftp}_proxy' environment variables are used only if options
+      mentioned above are not specified.
+      (Closes: #445985, #157759, #320184, #365880, #479617)
 
   [ Michael Vogt ]
   * add option to "apt-get build-dep" to mark the needed