Przeglądaj źródła

merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445)

Michael Vogt 13 lat temu
rodzic
commit
3f961c9866
2 zmienionych plików z 9 dodań i 4 usunięć
  1. 3 0
      debian/changelog
  2. 6 4
      doc/apt.conf.5.xml

+ 3 - 0
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:

+ 6 - 4
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