* merge patch that enforces stricter https server certificate

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index e5c4551a190673c5a8fe475ce0c8b915f6d06cb8..a6ad56067986a83c9f5b5abc6ff4de059d74095d 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -2,7 +2,7 @@
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is (except for the
    last line) a completely valid file. Most of the options have sane default
-   values, unless you have specific needs you should NOT include arbitary
+   values, unless you have specific needs you should NOT include arbitrary
    items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default
@@ -77,6 +77,12 @@ APT
      NoAct "false";
   };
 
+  Update
+  {
+     Pre-Invoke {"touch /var/lib/apt/pre-update-stamp"; };
+     Post-Invoke {"touch /var/lib/apt/post-update-stamp"; };
+  };
+
   Authentication
   {
      TrustCDROM "false";            // consider the CDROM always trusted
@@ -101,10 +107,10 @@ APT
   Install-Suggests "false";
 
   // install recommends automatically for packages in this section
-  Install-Recommends-Section "metapackages";
+  Install-Recommends-Section { "metapackages"; "universe/metapackages"; };
   
   // 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";
@@ -167,7 +173,7 @@ Acquire
     Timeout "120";
     
     /* Passive mode control, proxy, non-proxy and per-host. Pasv mode
-       is prefered if possible */
+       is preferred if possible */
     Passive "true";
     Proxy::Passive "true";
     Passive::http.us.debian.org "true"; // Specific per-host setting
@@ -187,7 +193,7 @@ Acquire
 
   gpgv
   {
-   Options {"--ignore-time-conflict";} // not very usefull on a normal system
+   Options {"--ignore-time-conflict";} // not very useful on a normal system
   };
 
   mirror
@@ -245,6 +251,11 @@ Dir "/"
      apt-get "/usr/bin/apt-get";
      apt-cache "/usr/bin/apt-cache";
   };
+
+  // Location of the logfile
+  Log "var/log/apt" {
+       Terminal "term.log";
+  };
 };
 
 // Things that effect the APT dselect method