Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

diff --combined doc/examples/configure-index
index df6bbb1e3d71e0e531084627e198cecd6633f3d6,020f0d2ceb1efd1e10505721d15cf248293e1100..2d9f829ba89392aaa95c0dac98817d3a0f70515d
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -149,7 -149,7 +149,7 @@@ AP
      MaxSize "0"; // (new)
      // - Set maximum size of the cache in MB (0=disable). If the cache
      //   is bigger, cached package files are deleted until the size
-     //   requirement is met (the biggest packages will be deleted 
+     //   requirement is met (the oldest packages will be deleted 
      //   first).
  
      Update-Package-Lists "0";
@@@ -450,7 -450,7 +450,7 @@@ Debu
    aptcdrom "false";        // Show found package files
    IdentCdrom "false";
    acquire::netrc "false";  // netrc parser
 -  
 +  RunScripts "false";      // debug invocation of external scripts  
  }
  
  pkgCacheGen::Essential "native"; // other modes: all, none, installed