* merged from dpkg-log branch

diff --combined doc/examples/configure-index
index f4a196b680ababbd2e56f8ab7b51a9365676d5b5,4c730795db3474c2fe16cae1bccb020f6ca36c51..ba3ed3892d5a42ed293f5eafccf81db6ab910dd0
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -97,11 -97,11 +97,11 @@@ AP
  
    // consider Recommends, Suggests as important dependencies that should
    // be installed by default
 -  APT::Install-Recommends "false";
 -  APT::Install-Suggests "false";
 +  Install-Recommends "false";
 +  Install-Suggests "false";
  
    // consider dependencies of packages in this section manual
 -  Never-MarkAuto-Section "metapackages";
 +  Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };
  
    // Write progress messages on this fd (for stuff like base-config)
    Status-Fd "-1";
@@@ -230,7 -230,7 +230,7 @@@ Dir "/
  
    // Location of the logfile
    Log "var/log/apt" {
-       Name "term.log";
+       Terminal "term.log";
    };
  };