summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-01-12 00:52:41 +0000
committerRoger Dingledine <arma@torproject.org>2006-01-12 00:52:41 +0000
commit3c894809132137d799fd31c1714e900a2f42d2ab (patch)
treec9f2e4a3582009cf0b2661c1781294adb6295794
parent44cec7cecd27fc0ea77bd82a16dd477f64e14231 (diff)
downloadtor-3c894809132137d799fd31c1714e900a2f42d2ab.tar.gz
tor-3c894809132137d799fd31c1714e900a2f42d2ab.zip
clean up the !reject/!invalid discussiontor-0.1.1.12-alpha
svn:r5817
-rw-r--r--doc/tor.1.in17
1 files changed, 8 insertions, 9 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 345536622f..e3f408e879 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -702,15 +702,14 @@ The configuration file, which contains "option value" pairs.
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),