diff options
| author | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
| commit | 3784e34677882fbea8538baa1c25b0d35abf429a (patch) | |
| tree | 2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /doc | |
| parent | 8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff) | |
| parent | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff) | |
Merge with Michael and resolve conflicts
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 | 1 |
4 files changed, 4 insertions, 2 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 b87e85030..f8abd75ed 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -247,6 +247,7 @@ Debug pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgAcquire "false"; pkgAcquire::Worker "false"; + pkgAcquire::Auth "false"; pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; |