merged from http://bzr.debian.org/bzr/apt/apt/debian-sid

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6119d67d081e4f4b392d10b3c19c9c2328ab5923..27232d40b152987e86c9ed285bfbb79d16308007 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -23,6 +23,7 @@ quiet::NoUpdate "true"; // never update progress information - included in -q=1
 APT 
 {
   Architecture "i386";
+  Architectures { "amd64"; "armel"; };
   Build-Essential "build-essential";
 
   NeverAutoRemove  { "linux-image.*";  };  // packages that should never
@@ -265,7 +266,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";
@@ -385,7 +389,6 @@ DPkg
 {
    // let apt aggressivly use dpkg triggers
    NoTriggers "true";
-   NoConfigure "true";
    ConfigurePending "true";
 
    // Probably don't want to use force-downgrade..