[tor-commits] [tor/master] Update HiddenServiceVersion man-page entry to only accept either 2 or 3.

[nickm at torproject.org]

commit 162d75d5878d060f48102de05d0b94974744a932
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Jan 25 16:49:12 2018 +0100

    Update HiddenServiceVersion man-page entry to only accept either 2 or 3.
    
    This patch updates the HiddenServiceVersion man-page entry to only
    accept either 2 or 3 as argument and not a list of multiple versions.
    
    See: https://bugs.torproject.org/25026
---
 changes/bug25026 | 4 ++++
 doc/tor.1.txt    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug25026 b/changes/bug25026
new file mode 100644
index 000000000..24a64a562
--- /dev/null
+++ b/changes/bug25026
@@ -0,0 +1,4 @@
+  o Documentation:
+    - HiddenServiceVersion only accepts one version to be specified. This
+      version can either be version 2 or 3.  Closes ticket 25026; bugfix on
+      0.3.2.2-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 8e27a25de..ef3d1eb9e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2670,7 +2670,7 @@ The following options are used to configure a hidden service.
     you're using a Tor controller that handles hidserv publishing for you.
     (Default: 1)
 
-[[HiddenServiceVersion]] **HiddenServiceVersion** __version__,__version__,__...__::
+[[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**::
     A list of rendezvous service descriptor versions to publish for the hidden
     service. Currently, versions 2 and 3 are supported. (Default: 2)