Document RecommendedServerVersions and RecommendedClientVersions

svn:r5811

1 files changed, 15 insertions, 1 deletions

diff --git a/doc/tor.1.in b/doc/tor.1.in
index c301f92795..5d08e4229e 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -209,7 +209,7 @@ is to run as a client unless ORPort is configured.  (Usually,
 you don't need to set this; Tor is pretty smart at figuring out whether
 you are reliable and high-bandwidth enough to be a useful server.)
 
-This option will likely be deprecated in the future; see the NoPublish
+This option will likely be deprecated in the future; see the \fBNoPublish\fP
 option below. (Default: 0)
 .LP
 .TP
@@ -551,6 +551,20 @@ option can appear multiple times: the values from multiple lines are
 spliced together.
 .LP
 .TP
+\fBRecommendedClientVersions \fR\fISTRING\fP
+STRING is a command-separated list of Tor versions currently believed
+to be safe for clients to use.  This information is included in version 2
+directories.  If this is not set then the value of \fBRecommendedVersions\fR
+is used.
+.LP
+.TP
+\fBRecommendedServerVersions \fR\fISTRING\fP
+STRING is a command-separated list of Tor versions currently believed
+to be safe for servers to use.  This information is included in version 2
+directories.  If this is not set then the value of \fBRecommendedVersions\fR
+is used.
+.LP
+.TP
 \fBDirAllowPrivateAddresses \fR\fB0\fR|\fB1\fR\fP
 If set to 1, Tor will accept router descriptors with arbitrary "Address"
 elements. Otherwise, if the address is not an IP or is a private IP,