merged from the mvo branch

diff --cc debian/changelog
index b379313e44095f46c03b05479ab53b7d39965afc,2fb53972dd5e12d2f8e5b6ff378dcea6bf9af513..ff1483dfc491b824c05c2ada045f44dd44c2dbcc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -91,28 -73,10 +91,31 @@@ apt (0.7.22) UNRELEASED; urgency=lo
    * build fixes for g++-4.4
    * cmdline/apt-mark:
      - 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.
 +  * Introduce support for the Enhances field. (Closes: #137583) 
 +  * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
 +  * configure-index: document Dir::Etc::SourceParts and some other options
 +    (Closes: #459605)
 +  * Remove Eugene V. Lyubimkin from uploaders as requested.
 +  * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc:
 +    - Support reading until EOF if Size=0 to match behaviour of
 +      SHA1Summation and SHA256Summation
 +
 +  [ Osamu Aoki ]
 +  * Updated cron script to support backups by hardlinks and 
 +    verbose levels.  All features turned off by default. 
 +  * Added more error handlings.  Closes: #438803, #462734, #454989, 
 +  * Documented all cron script related configuration items in 
 +    configure-index.
 +
    [ Dereck Wonnacott ]
    * apt-ftparchive might write corrupt Release files (LP: #46439)
    * Apply --important option to apt-cache depends (LP: #16947) 

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