refresh po/pot and unfuzzy apt-extracttemplate change

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b87251103f0597914c76445a819547d5c940bcee..2d9f829ba89392aaa95c0dac98817d3a0f70515d 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -17,11 +17,13 @@
 */
 
 quiet "0";
+quiet::NoUpdate "true"; // never update progress information - included in -q=1
 
 // Options for APT in general
 APT 
 {
   Architecture "i386";
+  Architectures { "amd64"; "armel"; };
   Build-Essential "build-essential";
 
   NeverAutoRemove  { "linux-image.*";  };  // packages that should never
@@ -30,6 +32,7 @@ APT
   // Options for apt-get
   Get 
   {
+     Host-Architecture "armel";
      Arch-Only "false";
      AllowUnauthenticated "false";
      AutomaticRemove "false";       
@@ -87,7 +90,7 @@ APT
 
   Authentication
   {
-     TrustCDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CD-ROM always trusted
   };
 
   // Some general options
@@ -139,14 +142,14 @@ APT
     // APT::Archives::MinAge "2"; (old, deprecated)
     MinAge "2"; // (new)
     // - Set minimum age of a package file. If a file is younger it
-    //   will not be deleted (0=disable). Usefull to prevent races 
+    //   will not be deleted (0=disable). Useful to prevent races
     //   and to keep backups of the packages for emergency.
 
     // APT::Archives::MaxSize "0"; (old, deprecated)
     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";
@@ -222,7 +225,7 @@ Acquire
        Verify-Peer "false";
        SslCert "/etc/apt/some.pem";
        CaPath  "/etc/ssl/certs";
-       Verify-Host" "true";
+       Verify-Host "true";
        AllowRedirect  "true";
 
        Timeout "120";
@@ -264,7 +267,10 @@ Acquire
   cdrom
   {
     // do auto detection of the cdrom mountpoint
-    AutoDetect "true";
+    AutoDetect "true";   
+    // when auto-detecting, only look for cdrom/dvd. when this is false
+    // it will support any removable device as a "cdrom" source
+    CdromOnly "true";
     
     // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
     mount "/cdrom";
@@ -288,7 +294,7 @@ Acquire
     lzma "lzma";
     gz "gzip";
 
-    Order { "gz"; "lzma"; "bz2"; };
+    Order { "uncompressed"; "gz"; "lzma"; "bz2"; };
   };
 
   Languages
@@ -384,7 +390,6 @@ DPkg
 {
    // let apt aggressivly use dpkg triggers
    NoTriggers "true";
-   NoConfigure "true";
    ConfigurePending "true";
 
    // Probably don't want to use force-downgrade..
@@ -445,7 +450,7 @@ Debug
   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