diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 37a4270c18..20c087e6b3 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1328,8 +1328,13 @@ Initializing Keystone
 ``keystone-manage`` is designed to execute commands that cannot be administered
 through the normal REST API. At the moment, the following calls are supported:
 
+* ``bootstrap``: Perform the basic bootstrap process.
+* ``credential_migrate``: Encrypt credentials using a new primary key.
+* ``credential_rotate``: Rotate Fernet keys for credential encryption.
+* ``credential_setup``: Setup a Fernet key repository for credential encryption.
 * ``db_sync``: Sync the database.
 * ``db_version``: Print the current migration version of the database.
+* ``doctor``: Diagnose common problems with keystone deployments.
 * ``domain_config_upload``: Upload domain configuration file.
 * ``fernet_rotate``: Rotate keys in the Fernet key repository.
 * ``fernet_setup``: Setup a Fernet key repository.
diff --git a/doc/source/man/keystone-manage.rst b/doc/source/man/keystone-manage.rst
index fcd1ccc45a..8eea297c20 100644
--- a/doc/source/man/keystone-manage.rst
+++ b/doc/source/man/keystone-manage.rst
@@ -41,6 +41,8 @@ Invoking ``keystone-manage`` by itself will give you some usage information.
 Available commands:
 
 * ``bootstrap``: Perform the basic bootstrap process.
+* ``credential_migrate``: Encrypt credentials using a new primary key.
+* ``credential_rotate``: Rotate Fernet keys for credential encryption.
 * ``credential_setup``: Setup a Fernet key repository for credential encryption.
 * ``db_sync``: Sync the database.
 * ``db_version``: Print the current migration version of the database.