Join with aliencode

Author: jgg
Date: 2001-02-20 07:03:16 GMT
Join with aliencode

3 files changed, 94 insertions, 9 deletions

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 30ab29219..78171c9ba 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,4 +1,4 @@
-// $Id: configure-index,v 1.2 2000/05/13 01:52:59 jgg Exp $
+// $Id: configure-index,v 1.3 2001/02/20 07:03:17 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. Most of the options have sane default values, unless
@@ -32,15 +32,15 @@ APT
      Fix-Broken "false";  
      Fix-Missing "false";     
      Show-Upgraded "false";
-     No-Upgrade "false";
+     Upgrade "true";
      Print-URIs "false";
      Compile "false";
-     No-Download "false";
+     Download "true";
      Purge "false";
      List-Cleanup "true";
      ReInstall "false";
      Trivial-Only "false";
-     No-Remove "false";
+     Remove "true";
   };
 
   Cache 
@@ -48,6 +48,7 @@ APT
      Important "false";
      AllVersions "false";
      GivenOnly "false";
+     RecruseDepends "false";
   };
 
   CDROM 
@@ -125,10 +126,10 @@ Acquire
 };
 
 // Directory layout
-Dir 
+Dir "/"
 {
   // Location of the state dir
-  State "/var/state/apt/" 
+  State "var/lib/apt/" 
   {
      lists "lists/";
      xstatus "xstatus";
@@ -138,16 +139,17 @@ Dir
   };
   
   // Location of the cache dir
-  Cache "/var/cache/apt/" {
+  Cache "var/cache/apt/" {
      archives "archives/";
      srcpkgcache "srcpkgcache.bin";
      pkgcache "pkgcache.bin";     
   };
   
   // Config files
-  Etc "/etc/apt/" {
+  Etc "etc/apt/" {
      sourcelist "sources.list";
      main "apt.conf";
+     preferences "preferences";     
   };
   
   // Locations of binaries
@@ -169,6 +171,7 @@ DSelect
    Options "-f";
    UpdateOptions "";
    PromptAfterUpdate "no";
+   CheckDir "no";
 }
 
 DPkg 
@@ -201,6 +204,7 @@ Debug
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
+  pkgOrderList "false";
   
   pkgInitialize "false";   // This one will dump the configuration space
   NoLocking "false";
diff --git a/doc/examples/ftp-archive.conf b/doc/examples/ftp-archive.conf
new file mode 100644
index 000000000..a1866ba2d
--- /dev/null
+++ b/doc/examples/ftp-archive.conf
@@ -0,0 +1,81 @@
+/* This configuration file describes the standard Debian distribution
+   as it once looked */
+   
+Dir 
+{
+   ArchiveDir "/org/ftp.debian.org/ftp/";
+   OverrideDir "/org/ftp.debian.org/scripts/override/";
+   CacheDir "/org/ftp.debian.org/scripts/cache/";
+};
+
+Default
+{
+   Packages::Compress ". gzip";
+   Sources::Compress "gzip";
+   Contents::Compress "gzip";
+   DeLinkLimit 10000;          // 10 Meg delink per day
+   MaxContentsChage 10000;     // 10 Meg of new contents files per day
+};
+
+TreeDefault
+{
+   Contents::Header "/org/ftp.debian.org/scripts/masterfiles/Contents.top";
+   BinCacheDB "packages-$(ARCH).db";
+   
+   // These are all defaults and are provided for completeness
+   Directory "$(DIST)/$(SECTION)/binary-$(ARCH)/";
+   Packages "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages";
+   
+   SrcDirectory "$(DIST)/$(SECTION)/source/";
+   Sources "$(DIST)/$(SECTION)/source/Sources";
+   
+   Contents "$(DIST)/Contents-$(ARCH)";   
+};
+
+tree "dists/woody"
+{
+   Sections "main contrib non-free";
+   Architectures "alpha arm hurd-i386 i386 m68k powerpc sparc sparc64 source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+};
+
+tree "dists/potato"
+{
+   Sections "main contrib non-free";
+   Architectures "alpha arm i386 m68k powerpc sparc source";
+   BinOverride "override.potato.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+};
+
+tree "dists/slink"
+{
+   Sections "main contrib non-free";
+   Architectures "alpha i386 m68k sparc source";
+   BinOverride "override.slink.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+   External-Links false;             // Slink should contain no links outside itself
+};
+
+
+bindirectory "project/experimental"
+{
+   Sources "project/experimental/Sources";
+   Packages "project/experimental/Packages";
+   
+   BinOverride "override.experimental";
+   BinCacheDB "packages-experimental.db";
+   SrcOverride "override.experimental.src";
+};
+
+bindirectory "dists/proposed-updates"
+{
+   Packages "project/proposed-updates/Packages";
+   Contents "project/proposed-updates/Contents";
+   
+   BinOverride "override.slink.all3";
+   BinOverride "override.slink.all3.src";
+   BinCacheDB "packages-proposed-updates.db";
+};
+
+   
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index ed5ad75ea..9f2343277 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -7,4 +7,4 @@ deb http://security.debian.org stable/updates main contrib non-free
 
 # Uncomment if you want the apt-get source function to work
 #deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable non-US
+#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free