merge 1695..1701 from the lp:~mvo/apt/mvo branch

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b22603ed73d9f189c25aa05ea56c4d5fd6671891..ddee863883eb6c0965d0fc6402c5c7f6fb61a79a 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -248,6 +248,10 @@ Acquire
   
   cdrom
   {
+    // do auto detection of the cdrom mountpoint
+    AutoDetect "true";
+    
+    // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
     mount "/cdrom";
 
     // You need the trailing slash!
@@ -326,6 +330,13 @@ Dir "/"
   Log "var/log/apt" {
        Terminal "term.log";
   };
+
+  // Media 
+  Media 
+  {
+       // Media AutoDetect mount path
+       MountPath "/media/apt";
+  };
 };
 
 // Things that effect the APT dselect method
@@ -383,6 +394,7 @@ Debug
   pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgDepCache::Marker "false"; 
+  pkgCacheGen "false";
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";