diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:15:06 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-15 09:28:09 +0200 |
| commit | 0e279e3527ce3dc9de0e01441ad693f415e75d6a (patch) | |
| tree | f55742c35544b03fa01e9e1e623d8ee587023f9d | |
| parent | 183116d1a64a2610b88fa6b50f2c5199b69d5841 (diff) | |
| download | apt-0e279e3527ce3dc9de0e01441ad693f415e75d6a.tar.gz | |
merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445)
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 8e4def2b..7075cb84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.11) UNRELEASED; urgency=low + + [ Daniel Hartwig ] + * Clarify units of Acquire::http::Dl-Limit (closes: #705445) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200 + apt (0.9.10) unstable; urgency=low The "Hello to Debconf" upload @@ -38,7 +45,7 @@ apt (0.9.10) unstable; urgency=low * make the keyring locations in apt-key configurable * let apt-key del work better with softlink and single key keyrings * do not call 'apt-key update' in apt.postinst - + [ Colin Watson ] * prefer native arch over higher priority for providers (Closes: #718482) 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 |