move datadirectory to the 'general' section,

move contactinfo to the 'server' section

svn:r2801

diff --git a/doc/tor.1.in b/doc/tor.1.in
index b59b506ff88988eff936b41e5db6b2d43949e5aa..6d0c6b2d6f9539a729628864e3d62910310926e3 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -47,6 +47,9 @@ A token bucket limits the average incoming bandwidth on this node to NUM bytes p
 \fBBandwidthBurstBytes \fR\fINUM\fP
 Limit the maximum token bucket size (also known as the burst) to NUM bytes. (Default: 50000000)
 .TP
+\fBDataDirectory \fR\fIDIR\fP
+Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
+.TP
 \fBDirServer \fR\fIaddress:port fingerprint\fP
 Use a nonstandard authoritative directory server at the provided
 address and port, with the specified key fingerprint.  This option can
@@ -167,8 +170,8 @@ The following options are useful only for servers (that is, if \fBORPort\fP is n
 \fBAddress \fR\fIaddress\fP
 The IP or fqdn of this server (e.g. moria.mit.edu).
 .TP
-\fBDataDirectory \fR\fIDIR\fP
-Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
+\fBContactInfo \fR\fIemail address\fP
+Administrative contact information for server.
 .TP
 \fBExitPolicy \fR\fIpolicy,policy,...\fP
 Set an exit policy for this server. Each policy is of the form
@@ -271,9 +274,6 @@ Unless the clients already have you listed as a trusted directory, you
 probably do not want to set this option.  Please coordinate with the other
 admins at tor-ops@freehaven.net if you think you should be a directory.
 .TP
-\fBContactInfo \fR\fIemail address\fP
-Administrative contact information for server.
-.TP
 \fBDirPort \fR\fIPORT\fP
 Bind the directory service to this port.
 .TP