commit 36f1292599369b810900d116b56c1507c690a255 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Sat Feb 18 10:02:10 2012 -0800 Fix mismatches between dir-spec.txt and routerparse.c. Fixes #5044. --- dir-spec.txt | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 9506d74..ab8b064 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1071,7 +1071,7 @@ "consensus-methods" SP IntegerList NL - [Exactly once for votes; does not occur in consensuses.] + [At most once for votes; does not occur in consensuses.] A space-separated list of supported methods for generating consensuses from votes. See section 3.4.1 for details. Method "1" @@ -1079,7 +1079,7 @@ "consensus-method" SP Integer NL - [Exactly once for consensuses; does not occur in votes.] + [At most once for consensuses; does not occur in votes.] See section 3.4.1 for details. @@ -1228,13 +1228,13 @@ "contact" SP string NL - [At most once.] + [Exactly once.] An arbitrary string describing how to contact the directory server's administrator. Administrators should include at least an email address and a PGP fingerprint. - "legacy-key" SP FINGERPRINT NL + "legacy-dir-key" SP FINGERPRINT NL [At most once] @@ -1259,7 +1259,7 @@ "contact" SP string NL - [At most once.] + [Exactly once.] As in the authority section of a vote. @@ -1291,7 +1291,7 @@ "s" SP Flags NL - [At most once.] + [Exactly once.] A series of space-separated status flags, in lexical order (as ASCII byte strings). Currently documented flags are: