[or-cvs] link nicknames to trusted directory servers; log these nick...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/doc
In directory moria:/tmp/cvs-serv11438/doc

Modified Files:
	tor.1.in 
Log Message:
link nicknames to trusted directory servers; log these nicknames when mentioning servers; also, when we get a naming conflict; log which nicknames or keys are supposed to bind.

Index: tor.1.in
===================================================================
RCS file: /home/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- tor.1.in	23 Sep 2005 20:44:22 -0000	1.104
+++ tor.1.in	4 Oct 2005 21:21:09 -0000	1.105
@@ -83,7 +83,7 @@
 appropriate default. (Default: 1 hour for clients, 20 minutes for servers)
 .LP
 .TP
-\fBDirServer \fR[v1] \fIaddress:port fingerprint\fP
+\fBDirServer \fR[\fInickname\fR] [\fBv1\fR] \fIaddress\fR\fB:\fIport fingerprint\fP
 Use a nonstandard authoritative directory server at the provided
 address and port, with the specified key fingerprint.  This option can
 be repeated many times, for multiple authoritative directory