From cd85277b85fd5295eda9f2061eaacddfadfb70b0 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 10 Dec 2024 15:44:07 -0800 Subject: [PATCH 1/5] Docs freshness for Admin Console Choose profile UI flow --- content/manuals/accounts/deactivate-user-account.md | 2 +- content/manuals/admin/company/organizations.md | 8 ++++---- content/manuals/admin/company/owners.md | 4 ++-- content/manuals/admin/organization/general-settings.md | 2 +- content/manuals/admin/organization/insights.md | 3 +-- content/manuals/admin/organization/members.md | 6 ++---- .../security/for-admins/provisioning/just-in-time.md | 4 ++-- .../security/for-admins/single-sign-on/configure.md | 2 +- .../manuals/security/for-admins/single-sign-on/connect.md | 4 ++-- .../manuals/security/for-admins/single-sign-on/manage.md | 4 ++-- .../security/for-admins/single-sign-on/troubleshoot.md | 3 +-- 11 files changed, 19 insertions(+), 23 deletions(-) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 1985a8a3182d..739558d28bd3 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -18,7 +18,7 @@ Before deactivating your Docker account, ensure you meet the following requireme - For owners, you must leave your organization or company before deactivating your Docker account. To do this: 1. Sign in to the [Docker Admin Console](https://app.docker.com/admin). - 2. Select the organization you need to leave from the top-left drop-down menu. + 2. Select the organization you need to leave from the Choose profile page. 3. Find your username in the **Members** tab. 4. Select the **More options** menu and then select **Leave organization**. diff --git a/content/manuals/admin/company/organizations.md b/content/manuals/admin/company/organizations.md index 54e1ffe50a4a..4b2d29cc1991 100644 --- a/content/manuals/admin/company/organizations.md +++ b/content/manuals/admin/company/organizations.md @@ -11,7 +11,7 @@ You can manage the organizations in a company in the Docker Admin Console. ## View all organizations 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Under **Organizations**, select **Overview**. ## Add seats to an organization @@ -19,7 +19,7 @@ You can manage the organizations in a company in the Docker Admin Console. When you have a [self-serve](../../subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Under **Organizations**, select **Overview**. 4. Select the action icon in the organization's card, and then select **Get more seats**. @@ -36,7 +36,7 @@ There is no limit to the number of organizations you can have under a company la > Once you add an organization to a company, you can't remove it from the company. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Select **Add organization**. 4. Choose the organization you want to add from the drop-down menu. 5. Select **Add organization** to confirm. @@ -44,7 +44,7 @@ There is no limit to the number of organizations you can have under a company la ## Manage an organization 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Select the organization that you want to manage. For more details about managing an organization, see [Organization administration](../organization/_index.md). diff --git a/content/manuals/admin/company/owners.md b/content/manuals/admin/company/owners.md index fdacaa77c8f1..0dadbb580f60 100644 --- a/content/manuals/admin/company/owners.md +++ b/content/manuals/admin/company/owners.md @@ -18,7 +18,7 @@ member in an organization, they don't occupy a seat. ## Add a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Select **Company owners**. 4. Select **Add owner**. 5. Specify the user's Docker ID to search for the user. @@ -27,7 +27,7 @@ member in an organization, they don't occupy a seat. ## Remove a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the Choose profile page. 3. Select **Company owners**. 4. Select the **Action** icon in the row of the company owner that your want to remove. 5. Select **Remove as company owner**. diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index 9b26bc8b0ef4..c509ddf7aac8 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -23,7 +23,7 @@ This information includes: To edit this information: 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your organization in the drop-down menu. +2. Select your company on the Choose profile page. 3. Under **Organization settings**, select **General**. 4. Specify the organization information and select **Save**. diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 5b63d23cf5ab..df87e6d07c9d 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -28,8 +28,7 @@ Key benefits include: 1. Go to the [Admin Console](https://app.docker.com/admin/) and sign in to an account that is an organization owner. -2. In the Admin Console, select your organization from the drop-down in the left - navigation. +2. Select your company on the Choose profile page. 3. Select **Insights**. 4. On the **Insights** page, select the period of time for the data. diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 25d78ce890a4..6042f7d34374 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -70,8 +70,7 @@ To resend an invitation from Docker Hub: To resend an invitation from the Admin Console: -1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from -top-left drop-down menu. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. 2. Select **Members**. 3. Select the **action menu** next to the invitee and select **Resend invitation**. 4. Select **Invite** to confirm. @@ -98,8 +97,7 @@ To remove a member's invitation from Docker Hub: To remove an invitation from the Admin Console: -1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from -top-left drop-down menu. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. 2. Select **Members**. 3. Select the **action menu** next to the invitee and select **Remove invitee**. 4. Select **Remove** to confirm. diff --git a/content/manuals/security/for-admins/provisioning/just-in-time.md b/content/manuals/security/for-admins/provisioning/just-in-time.md index d412f8b6b7e8..dc006697753c 100644 --- a/content/manuals/security/for-admins/provisioning/just-in-time.md +++ b/content/manuals/security/for-admins/provisioning/just-in-time.md @@ -63,7 +63,7 @@ You may want to disable JIT provisioning for reasons such as the following: Users are provisioned with JIT by default. If you enable SCIM, you can disable JIT: -1. Sign in to the [Admin Console](https://app.docker.com/). -2. Select your organization or company in the left-hand navigation drop-down, and then select **SSO and SCIM**. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select **SSO and SCIM**. 3. In the SSO connections table, select the **Action** icon and then **Disable JIT provisioning**. 4. Select **Disable** to confirm. diff --git a/content/manuals/security/for-admins/single-sign-on/configure.md b/content/manuals/security/for-admins/single-sign-on/configure.md index a5bda5c29b55..bab632321a61 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -22,7 +22,7 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under **Security and access**, select **Domain management**. 4. Select **Add a domain**. 5. Enter your domain in the text box and select **Add domain**. diff --git a/content/manuals/security/for-admins/single-sign-on/connect.md b/content/manuals/security/for-admins/single-sign-on/connect.md index 1c95c487975a..02e71005650b 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -31,7 +31,7 @@ Make sure you have completed the following before you begin: {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. Select **Create Connection** and provide a name for the connection. 5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. @@ -201,7 +201,7 @@ You can also test your SSO connection through the command-line interface (CLI). Enforcing SSO requires users to use SSO when signing into Docker. This centralizes authentication and enforces policies set by the IdP. 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. In the SSO connections table, select the **Action** icon and then **Enable enforcement**. When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. If you want to use 2FA, you must enable 2FA through your IdP. 5. Continue with the on-screen instructions and verify you've completed all tasks. diff --git a/content/manuals/security/for-admins/single-sign-on/manage.md b/content/manuals/security/for-admins/single-sign-on/manage.md index 26455b24794f..f1f2874e38b7 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -71,7 +71,7 @@ aliases: To add a guest that isn't verified through your IdP: 1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select **Organizations**, your organization, and then **Members**. +2. Select your organization or company from the Choose profile page, then select **Members**. 3. Select **Invite**. 4. Follow the on-screen instructions to invite the user. @@ -80,7 +80,7 @@ To add a guest that isn't verified through your IdP: To remove a user: 1. Sign in to [Admin Console](https://app.docker.com/admin). -2. Select **Organizations**, your organization, and then **Members**. +2. Select your organization or company from the Choose profile page, then select **Members**. 3. Select the action icon next to a user’s name, and then select **Remove member**, if you're an organization, or **Remove user**, if you're a company. 4. Follow the on-screen instructions to remove the user. diff --git a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md index 651bf9d8e379..3b378941a615 100644 --- a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md +++ b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md @@ -16,8 +16,7 @@ their service. ## View SSO and SCIM error logs 1. Sign in to the [Admin Console](https://app.docker.com/admin/). -2. Select your organization or company in the left navigation drop-down menu, - and then select **SSO and SCIM**. +2. Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. > [!NOTE] > From e8170fb8c16a7e77160bbaaf627fcb4c98914c4e Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 10 Dec 2024 16:09:43 -0800 Subject: [PATCH 2/5] Add missing shortcode update --- layouts/shortcodes/admin-users.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/shortcodes/admin-users.html b/layouts/shortcodes/admin-users.html index 1594d9dfd0be..074c760e88e8 100644 --- a/layouts/shortcodes/admin-users.html +++ b/layouts/shortcodes/admin-users.html @@ -17,7 +17,7 @@ {{ if eq (.Get "product") "admin" }} {{ $invite_button = "**Invite**" }} {{ $export_button = "the **Action** icon and then select **Export users as CSV**" }} -{{ $member_navigation = "Select your organization in the left navigation drop-down menu, and then select **Members**." }} +{{ $member_navigation = "Select your organization from the Choose profile page, and then select **Members**." }} {{ $remove_button = "**Remove member**" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }} From d02610ed3a6ab7452a254699f5127063894298cd Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 10 Dec 2024 16:12:30 -0800 Subject: [PATCH 3/5] More missing shortcodes --- layouts/shortcodes/admin-sso-management-connections.md | 2 +- layouts/shortcodes/admin-sso-management-orgs.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/shortcodes/admin-sso-management-connections.md b/layouts/shortcodes/admin-sso-management-connections.md index fe185d858186..ab51525e9949 100644 --- a/layouts/shortcodes/admin-sso-management-connections.md +++ b/layouts/shortcodes/admin-sso-management-connections.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the Choose proifle page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} ### Edit a connection diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index db97b8b12d4a..75304edf55bf 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://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your company from the Choose profile page, and then select **SSO and SCIM**." }} {{ end }} ### Connect an organization From 7287a1f077121eab8b2e2a60da4c8a842031268b Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 10 Dec 2024 16:16:10 -0800 Subject: [PATCH 4/5] All shortcodes for SSO --- layouts/shortcodes/admin-domain-audit.md | 2 +- layouts/shortcodes/admin-sso-config.md | 2 +- layouts/shortcodes/admin-sso-connect.md | 2 +- layouts/shortcodes/admin-sso-management.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md index d43dd82c75e9..a3389e477a89 100644 --- a/layouts/shortcodes/admin-domain-audit.md +++ b/layouts/shortcodes/admin-domain-audit.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $domain_navigation = "Select your organization in the left navigation drop-down menu, and then select **Domain management**." }} + {{ $domain_navigation = "Select your organization on the Choose profile page, and then select **Domain management**." }} {{ $sso_link = "[SSO](/security/for-admins/single-sign-on/)" }} {{ $scim_link = "[SCIM](/security/for-admins/provisioning/scim/)" }} {{ end }} diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index 1c959eeadc4b..fbbd0bf23e2d 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -3,7 +3,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 and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} > [!IMPORTANT] diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index e5663366a7f5..950df551fe1a 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -3,7 +3,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 and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} 1. In {{ $product_link }}, select the verified domains you want to apply the connection to. diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index a61db8256c48..c18f055da2d0 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**." }} {{ end }} ### Remove a domain from an SSO connection From 607c52cb0fab49de24f919d7aa410b9d18d41d47 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 11 Dec 2024 10:11:29 -0800 Subject: [PATCH 5/5] Find and replace for Choose profile page, add bolding --- content/manuals/accounts/deactivate-user-account.md | 2 +- content/manuals/admin/company/organizations.md | 8 ++++---- content/manuals/admin/company/owners.md | 4 ++-- content/manuals/admin/organization/general-settings.md | 2 +- content/manuals/admin/organization/insights.md | 2 +- .../security/for-admins/single-sign-on/configure.md | 2 +- .../manuals/security/for-admins/single-sign-on/connect.md | 4 ++-- .../manuals/security/for-admins/single-sign-on/manage.md | 4 ++-- .../security/for-admins/single-sign-on/troubleshoot.md | 2 +- layouts/shortcodes/admin-domain-audit.md | 2 +- layouts/shortcodes/admin-sso-config.md | 2 +- layouts/shortcodes/admin-sso-connect.md | 2 +- layouts/shortcodes/admin-sso-management-orgs.md | 2 +- layouts/shortcodes/admin-sso-management.md | 2 +- layouts/shortcodes/admin-users.html | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 739558d28bd3..8639c5c43c58 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -18,7 +18,7 @@ Before deactivating your Docker account, ensure you meet the following requireme - For owners, you must leave your organization or company before deactivating your Docker account. To do this: 1. Sign in to the [Docker Admin Console](https://app.docker.com/admin). - 2. Select the organization you need to leave from the Choose profile page. + 2. Select the organization you need to leave from the **Choose profile** page. 3. Find your username in the **Members** tab. 4. Select the **More options** menu and then select **Leave organization**. diff --git a/content/manuals/admin/company/organizations.md b/content/manuals/admin/company/organizations.md index 4b2d29cc1991..d1990cd79c93 100644 --- a/content/manuals/admin/company/organizations.md +++ b/content/manuals/admin/company/organizations.md @@ -11,7 +11,7 @@ You can manage the organizations in a company in the Docker Admin Console. ## View all organizations 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Under **Organizations**, select **Overview**. ## Add seats to an organization @@ -19,7 +19,7 @@ You can manage the organizations in a company in the Docker Admin Console. When you have a [self-serve](../../subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Under **Organizations**, select **Overview**. 4. Select the action icon in the organization's card, and then select **Get more seats**. @@ -36,7 +36,7 @@ There is no limit to the number of organizations you can have under a company la > Once you add an organization to a company, you can't remove it from the company. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Select **Add organization**. 4. Choose the organization you want to add from the drop-down menu. 5. Select **Add organization** to confirm. @@ -44,7 +44,7 @@ There is no limit to the number of organizations you can have under a company la ## Manage an organization 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Select the organization that you want to manage. For more details about managing an organization, see [Organization administration](../organization/_index.md). diff --git a/content/manuals/admin/company/owners.md b/content/manuals/admin/company/owners.md index 0dadbb580f60..ba028a727aad 100644 --- a/content/manuals/admin/company/owners.md +++ b/content/manuals/admin/company/owners.md @@ -18,7 +18,7 @@ member in an organization, they don't occupy a seat. ## Add a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Select **Company owners**. 4. Select **Add owner**. 5. Specify the user's Docker ID to search for the user. @@ -27,7 +27,7 @@ member in an organization, they don't occupy a seat. ## Remove a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Select **Company owners**. 4. Select the **Action** icon in the row of the company owner that your want to remove. 5. Select **Remove as company owner**. diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index c509ddf7aac8..9b5eb7d31e08 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -23,7 +23,7 @@ This information includes: To edit this information: 1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Under **Organization settings**, select **General**. 4. Specify the organization information and select **Save**. diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index df87e6d07c9d..159a5020ea04 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -28,7 +28,7 @@ Key benefits include: 1. Go to the [Admin Console](https://app.docker.com/admin/) and sign in to an account that is an organization owner. -2. Select your company on the Choose profile page. +2. Select your company on the **Choose profile** page. 3. Select **Insights**. 4. On the **Insights** page, select the period of time for the data. diff --git a/content/manuals/security/for-admins/single-sign-on/configure.md b/content/manuals/security/for-admins/single-sign-on/configure.md index bab632321a61..ee2905fbc064 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -22,7 +22,7 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under **Security and access**, select **Domain management**. 4. Select **Add a domain**. 5. Enter your domain in the text box and select **Add domain**. diff --git a/content/manuals/security/for-admins/single-sign-on/connect.md b/content/manuals/security/for-admins/single-sign-on/connect.md index 02e71005650b..0a698b9653a9 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -31,7 +31,7 @@ Make sure you have completed the following before you begin: {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. Select **Create Connection** and provide a name for the connection. 5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. @@ -201,7 +201,7 @@ You can also test your SSO connection through the command-line interface (CLI). Enforcing SSO requires users to use SSO when signing into Docker. This centralizes authentication and enforces policies set by the IdP. 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the Choose profile page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. In the SSO connections table, select the **Action** icon and then **Enable enforcement**. When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. If you want to use 2FA, you must enable 2FA through your IdP. 5. Continue with the on-screen instructions and verify you've completed all tasks. diff --git a/content/manuals/security/for-admins/single-sign-on/manage.md b/content/manuals/security/for-admins/single-sign-on/manage.md index f1f2874e38b7..70b4af79abe0 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -71,7 +71,7 @@ aliases: To add a guest that isn't verified through your IdP: 1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the Choose profile page, then select **Members**. +2. Select your organization or company from the **Choose profile** page, then select **Members**. 3. Select **Invite**. 4. Follow the on-screen instructions to invite the user. @@ -80,7 +80,7 @@ To add a guest that isn't verified through your IdP: To remove a user: 1. Sign in to [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the Choose profile page, then select **Members**. +2. Select your organization or company from the **Choose profile** page, then select **Members**. 3. Select the action icon next to a user’s name, and then select **Remove member**, if you're an organization, or **Remove user**, if you're a company. 4. Follow the on-screen instructions to remove the user. diff --git a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md index 3b378941a615..e5585e36a8a7 100644 --- a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md +++ b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md @@ -16,7 +16,7 @@ their service. ## View SSO and SCIM error logs 1. Sign in to the [Admin Console](https://app.docker.com/admin/). -2. Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. +2. Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. > [!NOTE] > diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md index a3389e477a89..983555f834f8 100644 --- a/layouts/shortcodes/admin-domain-audit.md +++ b/layouts/shortcodes/admin-domain-audit.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $domain_navigation = "Select your organization on the Choose profile page, and then select **Domain management**." }} + {{ $domain_navigation = "Select your organization on the **Choose profile** page, and then select **Domain management**." }} {{ $sso_link = "[SSO](/security/for-admins/single-sign-on/)" }} {{ $scim_link = "[SCIM](/security/for-admins/provisioning/scim/)" }} {{ end }} diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index fbbd0bf23e2d..3a4a0d38b6f4 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} > [!IMPORTANT] diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index 950df551fe1a..4e045bd904fe 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} 1. In {{ $product_link }}, select the verified domains you want to apply the connection to. diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index 75304edf55bf..300c35911082 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://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your company from the Choose profile page, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your company from the **Choose profile** page, and then select **SSO and SCIM**." }} {{ end }} ### Connect an organization diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index c18f055da2d0..054c8419a95e 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**." }} {{ end }} ### Remove a domain from an SSO connection diff --git a/layouts/shortcodes/admin-users.html b/layouts/shortcodes/admin-users.html index 074c760e88e8..6f7bbae8c2e7 100644 --- a/layouts/shortcodes/admin-users.html +++ b/layouts/shortcodes/admin-users.html @@ -17,7 +17,7 @@ {{ if eq (.Get "product") "admin" }} {{ $invite_button = "**Invite**" }} {{ $export_button = "the **Action** icon and then select **Export users as CSV**" }} -{{ $member_navigation = "Select your organization from the Choose profile page, and then select **Members**." }} +{{ $member_navigation = "Select your organization from the **Choose profile** page, and then select **Members**." }} {{ $remove_button = "**Remove member**" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }}