Merge branch 'bw/protocol-v2' into maint

Doc fix.

* bw/protocol-v2:
config: document value 2 for protocol.version

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb66a119753726b0260acd456f5728351dc05ba3..ee3b5dd8ef1d9620a555a526a7d15b917b0353af 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2828,6 +2828,8 @@ protocol.version::
 * `1` - the original wire protocol with the addition of a version string
   in the initial response from the server.
 
+* `2` - link:technical/protocol-v2.html[wire protocol version 2].
+
 --
 
 pull.ff::