diff --git a/managing-roles.html.md.erb b/managing-roles.html.md.erb
new file mode 100644
index 0000000..5750a40
--- /dev/null
+++ b/managing-roles.html.md.erb
@@ -0,0 +1,177 @@
+---
+title: Managing roles in Cloud Foundry
+owners: CAPI, Identity
+---
+
+This topic describes how to manage user roles in <%= vars.app_runtime_abbr %> using the cf CLI.
+
+For a description of the available roles and their permissions, see [Orgs, Spaces, Roles, and Permissions](./roles.html).
+
+
+## Prerequisites
+
+To manage roles, you must be logged in as a user with sufficient permissions:
+
+- Assigning and removing **org roles** requires admin or Org Manager privileges in the target org.
+- Assigning and removing **space roles** requires admin, Org Manager in the parent org, or Space Manager privileges in the target space.
+
+For more information, see [Permitted roles](https://v3-apidocs.cloudfoundry.org/index.html#create-a-role) in the Cloud Foundry API documentation.
+
+
+## View users in an org or space
+
+To list the users with roles in an org:
+
+```
+cf org-users ORG
+```
+
+Where `ORG` is the name of the org.
+
+
+$ cf org-users example-org
+Getting users in org example-org as admin...
+
+ORG MANAGER
+ alice@example.com
+
+BILLING MANAGER
+ huey@example.com
+
+ORG AUDITOR
+ louie@example.com
+
+
+To list the users with roles in a space:
+
+```
+cf space-users ORG SPACE
+```
+
+
+$ cf space-users example-org example-space
+Getting users in org example-org / space example-space as admin...
+
+SPACE MANAGER
+ alice@example.com
+
+SPACE DEVELOPER
+ huey@example.com
+ dewey@example.com
+
+SPACE AUDITOR
+ louie@example.com
+
+
+
+## Assign a role
+
+### Assign an org role
+
+To assign an org role to a user:
+
+```
+cf set-org-role USERNAME ORG ROLE
+```
+
+Where:
+
+ - `USERNAME` is the username of the user.
+ - `ORG` is the name of the org.
+ - `ROLE` is the role to assign. Valid org roles are `OrgManager`, `OrgAuditor`, and `BillingManager`.
+
+
+
+$ cf set-org-role huey@example.com example-org OrgManager
+Assigning role OrgManager to user huey@example.com in org example-org as admin...
+OK
+
+
+### Assign a space role
+
+Before assigning a space role to a user or UAA client, you must first assign them an org role in the parent org. The space role assignment will fail with `error code: 1002` otherwise.
+
+To assign a space role to a user:
+
+```
+cf set-space-role USERNAME ORG SPACE ROLE
+```
+
+Where:
+
+ - `USERNAME` is the username of the user.
+ - `ORG` is the name of the org that contains the space.
+ - `SPACE` is the name of the space.
+ - `ROLE` is the role to assign. Valid space roles are `SpaceDeveloper`, `SpaceManager`, `SpaceAuditor`, and `SpaceSupporter`.
+
+
+
+$ cf set-space-role huey@example.com example-org example-space SpaceDeveloper
+Assigning role SpaceDeveloper to user huey@example.com in org example-org / space example-space as admin...
+OK
+
+
+
+## Remove a role
+
+To remove an org role from a user:
+
+```
+cf unset-org-role USERNAME ORG ROLE
+```
+
+To remove a space role from a user:
+
+```
+cf unset-space-role USERNAME ORG SPACE ROLE
+```
+
+The arguments follow the same conventions as the corresponding `set-*-role` commands.
+
+
+## Assign roles to UAA clients
+
+UAA clients can be assigned org and space roles in the same way as users. The client's UAA client ID takes the place of the username, and you must pass the `--client` flag to indicate that the subject is a UAA client rather than a user. For more information about UAA clients, see [UAA clients](./roles.html#clients) in _Orgs, Spaces, Roles, and Permissions_.
+
+### Assign an org role to a client
+
+```
+cf set-org-role CLIENT_ID ORG ROLE --client
+```
+
+
+$ cf set-org-role my-pipeline-client example-org OrgAuditor --client
+Assigning role OrgAuditor to user my-pipeline-client in org example-org as admin...
+OK
+
+
+### Assign a space role to a client
+
+```
+cf set-space-role CLIENT_ID ORG SPACE ROLE --client
+```
+
+
+$ cf set-space-role my-pipeline-client example-org example-space SpaceDeveloper --client
+Assigning role SpaceDeveloper to user my-pipeline-client in org example-org / space example-space as admin...
+OK
+
+
+To remove a client role, use `cf unset-org-role` or `cf unset-space-role` with the `--client` flag in the same way.
+
+> **Note:** For automation that requires elevated platform-wide permissions, configure those scopes directly on the UAA client rather than assigning org or space roles. For more information, see [Creating and Managing Users with the UAA CLI (UAAC)](../uaa/uaa-user-management.html).
+
+
+## Disambiguate users across multiple origins
+
+If a username corresponds to accounts in more than one identity provider — for example, a user exists in both the internal UAA store and an external LDAP store — running `cf set-org-role` or `cf unset-org-role` with only a username returns an error:
+
+The user exists in multiple origins. Specify an origin for the requested user from: 'uaa', 'ldap'
+
+Pass the `--origin` flag to specify which origin's account to target:
+
+```
+cf set-org-role USERNAME ORG ROLE --origin ORIGIN
+```
+
+Where `ORIGIN` is the UAA origin key for the identity provider (for example, `uaa`, `ldap`, or `saml`).
diff --git a/roles.html.md.erb b/roles.html.md.erb
index a9c8b71..cc29dac 100644
--- a/roles.html.md.erb
+++ b/roles.html.md.erb
@@ -7,7 +7,7 @@ This topic tells you about orgs and spaces in <%= vars.app_runtime_first %> foun
<%= vars.app_runtime_abbr %> uses a role-based access control (RBAC) system to grant appropriate permissions to <%= vars.app_runtime_abbr %> users.
-Admins, Org Managers, and Space Managers can assign user roles using the Cloud Foundry Command Line Interface (cf CLI). For more information, see [Users and Roles](../cf-cli/getting-started.html#user-roles) in _Getting Started with the cf CLI_<%= vars.or_apps_man %>.
+Admins, Org Managers, and Space Managers can assign user roles using the Cloud Foundry Command Line Interface (cf CLI). For more information, see [Managing roles](./managing-roles.html).
## Orgs
@@ -43,6 +43,12 @@ A user account represents an individual person within the context of a <%= vars.
Roles can be assigned different scopes of User Account and Authentication (UAA) privileges. For more information about UAA scopes, see [Scopes](./architecture/uaa.html#scopes) in _User Account and Authentication (UAA) Server_.
+### UAA clients
+
+In addition to human users, <%= vars.app_runtime_abbr %> supports non-human principals called UAA clients. UAA clients authenticate using the `client_credentials` grant type and are intended for automation, CI/CD pipelines, and platform tooling that need to interact with the Cloud Controller API without a user session.
+
+Like users, UAA clients can be assigned org and space roles. The UAA client ID takes the place of the username when managing client roles with the cf CLI. For more information, see [Assign roles to UAA clients](./managing-roles.html#clients).
+
The following describes each type of user role in <%= vars.app_runtime_abbr %>:
<%= vars.admin_role %>
@@ -73,7 +79,7 @@ information.
For non-admin users, the `cloud_controller.read` scope is required to view resources, and the `cloud_controller.write` scope is required to create, update, and delete resources.
-Before you assign a space role to a user, you must assign an org role to the user. The error message `Server error, error code: 1002, message: cannot set space role because user is not part of the org` occurs when you try to set a space role before setting an org role for the user.
+Before you assign a space role to a user or UAA client, you must first assign them an org role in the parent org. The error message `Server error, error code: 1002, message: cannot set space role because user is not part of the org` occurs if you try to assign a space role first.
## User role permissions