summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-06-21 07:15:48 +0200
committerbubulle@debian.org <>2006-06-21 07:15:48 +0200
commit448a52a3bedb707f7d17e68b9583ce1c280aec61 (patch)
tree89d69c007edff6cadc6cb0e236e7444591454bf6 /doc
parent089fa814167138727fe3ddaff345a30256e3ae37 (diff)
parentb90d7d855709c49a6d5faff0ac65b96fd15e4500 (diff)
Merge with Michael
Basque translation update
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/configure-index1
-rw-r--r--doc/sources.list.5.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 9e851d753..b87e85030 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -244,6 +244,7 @@ DPkg
Debug
{
pkgProblemResolver "false";
+ pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgDPkgPM "false";
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9762005b0..e47418b27 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<para>Uses HTTP to access the archive at nonus.debian.org, under the
debian-non-US directory, and uses only files found under
- <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-i386</filename> on i386 machines,
<filename>unstable/binary-m68k</filename> on m68k, and so
forth for other supported architectures. [Note this example only
illustrates how to use the substitution variable; non-us is no longer