diff --git a/src/command/command.c b/src/command/command.c
index a2b280e3..11d7a140 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -266,26 +266,30 @@ static struct cmd_t main_commands[] =
         { "/info [jid|nick]", "Find out a contacts presence information.",
         { "/info [jid|nick]",
           "----------------",
-          "Find out a contact, or room members presence information.",
+          "Find out a contact, or room members presence information, including all of their available resources.",
           "If in a chat window the parameter is not required, the current recipient will be used.",
           NULL } } },
 
     { "/caps",
         _cmd_caps, parse_args, 0, 1,
-        { "/caps [jid|nick]", "Find out a contacts client capabilities.",
-        { "/caps [jid|nick]",
-          "----------------",
-          "Find out a contact, or room members client capabilities.",
-          "If in a chat window the parameter is not required, the current recipient will be used.",
+        { "/caps [fulljid|nick]", "Find out a contacts client software capabilities.",
+        { "/caps [fulljid|nick]",
+          "--------------------",
+          "Find out a contact, or room members client software capabilities.",
+          "If in the console window or a regular chat window, a full JID is required.",
+          "If in a chat room, the nickname is required.",
+          "If in private chat, no parameter is required.",
           NULL } } },
 
     { "/software",
         _cmd_software, parse_args, 0, 1,
-        { "/software [jid|nick]", "Find out a software version information about a contacts resource.",
-        { "/software [jid|nick]",
-          "--------------------",
+        { "/software [fulljid|nick]", "Find out a software version information about a contacts resource.",
+        { "/software [fulljid|nick]",
+          "------------------------",
           "Find out a contact, or room members software version information.",
-          "If in a chat window the parameter is not required, the current recipient will be used.",
+          "If in the console window or a regular chat window, a full JID is required.",
+          "If in a chat room, the nickname is required.",
+          "If in private chat, no parameter is required.",
           NULL } } },
 
     { "/status",