Merge branch 'debian/sid' into debian/experimental

[apt.git] / doc / examples / apt.conf

diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index 8cd9c3b437fdcd252dcc429e6399ebabe6edf63d..7201d19204c9d170723ae52143eaafc42e529a8e 100644 (file)
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,54 +1,32 @@
-// $Id: apt.conf,v 1.3 1998/10/20 02:41:06 jgg Exp $
-/* This file is an index of all APT configuration directives. It should
-   NOT actually be used as a real config file, though it is a completely
-   valid file.
+// $Id: apt.conf,v 1.43 1999/12/06 02:19:38 jgg Exp $
+/* This file is a sample configuration file with a few harmless sample 
+   options.   
 */
 
-APT {
-  Architecture "i386";
-  
-  Get {
-     Download-Only "false";
-     Simulate "false";
-     Assume-Yes "false";
-     Fix-Broken "false";  
-     Show-Upgraded "false";
-  };
-};
-
-Dir 
+APT 
 {
-  
-  State "/var/state/apt/" 
+  // Options for apt-get
+  Get 
   {
-     lists "lists/";
-     xstatus "xstatus";
-     userstatus "status.user";
-     status "/var/lib/dpkg/status";     
-  };
-  
-  Cache "/var/cache/apt/" {
-     archives "archives/";
-     srcpkgcache "srcpkgcache.bin";
-     pkgcache "pkgcache.bin";     
-  };
-  
-  Etc "/etc/apt/" {
-     sourcelist "sources.list";
-     main "apt.conf";
+     Download-Only "false";
   };
   
-  Bin {
-     methods "/home/jgg/work/apt/build/bin/methods/";
-     gzip "gzip";
-  };
 };
 
-DSelect {
+// Options for the downloading routines
+Acquire
+{
+  Retries "0";
+};
 
-}
+// Things that effect the APT dselect method
+DSelect 
+{
+  Clean "auto";   // always|auto|prompt|never
+};
 
-Debug {
-  pkgProblemResolver "true";
-  pkgAcquire::Worker "true";
+DPkg 
+{
+  // Probably don't want to use force-downgrade..
+  Options {"--force-overwrite";}
 }