publish updates from main

content/manuals/accounts/deactivate-user-account.md

@@ -17,10 +17,10 @@ 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.
-    3. Find your username in the **Members** tab.
-    4. Select the **More options** menu and then select **Leave organization**.
+    1. Sign in to [Docker Home](https://app.docker.com/admin) and choose
+    your organization.
+    1. Select **Members** and find your username.
+    1. Select the **Actions** menu and then select **Leave organization**.
 
 - If you are the sole owner of an organization, you must assign the owner role to another member of the organization and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company.
 
@@ -39,8 +39,8 @@ Once you have completed all the previous steps, you can deactivate your account.
 > This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it.
 
 1. Sign in to [Docker Home](https://app.docker.com/login).
-2. Select your avatar to open the drop-down menu.
-3. Select **Account settings**.
-4. Select **Deactivate**.
-5. Select **Deactivate account**.
-6. To confirm, select **Deactivate account**.
+1. Select your avatar to open the drop-down menu.
+1. Select **Account settings**.
+1. Select **Deactivate**.
+1. Select **Deactivate account**.
+1. To confirm, select **Deactivate account**.

content/manuals/accounts/manage-account.md

@@ -18,9 +18,7 @@ account security.
 ## Update general settings
 
 1. Sign in to your [Docker account](https://app.docker.com/login).
-2. In Docker Home, select your avatar in the top-right corner to open the
-drop-down.
-3. Select **Account settings**.
+2. Select your avatar in the top-right corner and select **Account settings**.
 
 From the Account settings page, you can take any of the following actions.
 

content/manuals/admin/_index.md

@@ -37,7 +37,7 @@ aliases:
 
 Administrators can manage companies and organizations using the Docker Admin Console.
 
-The [Docker Admin Console](https://admin.docker.com) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles.
+The [Docker Admin Console](https://app.docker.com/admin) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles.
 
 ![Docker hierarchy](./images/docker-admin-structure.webp)
 

content/manuals/admin/company/_index.md

@@ -33,7 +33,7 @@ grid:
 - title: Domain management
   description: Add and verify your domains.
   icon: domain_verification
-  link: /admin/company/settings/domains/
+  link: /security/for-admins/domain-management/
 - title: FAQs
   description: Explore common company FAQs.
   link: /faq/admin/company-faqs/

content/manuals/admin/company/new-company.md

@@ -16,17 +16,17 @@ You can create a new company in the Docker Admin Console. Before you begin, you
 
 To create a new company:
 
-1. Sign in to the [Admin Console](https://app.docker.com/admin).
-2. Select your organization you want to add to your company from the **Choose profile** page.
-3. Under **Organization settings**, select **Company management**.
-4. Select **Create a company**.
-5. Enter a unique name for your company, then select **Continue**.
+1. Sign in to [Docker Home](https://app.docker.com/) and select your
+organization.
+1. Select **Admin Console**, then **Company management**.
+1. Select **Create a company**.
+1. Enter a unique name for your company, then select **Continue**.
 
     > [!TIP]
     >
     > The name for your company can't be the same as an existing user, organization, or company namespace.
 
-6. Review the company migration details and then select **Create company**.
+1. Review the company migration details and then select **Create company**.
 
 For more information on how you can add organizations to your company, see [Add organizations to a company](./organizations.md#add-organizations-to-a-company).
 

content/manuals/admin/company/organizations.md

@@ -10,11 +10,11 @@ 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.
-3. Under **Organizations**, select **Overview**.
+1. Sign in to the [Docker Home](https://app.docker.com) and choose
+your company.
+1. Select **Admin Console**, then **Organizations**.
 
-The organization overview page displays all organizations under your company.
+The **Organizations** view displays all organizations under your company.
 
 ## Add seats to an organization
 
@@ -30,18 +30,17 @@ You must be a company owner to add an organization to a company. You must also b
 >
 > 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.
-3. Select **Organizations**, then **Overview**.
-4. Select **Add organization**.
-5. Choose the organization you want to add from the drop-down menu.
-6. Select **Add organization** to confirm.
+1. Sign in to [Docker Home](https://app.docker.com) and select your company.
+1. Select **Admin Console**, then **Organizations**.
+1. Select **Add organization**.
+1. Choose the organization you want to add from the drop-down menu.
+1. Select **Add organization** to confirm.
 
 ## Manage an organization
 
-1. Sign in to the [Admin Console](https://admin.docker.com).
-2. Select your company on the **Choose profile** page.
-3. Select the organization that you want to manage.
+1. Sign in to [Docker Home](https://app.docker.com) and select your company.
+1. Select **Admin Console**, then **Organizations**.
+1. Select the organization you want to manage.
 
 For more details about managing an organization, see [Organization administration](../organization/_index.md).
 

content/manuals/admin/company/owners.md

@@ -23,17 +23,15 @@ owners don't need to be member of an organization.
 
 ## Add a company owner
 
-1. Sign in to the [Admin Console](https://admin.docker.com).
-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.
-6. After you find the user, select **Add company owner**.
+1. Sign in to [Docker Home](https://app.docker.com) and select your company.
+1. Select **Admin Console**, then **Company owners**.
+1. Select **Add owner**.
+1. Specify the user's Docker ID to search for the user.
+1. After you find the user, select **Add company owner**.
 
 ## Remove a company owner
 
-1. Sign in to the [Admin Console](https://admin.docker.com).
-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**.
+1. Sign in to [Docker Home](https://app.docker.com) and select your company.
+1. Select **Admin Console**, then **Company owners**.
+1. Locate the company owner you want to remove and select the **Actions** menu.
+1. Select **Remove as company owner**.

content/manuals/admin/faqs/company-faqs.md

@@ -62,7 +62,7 @@ You can manage domain verification, SSO, and SCIM at the company level. The foll
 - User management
 - Billing
 
-To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://admin.docker.com).
+To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://app.docker.com/admin).
 
 Domain audit isn't supported for companies or organizations within a company.
 

content/manuals/admin/faqs/general-faqs.md

@@ -85,7 +85,9 @@ If the user is a member of your organization, you can remove the user from your
 
 ### How do I manage settings for a user account?
 
-You can manage your account settings anytime when you sign in to your [Docker account](https://app.docker.com/login). In Docker Home, select your avatar in the top-right navigation, then select **My Account**. You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control.
+You can manage your account settings anytime when you sign in to your [Docker account](https://app.docker.com/login). Select your avatar in the top-right navigation, then select **My Account**.
+
+You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control.
 
 ### How do I add an avatar to my Docker account?
 

content/manuals/admin/organization/_index.md

@@ -37,7 +37,7 @@ grid:
   icon: key
 - title: Domain management
   description: Add, verify, and audit your domains.
-  link: /admin/organization/security-settings/domains/
+  link: /security/for-admins/domain-management/
   icon: domain_verification
 - title: FAQs
   description: Explore common organization FAQs.

content/manuals/admin/organization/convert-account.md

@@ -25,8 +25,8 @@ Before you convert a user account to an organization, ensure that you meet the f
 
     To do this:
     1. Navigate to **My Hub** and then select the organization you need to leave.
-    2. Find your username in the **Members** tab.
-    3. Select the **More options** menu and then select **Leave organization**.
+    1. Find your username in the **Members** tab.
+    1. Select the **More options** menu and then select **Leave organization**.
 
     If the user account is the sole owner of any organization or company, assign another user the owner role and then remove yourself from the organization or company.
 
@@ -58,18 +58,16 @@ associated with an organization, not a single user account.
 
 ## Convert an account into an organization
 
-1. Ensure you have removed your user account from any company or teams or organizations. Also make sure that you have a new Docker ID before you convert an account. See the [Prerequisites](#prerequisites) section for details.
+Before you convert an account into an organization ensure you have:
 
-2. Sign in to [Docker Home](https://app.docker.com/login).
+- Removed your user account from any company or teams or organizations
+- Created a new Docker ID before you convert an account
 
-3. In Docker Home, select your avatar in the top-right corner to open the drop-down.
+See the [Prerequisites](#prerequisites) section for details.
 
-4. Select **Account settings**.
-
-5. Select **Convert**.
-
-6. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account.
-
-7. Enter a **Username of new owner** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert.
-
-8. Select **Confirm**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization.
+1. Sign in to [Docker Home](https://app.docker.com/login).
+1. Select your avatar in the top-right corner and select **Account settings**.
+1. In the **Settings** section, select **Convert**.
+1. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account.
+1. Enter a **Username of new owner** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert.
+1. Select **Confirm**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization.

content/manuals/admin/organization/deactivate-account.md

@@ -21,13 +21,9 @@ Before deactivating an organization, complete the following:
 
 - Download any images and tags you want to keep:
   `docker pull -a <image>:<tag>`.
-
 - If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md).
-
 - Remove all other members within the organization.
-
 - Unlink your [Github and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account).
-
 - For Business organizations, [remove your SSO connection](../../security/for-admins/single-sign-on/manage/#remove-an-organization).
 
 ## Deactivate
@@ -41,19 +37,22 @@ Once you have completed all the previous steps, you can deactivate your organiza
 {{< tabs >}}
 {{< tab name="Admin Console" >}}
 
-1. In Admin Console, choose the organization you want to deactivate.
-2. Under **Organization settings**, select **Deactivate**.
-3. Enter the organization name to confirm deactivation.
-4. Select **Deactivate organization**.
+1. Sign in to [Docker Home](https://app.docker.com) and select the organization
+you want to deactivate.
+1. Select **Admin Console**, then **Deactivate**. If this button is greyed out,
+you must complete the [Prerequisites](#prerequisites).
+1. Enter the organization name to confirm deactivation.
+1. Select **Deactivate organization**.
 
 {{< /tab >}}
 {{< tab name="Docker Hub" >}}
 
 {{% include "hub-org-management.md" %}}
 
-1. On Docker Hub, select **My Hub**.
-2. Choose the organization you want to deactivate.
-3. In **Settings**, select the **Deactivate org** and then **Deactivate organization**.
+1. Sign in to [Docker Hub](https://hub.docker.com).
+1. Choose the organization you want to deactivate.
+1. In **Settings**, select **Deactivate org**.
+1. Select **Deactivate organization**.
 
 {{< /tab >}}
 {{< /tabs >}}

content/manuals/admin/organization/general-settings.md

@@ -21,11 +21,10 @@ 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.
-3. Under **Organization settings**, select **Organization information**.
-4. Specify the organization information and select **Save**.
+1. Sign in to the [Admin Console](https://app.docker.com/admin).
+1. Select your company on the **Choose profile** page.
+1. Specify the organization information and select **Save**.
 
 ## Next steps
 
-In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/provisioning/scim.md). If your organization isn't part of a company, from here you can also [audit your domains](../../security/for-admins/domain-audit.md) or [create a company](new-company.md).
+In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/provisioning/scim.md). If your organization isn't part of a company, from here you can also [manage your domains](/manuals/security/for-admins/domain-management.md) or [create a company](new-company.md).

content/manuals/admin/organization/insights.md

@@ -34,12 +34,9 @@ To access Insights, you must contact your Customer Success Manager to have the
 feature enabled. Once the feature is enabled, access Insights using the following
 steps:
 
-1. Open [Docker Home](https://app.docker.com/) and select your organization
-on the **Choose profile** page.
-1. Select **Admin Console** in the left-hand navigation menu.
-1. Select **Desktop insights**.
-1. Choose a timeframe for your insights data: **1 Week**, **1 Month**, or
-**3 Months**.
+1. Sign in to [Docker Home](https://app.docker.com/) and choose
+your organization.
+1. Select **Insights**. then select the period of time for the data.
 
 > [!NOTE]
 >