Merge branch 'bw/protocol-v2' into maint

Doc fix.

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

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::