merged from the mvo branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b379313e44095f46c03b05479ab53b7d39965afc..ff1483dfc491b824c05c2ada045f44dd44c2dbcc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,7 +93,10 @@ apt (0.7.22) UNRELEASED; urgency=low
     - add "showauto" option to show automatically installed packages
   * document --install-recommends and --no-install-recommends
     (thanks to Dereck Wonnacott, LP: #126180)
-  
+  * doc/apt.conf.5.xml:
+    - merged patch from Aurélien Couderc to improve the text
+      (thanks!)
+
   [ Julian Andres Klode ]
   * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
     ReadConfigFile.