diff options
| author | Michael Vogt <egon@bottom> | 2006-07-25 13:20:17 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-07-25 13:20:17 +0200 |
| commit | 1fa25c1f17a290e497a49cb310511b4b58c9c009 (patch) | |
| tree | 77edf875425da4bb35389fa3b0b8f6c1e0cf0348 /doc | |
| parent | 67fefcfec18c9ada43a07e5fffae6b3a5c693388 (diff) | |
| parent | a9be43ff002473c6a4c5197ba3767ee938ae3ed1 (diff) | |
* merged with mainline
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.ent | 1 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
3 files changed, 3 insertions, 1 deletions
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 628587427..883a94434 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -249,6 +249,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"; |