2 files changed, 111 insertions, 0 deletions
diff --git a/doc/source/command-objects/ec2-credentials.rst b/doc/source/command-objects/ec2-credentials.rst
new file mode 100644
index 00000000..a5b67549
--- /dev/null
+++ b/doc/source/command-objects/ec2-credentials.rst
@@ -0,0 +1,98 @@
+===============
+ec2 credentials
+===============
+
+Identity v2
+
+ec2 credentials create
+----------------------
+
+Create EC2 credentials
+
+.. program:: ec2 credentials create
+.. code-block:: bash
+
+    os ec2 credentials create
+        [--project <project>]
+        [--user <user>]
+
+.. option:: --project <project>
+
+    Specify an alternate project (default: current authenticated project)
+
+.. option:: --user <user>
+
+    Specify an alternate user (default: current authenticated user)
+
+The :option:`--project` and :option:`--user`  options are typically only
+useful for admin users, but may be allowed for other users depending on
+the policy of the cloud and the roles granted to the user.
+
+ec2 credentials delete
+----------------------
+
+Delete EC2 credentials
+
+.. program:: ec2 credentials delete
+.. code-block:: bash
+
+    os ec2 credentials delete
+        [--user <user>]
+        <access-key>
+
+.. option:: --user <user>
+
+    Specify a user
+
+.. _ec2_credentials_delete-access-key:
+.. describe:: access-key
+
+    Credentials access key
+
+The :option:`--user` option is typically only useful for admin users, but
+may be allowed for other users depending on the policy of the cloud and
+the roles granted to the user.
+
+ec2 credentials list
+--------------------
+
+List EC2 credentials
+
+.. program:: ec2 credentials list
+.. code-block:: bash
+
+    os ec2 credentials list
+        [--user <user>]
+
+.. option:: --user <user>
+
+    Filter list by <user>
+
+The :option:`--user` option is typically only useful for admin users, but
+may be allowed for other users depending on the policy of the cloud and
+the roles granted to the user.
+
+ec2 credentials show
+--------------------
+
+Display EC2 credentials details
+
+.. program:: ec2 credentials show
+.. code-block:: bash
+
+    os ec2 credentials show
+        [--user <user>]
+        <access-key>
+
+.. option:: --user <user>
+
+    Specify a user
+
+.. _ec2_credentials_show-access-key:
+.. describe:: access-key
+
+    Credentials access key
+
+The :option:`--user` option is typically only useful for admin users, but
+may be allowed for other users depending on the policy of the cloud and
+the roles granted to the user.
diff --git a/doc/source/command-objects/token.rst b/doc/source/command-objects/token.rst
index aec87d28..22260f0d 100644
--- a/doc/source/command-objects/token.rst
+++ b/doc/source/command-objects/token.rst
@@ -7,6 +7,9 @@ Identity v2, v3
 token issue
 -----------
 
+Issue new token
+
+.. program:: token issue
 .. code:: bash
 
     os token issue
@@ -14,6 +17,16 @@ token issue
 token revoke
 ------------
 
+*Identity version 2 only.*
+
+Revoke existing token
+
+.. program:: token revoke
 .. code:: bash
 
     os token revoke
+        <token>
+
+.. describe:: <token>
+
+    Token to be deleted