summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-04-23 08:15:06 +0200
committerMichael Vogt <mvo@debian.org>2013-08-15 09:28:09 +0200
commit0e279e3527ce3dc9de0e01441ad693f415e75d6a (patch)
treef55742c35544b03fa01e9e1e623d8ee587023f9d /doc
parent183116d1a64a2610b88fa6b50f2c5199b69d5841 (diff)
downloadapt-0e279e3527ce3dc9de0e01441ad693f415e75d6a.tar.gz
merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445)
Conflicts: debian/changelog
Diffstat (limited to 'doc')
-rw-r--r--doc/apt.conf.5.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 9973fe42..f5e1f966 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -386,10 +386,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para><literal>Acquire::http::AllowRedirect</literal> controls whether APT will follow
redirects, which is enabled by default.</para>
- <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal>
- which accepts integer values in kilobytes. The default value is 0 which deactivates
- the limit and tries to use all available bandwidth (note that this option implicitly
- disables downloading from multiple servers at the same time.)</para>
+ <para>The used bandwidth can be limited with
+ <literal>Acquire::http::Dl-Limit</literal> which accepts integer
+ values in kilobytes per second. The default value is 0 which
+ deactivates the limit and tries to use all available bandwidth.
+ Note that this option implicitly disables downloading from
+ multiple servers at the same time.</para>
<para><literal>Acquire::http::User-Agent</literal> can be used to set a different
User-Agent for the http download method as some proxies allow access for clients