r11760@Kushana: nickm | 2006-12-29 15:23:57 -0500

 Correct documentation of how Naming works in dir-spec.txt.


svn:r9218

1 files changed, 3 insertions, 9 deletions

diff --git a/doc/dir-spec.txt b/doc/dir-spec.txt
index 207d4a5199..93d5d2dc06 100644
--- a/doc/dir-spec.txt
+++ b/doc/dir-spec.txt
@@ -783,19 +783,13 @@ $Id$
       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.
-
-   (XXXX The last-bound thing above isn't implemented)
+   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.
 
    Not every router needs a nickname.  When a router doesn't configure a
    nickname, it publishes with the default nickname "Unnamed".  Authorities