[or-cvs] move datadirectory to the "general" section,

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/doc
In directory moria.mit.edu:/home2/arma/work/onion/cvs/doc

Modified Files:
	tor.1.in 
Log Message:
move datadirectory to the 'general' section,
move contactinfo to the 'server' section


Index: tor.1.in
===================================================================
RCS file: /home/or/cvsroot/doc/tor.1.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- tor.1.in	10 Nov 2004 01:20:17 -0000	1.34
+++ tor.1.in	12 Nov 2004 03:29:03 -0000	1.35
@@ -47,6 +47,9 @@
 \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 @@
 \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 @@
 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