[or-cvs] clean up the !reject/!invalid discussion

[arma at seul.org]

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

Modified Files:
	tor.1.in 
Log Message:
clean up the !reject/!invalid discussion


Index: tor.1.in
===================================================================
RCS file: /home2/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -d -r1.115 -r1.116
--- tor.1.in	12 Jan 2006 00:07:04 -0000	1.115
+++ tor.1.in	12 Jan 2006 00:52:41 -0000	1.116
@@ -702,15 +702,14 @@ The configuration file, which contains "
 The tor process stores keys and other data here.
 .LP
 .TP
-\fIDataDirectory\fP/\fBapproved-routers\fP
-This file lists nickname to identity bindings for
-NamingAuthoritativeDirectory. Each line lists a nickname
-and a fingerprint seperated by whitespace.  See your
-\fBfingerprint\fP file in the \fIDataDirectory\fP for an
-example line.  If the nickname is \fB!invalid\fP or
-\fB!reject\fP then descriptors from the given identity
-(fingerprint) are rejected by the authoritative
-directory server.
+\fIDataDirectory\fP/\fBapproved-routers\fP This file lists nickname
+to identity bindings for NamingAuthoritativeDirectory. Each line
+lists a nickname and a fingerprint seperated by whitespace.  See your
+\fBfingerprint\fP file in the \fIDataDirectory\fP for an example line.
+If the nickname is \fB!reject\fP then descriptors from the given identity
+(fingerprint) are rejected by the authoritative directory server. If
+it is \fB!invalid\fP then descriptors are accepted but marked in the
+directory as not valid (not recommended).
 .SH SEE ALSO
 .BR privoxy (1),
 .BR tsocks (1),