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

1 files changed, 11 insertions, 0 deletions

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index d46679998..ddee86388 100644
--- 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