updates.

diff --git a/doc/draft-riikonen-silc-commands-06.nroff b/doc/draft-riikonen-silc-commands-06.nroff
index 84e9197907b67b09a82afea17526405f7c5b6c4b..b37033e0faa7cee0f9d41fcffd33f7e63aa4a883 100644 (file)
--- a/doc/draft-riikonen-silc-commands-06.nroff
+++ b/doc/draft-riikonen-silc-commands-06.nroff
@@ -260,29 +260,35 @@ List of all defined commands in SILC follows.
 
         It is also possible to search the user by Client ID.  If the
         <Client ID> is provided server MUST use it as the search value
-        instead of the <nickname>.  One of the arguments MUST be given.
-        It is also possible to define multiple Client ID's to search
-        multiple users sending only one WHOIS command.  In this case the
-        Client ID's are appended as normal arguments.
+        instead of the <nickname>.  It is also possible to define multiple 
+        Client ID's to search multiple users sending only one WHOIS 
+        command.  In this case the Client ID's are appended as normal 
+        arguments.
+
+        The <Requested Attributes> is defined in [ATTRS] and can be used
+        to request various information about the client.  See Appendix A
+        for definition of using these attributes in SILC.  If neither the
+        <nickname> or <Client ID> arguments are present but the attributes
+        are, the server MUST use the attributes to do the searching.  If
+        none of the arguments, <nickname>, <Client ID> and <Requested
+        Attributes> are present, error MUST be retuned.  Server MAY
+        use the <Requested Attributes> to narrow down the search if they
+        present at any time.
 
         To prevent miss-use of this command wildcards in the nickname
         or in the server name are not permitted.  It is not allowed
         to request all users on some server.  The WHOIS requests MUST
         be based on explicit nickname request.
 
-        The WHOIS request MUST be always sent to the router by server
-        so that all users are searched.  However, the server still MUST
-        search its locally connected clients.  The router MUST send
+        The WHOIS request MUST be always sent to the router by normal 
+        server so that all users are searched.  However, the server still 
+        MUST search its locally connected clients.  The router MUST send
         this command to the server which owns the requested client, if
         the router is unable to provide all mandatory information about
         the client.  That server MUST reply to the command.  Server MUST
         NOT send whois replies to the client until it has received the
         reply from its router.
 
-        The <Requested Attributes> is defined in [ATTRS] and can be used
-        to request various information about the client.  See Appendix A
-        for definition of using these attributes in SILC.
-
         Reply messages to the command:
 
         Max Arguments:  11