diff --git a/doc/source/command-objects/endpoint.rst b/doc/source/command-objects/endpoint.rst
index 074f20a0b4..9872a58737 100644
--- a/doc/source/command-objects/endpoint.rst
+++ b/doc/source/command-objects/endpoint.rst
@@ -188,9 +188,9 @@ Display endpoint details
 .. code:: bash
 
     os endpoint show
-        <endpoint-id>
+        <endpoint>
 
 .. _endpoint_show-endpoint:
-.. describe:: <endpoint-id>
+.. describe:: <endpoint>
 
-    Endpoint ID to display
+    Endpoint to display (endpoint ID, service ID, service name, service type)
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index e515fc9b3b..fcb82eb7ae 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -129,8 +129,9 @@ class ShowEndpoint(command.ShowOne):
         parser = super(ShowEndpoint, self).get_parser(prog_name)
         parser.add_argument(
             'endpoint_or_service',
-            metavar='<endpoint-id>',
-            help=_('Endpoint ID to display'),
+            metavar='<endpoint>',
+            help=_('Endpoint to display (endpoint ID, service ID,'
+                   ' service name, service type)'),
         )
         return parser