From: Michael Vogt Date: Tue, 23 Apr 2013 06:15:06 +0000 (+0200) Subject: merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes... X-Git-Tag: 1.1.exp1~45 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3f961c9866df93e6eef8d802527e3eb920be7124 merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445) --- 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";}; Acquire::http::AllowRedirect controls whether APT will follow redirects, which is enabled by default. - The used bandwidth can be limited with Acquire::http::Dl-Limit - 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.) + The used bandwidth can be limited with + Acquire::http::Dl-Limit 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. Acquire::http::User-Agent can be used to set a different User-Agent for the http download method as some proxies allow access for clients