diff --git a/content/admin/organization/_index.md b/content/admin/organization/_index.md index 1473659b31..6cd964324d 100644 --- a/content/admin/organization/_index.md +++ b/content/admin/organization/_index.md @@ -27,7 +27,7 @@ grid: description: Configure information for your organization and manage settings. icon: settings link: /admin/organization/general-settings/ -- title: SSO & SCIM +- title: SSO and SCIM description: 'Set up [Single Sign-On](/security/for-admins/single-sign-on/) and [SCIM](/security/for-admins/provisioning/scim/) for your organization. diff --git a/layouts/shortcodes/admin-registry-access.html b/layouts/shortcodes/admin-registry-access.html index ea90cd7a96..6b6649457e 100644 --- a/layouts/shortcodes/admin-registry-access.html +++ b/layouts/shortcodes/admin-registry-access.html @@ -1,12 +1,14 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} +{{ $ram_navigation := "Select **Organizations**, your organization, **Settings**, and then select **Registry Access**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} + {{ $ram_navigation = "Select your organization in the left navigation drop-down menu, and then select **Registry access**." }} {{ end }} To configure Registry Access Management permissions, perform the following steps: 1. Sign in to {{ $product_link }}. -2. Select **Organizations**, your organization, then in the **Access management** menu, select **Registry access**. +2. {{ $ram_navigation }} 3. Enable Registry Access Management to set the permissions for your registry. > **Note** diff --git a/layouts/shortcodes/admin-scim-disable.html b/layouts/shortcodes/admin-scim-disable.html index 2f7b44b29e..8a6a23fc8d 100644 --- a/layouts/shortcodes/admin-scim-disable.html +++ b/layouts/shortcodes/admin-scim-disable.html @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} -{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM.**" }} +{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} {{ end }} 1. Sign in to {{ $product_link }}. diff --git a/layouts/shortcodes/admin-scim.html b/layouts/shortcodes/admin-scim.html index 376a26d2f9..92f58cd294 100644 --- a/layouts/shortcodes/admin-scim.html +++ b/layouts/shortcodes/admin-scim.html @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} -{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM.**" }} +{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} {{ end }} 1. Sign in to {{ $product_link }}. diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index 8464e0bf49..af389194fa 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM.**" }} + {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} {{ end }} > **Important** diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index 84519fe23d..6821bb26b1 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM.**" }} + {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} {{ end }} 1. In {{ $product_link }}, select the verified domains you want to apply the connection to. diff --git a/layouts/shortcodes/admin-sso-management-connections.md b/layouts/shortcodes/admin-sso-management-connections.md index 9c375bbaca..e1b3d24102 100644 --- a/layouts/shortcodes/admin-sso-management-connections.md +++ b/layouts/shortcodes/admin-sso-management-connections.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM**." }} + {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} {{ end }} ### Edit a connection diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index 11b7feb8ef..232c3b1164 100644 --- a/layouts/shortcodes/admin-sso-management-orgs.md +++ b/layouts/shortcodes/admin-sso-management-orgs.md @@ -2,7 +2,7 @@ {{ $sso_navigation := "Select **Organizations**, your company, and then **Settings**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your company in the left navigation drop-down menu, and then select **SSO & SCIM**." }} + {{ $sso_navigation = "Select your company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} {{ end }} ### Connect an organization diff --git a/layouts/shortcodes/admin-sso-management-users.md b/layouts/shortcodes/admin-sso-management-users.md index 7ce978bc31..6f7835a7d8 100644 --- a/layouts/shortcodes/admin-sso-management-users.md +++ b/layouts/shortcodes/admin-sso-management-users.md @@ -10,14 +10,14 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $invite_button = "**Invite**" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM**." }} + {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} {{ $member_navigation = `Navigate to the user management page for your organization or company. - Organization: Select your organization in the left navigation drop-down menu, and then select **Members**. - Company: Select your company in the left navigation drop-down menu, and then select **Users**.` }} {{ $remove_button = "**Remove member**, if you're an organization, or **Remove user**, if you're a company" }} {{ $provisioning_steps = `Users are provisioned with JIT provisioning by default. If you enable SCIM, you can disable JIT: 1. Sign in to the [Admin Console](https://admin.docker.com). - 2. Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM**. + 2. Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**. 3. In the SSO connections table, select the **Action** icon and then **Disable JIT provisioning**. 4. Select **Disable** to confirm.` }} {{ end }} diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index 691d4349cc..37e28fdfaf 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO & SCIM**." }} + {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} {{ end }} ### Remove a domain from an SSO connection