about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-20T12·04+0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-20T12·04+0200
commit562585e901d9e5f2ef62be11c2e74badcacb1f50 (patch)
tree1da4ce6ced412c1e89deb342ae26767d1ec75ecd
parent4222402219ca3a356d23e05e0474f8648b111d91 (diff)
binary-caches-parallel-connections -> http-connections
-rw-r--r--doc/manual/command-ref/conf-file.xml2
-rw-r--r--src/libstore/globals.hh5
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 73e0017ccef0..79e18de9b176 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -404,7 +404,7 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
   </varlistentry>
 
 
-  <varlistentry><term><literal>binary-caches-parallel-connections</literal></term>
+  <varlistentry><term><literal>http-connections</literal></term>
 
     <listitem><para>The maximum number of parallel TCP connections
     used to fetch files from binary caches and by other downloads. It
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index a5d5a3f5057d..de64e9826597 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -216,8 +216,9 @@ public:
     Setting<Strings> secretKeyFiles{this, {}, "secret-key-files",
         "Secret keys with which to sign local builds."};
 
-    Setting<size_t> binaryCachesParallelConnections{this, 25, "binary-caches-parallel-connections",
-        "Number of parallel connections to binary caches."};
+    Setting<size_t> binaryCachesParallelConnections{this, 25, "http-connections",
+        "Number of parallel HTTP connections.",
+        {"binary-caches-parallel-connections"}};
 
     Setting<bool> enableHttp2{this, true, "enable-http2",
         "Whether to enable HTTP/2 support."};