[or-cvs] r9218: Correct documentation of how Naming works in dir-spec.txt. (in tor/trunk: . doc)

[nickm at seul.org]

Author: nickm
Date: 2006-12-29 15:50:13 -0500 (Fri, 29 Dec 2006)
New Revision: 9218

Modified:
   tor/trunk/
   tor/trunk/doc/dir-spec.txt
Log:
 r11760 at Kushana:  nickm | 2006-12-29 15:23:57 -0500
 Correct documentation of how Naming works in dir-spec.txt.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11760] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/doc/dir-spec.txt
===================================================================
--- tor/trunk/doc/dir-spec.txt	2006-12-29 20:49:47 UTC (rev 9217)
+++ tor/trunk/doc/dir-spec.txt	2006-12-29 20:50:13 UTC (rev 9218)
@@ -783,20 +783,14 @@
       least three live network-status documents, the client maps the name to
       ID.
 
-   If a client encounters a name it has mapped before:
-
-      It uses the last-mapped identity value, unless all of the "Naming"
-      network status documents that list the name bind it to some other
-      identity.
-
    When a user tries to refer to a router with a name that does not have a
    mapping under the above rules, the implementation SHOULD warn the user.
    After giving the warning, the implementation MAY use a router that at
    least one Naming authority maps the name to, so long as no other naming
-   authority maps that name to a different router.
+   authority maps that name to a different router.  If no Naming authority
+   maps the name to a router, the implementation MAY use any router that
+   advertises the name.
 
-   (XXXX The last-bound thing above isn't implemented)
-
    Not every router needs a nickname.  When a router doesn't configure a
    nickname, it publishes with the default nickname "Unnamed".  Authorities
    SHOULD NOT ever mark a router with this nickname as Named; client software