merged from lp:~donkult/apt/debian-experimental

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b87251103f0597914c76445a819547d5c940bcee..f75b5738aa9253b3ea2f07ebdc4ac5ddeb18a082 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -17,11 +17,13 @@
 */
 
 quiet "0";
 */
 
 quiet "0";

+quiet::NoUpdate "true"; // never update progress information - included in -q=1

 
 // Options for APT in general
 APT 
 {
   Architecture "i386";
 
 // Options for APT in general
 APT 
 {
   Architecture "i386";

+  Architectures { "amd64"; "armel"; };

   Build-Essential "build-essential";
 
   NeverAutoRemove  { "linux-image.*";  };  // packages that should never
   Build-Essential "build-essential";
 
   NeverAutoRemove  { "linux-image.*";  };  // packages that should never


@@ -30,6 +32,7 @@ APT
   // Options for apt-get
   Get 
   {
   // Options for apt-get
   Get 
   {

+     Host-Architecture "armel";

      Arch-Only "false";
      AllowUnauthenticated "false";
      AutomaticRemove "false";       
      Arch-Only "false";
      AllowUnauthenticated "false";
      AutomaticRemove "false";       


@@ -87,7 +90,7 @@ APT
 
   Authentication
   {
 
   Authentication
   {

-     TrustCDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CD-ROM always trusted

   };
 
   // Some general options
   };
 
   // Some general options


@@ -264,7 +267,10 @@ Acquire
   cdrom
   {
     // do auto detection of the cdrom mountpoint
   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";
     
     // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
     mount "/cdrom";


@@ -288,7 +294,7 @@ Acquire
     lzma "lzma";
     gz "gzip";
 
     lzma "lzma";
     gz "gzip";
 

-    Order { "gz"; "lzma"; "bz2"; };
+    Order { "uncompressed"; "gz"; "lzma"; "bz2"; };

   };
 
   Languages
   };
 
   Languages


@@ -384,7 +390,6 @@ DPkg
 {
    // let apt aggressivly use dpkg triggers
    NoTriggers "true";
 {
    // let apt aggressivly use dpkg triggers
    NoTriggers "true";

-   NoConfigure "true";

    ConfigurePending "true";
 
    // Probably don't want to use force-downgrade..
    ConfigurePending "true";
 
    // Probably don't want to use force-downgrade..