* merged from main

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5b3c1a55c1496be45ca55860067a91da0606f26d..26d9354fe9b70ded546fc943f9929f082a21fca2 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -128,6 +128,18 @@ Acquire
     Dl-Limit "7";        // 7Kb/sec maximum download rate
   };
 
+  // HTTPS method configuration:
+  // - uses the http proxy config 
+  // - uses the http cache-control values
+  // - uses the http Dl-Limit values
+  https 
+  {
+       Verify-Peer "false";
+       SslCert "/etc/apt/some.pem";
+        CaPath  "/etc/ssl/certs";
+        Verify-Host" "2";
+  };
+
   ftp
   {
     Proxy "ftp://127.0.0.1/";
@@ -245,6 +257,10 @@ DPkg
    // Control the size of the command line passed to dpkg.
    MaxBytes 1024;
    MaxArgs 350;
+
+   // controls if apt will apport on the first dpkg error or if it 
+   // tries to install as many packages as possible
+   StopOnError "true";
 }
 
 /* Options you can set to see some debugging text They correspond to names
@@ -260,11 +276,12 @@ Debug
   pkgDPkgProgressReporting "false";
   pkgOrderList "false";
   pkgAutoRemove "false";   // show information about automatic removes
-
+  BuildDeps "false";
   pkgInitialize "false";   // This one will dump the configuration space
   NoLocking "false";
   Acquire::Ftp "false";    // Show ftp command traffic
   Acquire::Http "false";   // Show http command traffic
+  Acquire::Https "false";   // Show https debug
   Acquire::gpgv "false";   // Show the gpgv traffic
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";