* merged the debian--auto-mark patch

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

diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index 9403c424a839d070ae1dbd45bdc732a9d5fb8a31..7201d19204c9d170723ae52143eaafc42e529a8e 100644 (file)
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,102 +1,32 @@
-// $Id: apt.conf,v 1.15 1998/11/23 23:17:49 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.
-   
-   In some instances involing filenames it is possible to set the default
-   directory when the path is evaluated. This means you can use relative
-   paths within the sub scope.
-   
-   The configuration directives are specified in a tree with {} designating
-   a subscope relative to the tag before the {}. You can further specify
-   a subscope using scope notation eg,
-     APT::Architecture "i386";
-   This is prefixed with the current scope. Scope notation must be used
-   if an option is specified on the command line with -o.
+// $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.   
 */
 
-// Options for APT in general
-APT {
-  Architecture "i386";
-  
+APT 
+{
   // Options for apt-get
-  Get {
+  Get 
+  {
      Download-Only "false";
-     Simulate "false";
-     Assume-Yes "false";
-     Fix-Broken "false";  
-     Fix-Missing "false";     
-     Show-Upgraded "false";
   };
   
-  // Some general options
-  Ingore-Hold "false";
 };
 
 // Options for the downloading routines
 Acquire
 {
-  Queue-Mode "host";       // host|access
-  
-  // HTTP method configuration
-  http 
-  {
-    Proxy "http://127.0.0.1:3128";
-    Proxy::http.us.debian.org "DIRECT";  // Specific per-host setting
-  };
+  Retries "0";
 };
 
-// Directory layout
-Dir 
+// Things that effect the APT dselect method
+DSelect 
 {
-  // Location of the state dir
-  State "/var/state/apt/" 
-  {
-     lists "lists/";
-     xstatus "xstatus";
-     userstatus "status.user";
-     status "/var/lib/dpkg/status";     
-  };
-  
-  // Location of the cache dir
-  Cache "/var/cache/apt/" {
-     archives "archives/";
-     srcpkgcache "srcpkgcache.bin";
-     pkgcache "pkgcache.bin";     
-  };
-  
-  // Config files
-  Etc "/etc/apt/" {
-     sourcelist "sources.list";
-     main "apt.conf";
-  };
-  
-  // Locations of binaries
-  Bin {
-     methods "/home/jgg/work/apt/build/bin/methods/";
-     gzip "/bin/gzip";
-     dpkg "/usr/bin/dpkg";
-     apt-get "/usr/bin/apt-get";
-     apt-cache "/usr/bin/apt-get";
-  };
+  Clean "auto";   // always|auto|prompt|never
 };
 
-// Things that effect the APT dselect method
-DSelect {
-   Clean "auto";
-   Options "-f";
-   UpdateOptions "";
-   PromptAfterUpdate "no";
-}
-
-/* Options you can set to see some debugging text They corrispond to names
-   of classes in the source code */
-Debug {
-  pkgProblemResolver "false";
-  pkgAcquire "false";
-  pkgAcquire::Worker "false";
-  pkgDPkgPM "false";
-  
-  pkgInitialize "false";   // This one will dump the configuration space
-  NoLocking "false";   
+DPkg 
+{
+  // Probably don't want to use force-downgrade..
+  Options {"--force-overwrite";}
 }