diff options
| author | Michael Vogt <egon@bottom> | 2006-06-09 15:48:40 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-06-09 15:48:40 +0200 |
| commit | ab1bdcf7fb907555ee2c42430eaed51feba6910c (patch) | |
| tree | bc16a85c6cc668debe3c8f37bddb70b6b97c78b9 /doc | |
| parent | 8c64fc132ce0743f02b4d7216a3646a8fb93d8b6 (diff) | |
| parent | c08447c8eef91499920ca51276313526888939ec (diff) | |
* merged from mainline
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 7346ba9bb..628587427 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -246,6 +246,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 |