Update user types on concepts page with roles and permissions info (#…

…9048)

* update user types with roles and permissions info

* style edits

* user role not type

jekyll/_cci2/concepts.adoc

@@ -410,7 +410,7 @@ See the xref:jobs-steps#[Jobs and steps] page for more information.
 [#orbs]
 == Orbs
 
-Orbs are reusable snippets of code that help automate repeated processes, accelerate project setup, and make it easy to integrate with third-party tools.
+Orbs are reusable snippets of code that help automate repeated processes, accelerate project setup, and make it straight forward to integrate with third-party tools.
 
 The illustration in the <<configuration,Configuration>> section showing an example Java configuration could be simplified using orbs. The following illustration demonstrates a simplified configuration with link:https://circleci.com/developer/orbs/orb/circleci/maven[the Maven orb]. Here, the orb sets up a default executor that can execute steps with Maven and run a common job (`maven/test`).
 
@@ -544,14 +544,29 @@ jobs:
 See the xref:jobs-steps#[Jobs and steps] page for more information.
 
 [#user-types]
-== User types
+== User roles
 
-CircleCI has various user types with permissions inherited from VCS accounts.
+CircleCI roles are set up differently depending on how you xref:version-control-system-integration-overview#[integrate your code].
+
+TIP: To find out if you authorized through the GitHub OAuth app or the CircleCI GitHub App, see the xref:github-apps-integration#[GitHub App integration] page.
+
+=== GitHub App, GitLab and Bitbucket Data Center users
+Roles are set at the organization and project level and are separate to permissions and roles set in the version control system in which your code is stored. The available roles are:
+
+* Admin
+* Contributor
+* Viewer
+
+For an overview of organization and project role permissions, see the xref:roles-and-permissions-overview#organization-role-permissions-matrix[Roles and permissions overview] page.
+
+See the xref:manage-roles-and-permissions#[Manage roles and permissions] page for steps to add, remove, and change org and project level roles. You can also manages roles and permissions in xref:manage-groups#[groups].
+
+=== GitHub OAuth app and Bitbucket Cloud users
+CircleCI has various user roles with permissions inherited from VCS accounts.
 
 * The _Organization Administrator_ is a permission level inherited from your VCS:
  ** GitHub: *Owner* and following at least one project building on CircleCI.
  ** Bitbucket: *Admin* and following at least one project building on CircleCI.
- ** GitLab: *Admin* and following at least one project building on CircleCI.
 * The _Project Administrator_ is the user who adds a GitHub or Bitbucket repository to CircleCI as a Project.
 * A _User_ is an individual user within an organization, inherited from your VCS.
 * A CircleCI user is anyone who can log in to the CircleCI platform with a username and password. Users must be added to an org in the VCS to view or follow associated CircleCI projects. Users may not view project data that is stored in environment variables.