3 files changed, 19 insertions, 84 deletions
diff --git a/doc/source/cli/backwards-incompatible.rst b/doc/source/cli/backwards-incompatible.rst
index a86ce359..51743cb2 100644
--- a/doc/source/cli/backwards-incompatible.rst
+++ b/doc/source/cli/backwards-incompatible.rst
@@ -31,6 +31,24 @@ Release 4.0
   * Removed in: 4.0
   * Commit: https://review.opendev.org/612781
 
+3. Remove ``service create`` option ``--type``.  Service type is
+   a positional argument.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
+4. Remove ``role list`` options ``--project`` and ``--user``.
+   Use ``role assignment list`` options ``--project`` and ``--user`` instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
+5. Remove ``user role list`` command.
+   Use ``role assignment list`` options ``--project`` and ``--user`` instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
 .. 1. Change ``volume transfer request accept`` to use new option ``--auth-key``
 ..    rather than a second positional argument.
 
diff --git a/doc/source/cli/command-objects/role.rst b/doc/source/cli/command-objects/role.rst
index 9819fd12..e2a2b457 100644
--- a/doc/source/cli/command-objects/role.rst
+++ b/doc/source/cli/command-objects/role.rst
@@ -146,68 +146,12 @@ List roles
 .. code:: bash
 
     openstack role list
-        --domain <domain> | --project <project> [--project-domain <project-domain>]
-        --user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>]
-        --inherited
+        [--domain <domain>]
 
 .. option:: --domain <domain>
 
     Filter roles by <domain> (name or ID)
 
-    (Deprecated if being used to list assignments in conjunction with the
-    ``--user <user>``, option, please use ``role assignment list`` instead)
-
-.. option:: --project <project>
-
-    Filter roles by <project> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --user <user>
-
-    Filter roles by <user> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --group <group>
-
-    Filter roles by <group> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --user-domain <user-domain>
-
-    Domain the user belongs to (name or ID).
-    This can be used in case collisions between user names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --group-domain <group-domain>
-
-    Domain the group belongs to (name or ID).
-    This can be used in case collisions between group names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --project-domain <project-domain>
-
-    Domain the project belongs to (name or ID).
-    This can be used in case collisions between project names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --inherited
-
-    Specifies if the role grant is inheritable to the sub projects.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
     .. versionadded:: 3
 
 role remove
diff --git a/doc/source/cli/command-objects/user-role.rst b/doc/source/cli/command-objects/user-role.rst
deleted file mode 100644
index 4f443f31..00000000
--- a/doc/source/cli/command-objects/user-role.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-=========
-user role
-=========
-
-Identity v2
-
-user role list
---------------
-
-List user-role assignments
-
-*Removed in version 3.*
-
-.. program:: user role list
-.. code:: bash
-
-    openstack user role list
-        [--project <project>]
-        [<user>]
-
-.. option:: --project <project>
-
-    Filter users by `<project>` (name or ID)
-
-.. describe:: <user>
-
-    User to list (name or ID)