Updated /who help

2 files changed, 15 insertions, 21 deletions

diff --git a/TODO_045 b/TODO_045
index eefdce16..f66d84e3 100644
--- a/TODO_045
+++ b/TODO_045
@@ -1,17 +1,9 @@
 Update website help
-    Command reference
-        /ping
-        /info
-        /room
-        /form
-        /role
-        /affiliation
-        /privileges
-        /occupants
     Chat room help - Add note about room creation, remove /who
     Install guide - Debian, Ubuntu
     Update screensshots - Include MUC examples
     Check helpout and FAQ sections for any updates
+    Add section on customising UI
 
 Tag libstrophe release 0.8.7
     https://github.com/strophe/libstrophe/milestones/0.8.7
diff --git a/src/command/command.c b/src/command/command.c
index 2c3bd3ba..b87e50e6 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -506,18 +506,21 @@ static struct cmd_t command_defs[] =
 
     { "/who",
         cmd_who, parse_args, 0, 2, NULL,
-        { "/who [status] [group]", "Show contacts/room participants with chosen status.",
-        { "/who [status] [group]",
-          "---------------------",
-          "Show contacts with the specified status, no status shows all contacts.",
-          "Possible statuses are: online, offline, away, dnd, xa, chat, available, unavailable.",
-          "The groups argument will show only contacts in that group.",
-          "If in a chat room, the participants with the supplied status are displayed.",
+        { "/who [status|role|affiliation] [group]", "Show contacts/room occupants with chosen status, role or affiliation",
+        { "/who [status|role|affiliation] [group]",
+          "--------------------------------------",
+          "Normal usage:",
+          "Status may be one of - online, offline, away, dnd, xa, chat, available, unavailable, or any where:",
+          "online      : Contacts that are online, chat, away, xa, dnd",
+          "available   : Contacts that are available for chat - online, chat.",
+          "unavailable : Contacts that are not available for chat - offline, away, xa, dnd.",
+          "any         : Contacts with any status (same as calling with no argument).",
+          "",
+          "The group argument filters the list by that group.",
           "",
-          "online      : Contacts that are connected, i.e. online, chat, away, xa, dnd",
-          "available   : Contacts that are available for chat, i.e. online, chat.",
-          "unavailable : Contacts that are not available for chat, i.e. offline, away, xa, dnd.",
-          "any         : Contacts with any status (same as calling with no argument.",
+          "In a chat room, a role or affiliation may also be supplied instead of status.",
+          "Roles: moderator, participant, visitor",
+          "Affiliations: owner, admin, member",
           NULL } } },
 
     { "/close",
@@ -1244,7 +1247,6 @@ cmd_init(void)
     autocomplete_add(who_room_ac, "owner");
     autocomplete_add(who_room_ac, "admin");
     autocomplete_add(who_room_ac, "member");
-    autocomplete_add(who_room_ac, "outcast");
 
     bookmark_ac = autocomplete_new();
     autocomplete_add(bookmark_ac, "list");