[or-cvs] r12179: finish cleaning up r12175 (tor/trunk/doc/spec)

[arma at seul.org]

Author: arma
Date: 2007-10-25 00:17:59 -0400 (Thu, 25 Oct 2007)
New Revision: 12179

Modified:
   tor/trunk/doc/spec/dir-spec.txt
Log:
finish cleaning up r12175


Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt	2007-10-25 04:01:08 UTC (rev 12178)
+++ tor/trunk/doc/spec/dir-spec.txt	2007-10-25 04:17:59 UTC (rev 12179)
@@ -966,13 +966,12 @@
    believes the given name should be bound to the given key.
 
    "Unnamed" -- Directory authorities that support naming should vote for a
-   router to be 'Unnamed' if its given nickname is mapped a different
+   router to be 'Unnamed' if its given nickname is mapped to a different
    identity.
 
    "Running" -- A router is 'Running' if the authority managed to connect to
    it successfully within the last 30 minutes.
 
-
    "Stable" -- A router is 'Stable' if it is active, and either its
    Weighted MTBF is at least the median for known active routers or
    its Weighted MTBF is at least 10 days. Routers are never called Stable if
@@ -1063,12 +1062,10 @@
 
         * The Named flag appears if it is included for this routerstatus by
           _any_ authority, and if all authorities that list it list the same
-          nickname.
+          nickname. However, if consensus-method 2 or later is in use, and
+          any authority calls this identity/nickname pair Unnamed, then
+          this routerstatus does not get the Named flag.
 
-          - If consensus-method 2 or later is in use, it is also a
-            requirement to be Named that no authority calls the router's
-            identity and nickname pair "Unnamed".
-
         * If consensus-method 2 or later is in use, the Unnamed flag is
           set for a routerstatus if any authorities have voted for a different
           identities to be Named with that nickname, or if any authority
@@ -1521,7 +1518,7 @@
    if the router with the right ID can't be found.
 
    When a user tries to refer to a non-bound name, the implementation SHOULD
-   warn the user. After warning the use, the implementation MAY use any
+   warn the user. After warning the user, the implementation MAY use any
    router that advertises the name.
 
    Not every router needs a nickname.  When a router doesn't configure a