[or-cvs] r9964: Document multiplicity on some router elements better. (in tor/trunk: . doc/spec)

[nickm at seul.org]

Author: nickm
Date: 2007-04-16 00:18:06 -0400 (Mon, 16 Apr 2007)
New Revision: 9964

Modified:
   tor/trunk/
   tor/trunk/doc/spec/dir-spec.txt
Log:
 r12386 at catbus:  nickm | 2007-04-15 23:55:34 -0400
 Document multiplicity on some router elements better.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12386] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt	2007-04-16 04:17:58 UTC (rev 9963)
+++ tor/trunk/doc/spec/dir-spec.txt	2007-04-16 04:18:06 UTC (rev 9964)
@@ -150,11 +150,17 @@
    Every router descriptor MUST start with a "router" Item; MUST end with a
    "router-signature" Item and an extra NL; and MUST contain exactly one
    instance of each of the following Items: "published" "onion-key"
-   "link-key" "signing-key" "bandwidth".  Additionally, a router descriptor
-   MAY contain any number of "accept", "reject", "fingerprint", "uptime", and
-   "opt" Items.  Other than "router" and "router-signature", the items may
-   appear in any order.
+   "link-key" "signing-key" "bandwidth". 
 
+   A router descriptor MAY have zero or one of each of the following Items,
+   but MUST NOT have more than one: "contact", "uptime", "fingerprint",
+   "hibernating", "read-history", "write-history", "eventdns", "platform",
+   "family".
+
+   Additionally, a router descriptor MAY contain any number of "accept",
+   "reject", and "opt" Items.  Other than "router" and "router-signature",
+   the items may appear in any order.
+
    The items' formats are as follows:
     "router" nickname address ORPort SocksPort DirPort