diff --git a/README.rst b/README.rst
index e6d29287e..c9801027b 100644
--- a/README.rst
+++ b/README.rst
@@ -141,8 +141,8 @@ You'll find complete documentation on the shell by running ``keystone help``::
         user-role-list      List roles granted to a user
         user-role-remove    Remove role from user
         user-update         Update user's name, email, and enabled status
-        discover            Discover Keystone servers and show authentication
-                            protocols and
+        discover            Discover Keystone servers, supported API versions and
+                            extensions.
         bootstrap           Grants a new role to a new user on a new tenant, after
                             creating each.
         bash-completion     Prints all of the commands and options to stdout.
diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py
index 90fa4fd69..27d85d363 100644
--- a/keystoneclient/generic/shell.py
+++ b/keystoneclient/generic/shell.py
@@ -23,9 +23,7 @@ CLIENT_CLASS = client.Client
 
 @utils.unauthenticated
 def do_discover(cs, args):
-    """
-    Discover Keystone servers and show authentication protocols and
-    extensions supported.
+    """Discover Keystone servers, supported API versions and extensions.
 
     Usage::