Merge from CVS

Patches applied:

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1304
   Basque correction.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1305
   Updated Brazilian Portuguese and Greek (256396 and 2567...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1306
   New Korean translation from Changwoo Ryu <cwryu@debian....

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1307
   German translation now available in two flavours: with ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1308
   Finalize 0.5.26

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1309
   Remove duplicate entry

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1310
   Note about archtable when architecture test fails

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1311
   0.5.26 (really)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1312
   German translation now available in two flavours: with ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1313
   New Finnish translation from Tapio Lehtonen <tale@debia...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1314
   New Bosnian translation from Safir ��e��erovi�� <sapphi...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1315
   Fix Italian incontrario

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1316
   * Bring configure-index up to date with documented opti...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1317
   configure-index contains example values, not strictly d...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1318
   Updated Spanish from Ruben Porras (Closes:#260483)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1319
   Updated Danish from Claus Hindsgaul (Closes: #260569)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1320
   Updated Slovak from Peter Mann (Closes: #260627)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1321
   Updated Portuguese from Miguel Figueiredo (Closes: #261423)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1322
   * Add Polish translation of offline.sgml (Closes: #259229)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1323
   urgency=high

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1324
   Sync with new POT.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1325
   Updated Hungarian from Kelemen G��bor <kelemeng@gnome.hu>.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1326
   Updated Greek from George Papamichelakis (Closes: #265004)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1327
   Updated Simplified Chinese from Tchaikov (Closes: #265190)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1328
   Updated French by Christian Perrier (Closes: #265816)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1329
   Updated Japanese by Kenshi Muto (Closes: #265630)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1330
   Updated French by Christian Perrier (Closes: #265816)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1331
   - Updated Catalan from Jordi Mallach

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1332
   Updated Dutch from Bart Cornelis (Closes: #268258)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1333
   Updated Portuguese from Miguel Figueiredo (Closes: #268265)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1334
   Updated Dutch from Bart Cornelis (Closes: #268258)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1335
   APT::Get::APT::Get::No-List-Cleanup -> APT::Get::List-C...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1336
   Updated Polish from Robert Luberda <robert@debian.org> ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1337
   Updated Danish from Claus Hindsgaul (Closes: #269417)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1338
   Updated Norwegian Nynorsk from H��vard Korsvoll <korsvo...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1339
   Updated Russian from Yuri Kozlov <yuray@id.ru> (Closes:...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1340
   Updated Italian from Samuele Giovanni Tonon (Closes: #2...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1341
   Updated Dutch from Bart Cornelis (Closes: #278697)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1342
   Updated Slovak from Peter Mann (Closes: #279481)

1 files changed, 24 insertions, 11 deletions

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 2f9d09873..7cb29f082 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,9 +1,9 @@
-// $Id: configure-index,v 1.9 2004/04/29 17:30:22 mdz Exp $
+// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz 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
-   you have specific needs you should NOT include arbitary items in a custom
-   configuration.
+   NOT actually be used as a real config file, though it is (except for the
+   last line) a completely valid file. Most of the options have sane default
+   values, unless you have specific needs you should NOT include arbitary
+   items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default
    directory when the path is evaluated. This means you can use relative
@@ -17,6 +17,8 @@
    if an option is specified on the command line with -o.
 */
 
+quiet "0";
+
 // Options for APT in general
 APT 
 {
@@ -34,6 +36,7 @@ APT
      Fix-Broken "false";  
      Fix-Missing "false";     
      Show-Upgraded "false";
+     Show-Versions "false";
      Upgrade "true";
      Print-URIs "false";
      Compile "false";
@@ -43,6 +46,9 @@ APT
      ReInstall "false";
      Trivial-Only "false";
      Remove "true";
+     Only-Source "";
+     Diff-Only "false";
+     Tar-Only "false";
   };
 
   Cache 
@@ -51,6 +57,11 @@ APT
      AllVersions "false";
      GivenOnly "false";
      RecurseDepends "false";
+     ShowFull "false";
+     Generate "true";
+     NamesOnly "false";
+     AllNames "false";
+     Installed "false";
   };
 
   CDROM 
@@ -117,7 +128,7 @@ Acquire
   
   cdrom
   {
-    Mount "/cdrom";
+    mount "/cdrom";
 
     // You need the trailing slash!
     "/cdrom/"
@@ -134,7 +145,7 @@ Dir "/"
   // Location of the state dir
   State "var/lib/apt/" 
   {
-     lists "lists/";
+     Lists "lists/";
      xstatus "xstatus";
      userstatus "status.user";
      status "/var/lib/dpkg/status";
@@ -143,16 +154,17 @@ Dir "/"
   
   // Location of the cache dir
   Cache "var/cache/apt/" {
-     archives "archives/";
+     Archives "archives/";
      srcpkgcache "srcpkgcache.bin";
      pkgcache "pkgcache.bin";     
   };
   
   // Config files
   Etc "etc/apt/" {
-     sourcelist "sources.list";
-     main "apt.conf";
-     preferences "preferences";     
+     SourceList "sources.list";
+     Main "apt.conf";
+     Preferences "preferences";     
+     Parts "apt.conf.d/";
   };
   
   // Locations of binaries
@@ -218,6 +230,7 @@ Debug
   Acquire::Ftp "false";    // Show ftp command traffic
   Acquire::Http "false";   // Show http command traffic
   aptcdrom "false";        // Show found package files
+  IdentCdrom "false";
 }
 
 /* Whatever you do, do not use this configuration file!! Take out ONLY