Merge with Michael and resolve conflicts

[apt.git] / doc / examples / configure-index

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5ab84fe05dac49a500f687a94995ec0f8437af0c..f8abd75ed7e9863600cac66e5490ed6e4cd6d794 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -74,7 +74,7 @@ APT
 
   Authentication
   {
-     Trust-CDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CDROM always trusted
   };
 
   GPGV
@@ -117,6 +117,7 @@ Acquire
     No-Cache "false";
     Max-Age "86400";     // 1 Day age on index files
     No-Store "false";    // Prevent the cache from storing archives    
+    Dl-Limit "7";        // 7Kb/sec maximum download rate
   };
 
   ftp
@@ -243,8 +244,10 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
+  pkgAcquire::Auth "false";
   pkgDPkgPM "false";
   pkgDPkgProgressReporting "false";
   pkgOrderList "false";