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 9e851d7533f7ede88e1c2049d9ddb83a56fa2f84..f8abd75ed7e9863600cac66e5490ed6e4cd6d794 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -244,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";