diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:15:06 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:15:06 +0200 |
| commit | 3f961c9866df93e6eef8d802527e3eb920be7124 (patch) | |
| tree | e86817c27b77c1cb001b9ebef8172b829ed09b15 | |
| parent | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (diff) | |
merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445)
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 7b842e7e4..5b0aaec3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/strutl.cc: - support \n and \r\n line endings in ReadMessages + + [ Daniel Hartwig ] + * Clarify units of Acquire::http::Dl-Limit (closes: #705445) [ Michael Vogt ] * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index be1d7ade8..3a4549a80 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -387,10 +387,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 |