diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
| commit | af5a94f4c7b1f2cc797cd1e023e36a1bb359689d (patch) | |
| tree | b95e2e27ec3f5b020b055da187bb2012b1921aa3 /doc | |
| parent | 60681f9354217c830943315951e6559253bfa832 (diff) | |
| parent | 4577fda2b5f2b21f5400d10f4db71a8095f0df58 (diff) | |
* merged with mainline
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.ent | 1 | ||||
| -rw-r--r-- | doc/examples/configure-index | 2 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 789c3d228..2779f2501 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -277,7 +277,7 @@ Reverse Provides: <listitem><para>Select the file to store the source cache. The source is used only by <literal>gencaches</literal> and it stores a parsed version of the package information from remote sources. When building the package cache the - source cache is used to advoid reparsing all of the package files. + source cache is used to avoid reparsing all of the package files. Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem> </varlistentry> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ac84f342a..b98d58737 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -468,7 +468,7 @@ <refsect1><title>See Also</title> <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, &apt-config;, - The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para> + The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para> </refsect1> <refsect1><title>Diagnostics</title> diff --git a/doc/apt.ent b/doc/apt.ent index cf22df6d2..99fe443cf 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -2,6 +2,7 @@ <!-- Some common paths.. --> <!ENTITY docdir "/usr/share/doc/apt/"> +<!ENTITY guidesdir "/usr/share/doc/apt-doc/"> <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>"> <!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>"> <!ENTITY statedir "/var/lib/apt"> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 9e851d753..f8abd75ed 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -244,8 +244,10 @@ DPkg Debug { pkgProblemResolver "false"; + pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgAcquire "false"; pkgAcquire::Worker "false"; + pkgAcquire::Auth "false"; pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "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 |