cx: add deprecation alerts to hub org management docs

content/includes/hub-org-management.md

@@ -0,0 +1,6 @@
+> [!WARNING]
+>
+> Organization management is moving to the Admin Console.
+>
+> Manage members, team, settings, and activity logs in the Docker Admin Console.
+> Access to these features in Docker Hub will end soon. Explore the [Admin Console](https://app.docker.com/admin).

content/manuals/admin/_index.md

@@ -35,9 +35,9 @@ aliases:
 - /docker-hub/admin-overview
 ---
 
-Administrators can manage companies and organizations using the Docker Admin Console, or manage organizations in Docker Hub.
+Administrators can manage companies and organizations using the Docker Admin Console.
 
-The Docker Admin Console is available for customers with a Docker Business subscription. 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://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.
 
 ![Docker hierarchy](./images/docker-admin-structure.webp)
 

content/manuals/admin/organization/activity-logs.md

@@ -23,14 +23,16 @@ Owners can also see the activity logs for their repository if the repository is
 ## Manage activity logs
 
 {{< tabs >}}
-{{< tab name="Docker Hub" >}}
+{{< tab name="Admin Console" >}}
 
-{{% admin-org-audit-log product="hub" %}}
+{{% admin-org-audit-log product="admin" %}}
 
 {{< /tab >}}
-{{< tab name="Admin Console" >}}
+{{< tab name="Docker Hub" >}}
 
-{{% admin-org-audit-log product="admin" %}}
+{{% include "hub-org-management.md" %}}
+
+{{% admin-org-audit-log product="hub" %}}
 
 {{< /tab >}}
 {{< /tabs >}}

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

@@ -54,7 +54,7 @@ Consider the following effects of converting your account:
 
 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.
 
-2. Sign in to your [Docker account](https://app.docker.com/login).
+2. Sign in to your [Docker Home](https://app.docker.com/login).
 
 3. In Docker Home, select your avatar in the top-right corner to open the drop-down.
 

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

@@ -49,6 +49,8 @@ Once you have completed all the previous steps, you can deactivate your organiza
 {{< /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**.

content/manuals/admin/organization/manage-a-team.md

@@ -35,20 +35,22 @@ The organization owner can also add additional organization owners to help them
 ## Create a team
 
 {{< tabs >}}
-{{< tab name="Docker Hub" >}}
+{{< tab name="Admin Console" >}}
 
-1. Sign in to [Docker Hub](https://hub.docker.com).
-2. Select **My Hub** and choose your organization.
-3. Select the **Teams** and then select **Create Team**.
+1. In Admin Console, select your organization.
+2. In the **User management** section, select **Teams**.
+3. Select **Create team**.
 4. Fill out your team's information and select **Create**.
 5. [Add members to your team](members.md#add-a-member-to-a-team).
 
 {{< /tab >}}
-{{< tab name="Admin Console" >}}
+{{< tab name="Docker Hub" >}}
 
-1. In Admin Console, select your organization.
-2. In the **User management** section, select **Teams**.
-3. Select **Create team**.
+{{% include "hub-org-management.md" %}}
+
+1. Sign in to [Docker Hub](https://hub.docker.com).
+2. Select **My Hub** and choose your organization.
+3. Select the **Teams** and then select **Create Team**.
 4. Fill out your team's information and select **Create**.
 5. [Add members to your team](members.md#add-a-member-to-a-team).
 
@@ -118,8 +120,19 @@ To view a team's permissions across all repositories:
 Organization owners can delete a team in Docker Hub or Admin Console. When you remove a team from your organization, this action revokes the members' access to the team's permitted resources. It won't remove users from other teams that they belong to, nor will it delete any resources.
 
 {{< tabs >}}
+{{< tab name="Admin Console" >}}
+
+1. In the [Admin Console](https://app.docker.com/admin), select your organization.
+2. In the **User management** section, select **Teams**.
+3. Select the **Actions** icon next to the name of the team you want to delete.
+4. Select **Delete team**.
+5. Review the confirmation message, then select **Delete**.
+
+{{< /tab >}}
 {{< tab name="Docker Hub" >}}
 
+{{% include "hub-org-management.md" %}}
+
 1. Sign in to [Docker Hub](https://hub.docker.com).
 2. Select **My Hub** and choose your organization.
 3. Select **Teams**.
@@ -128,15 +141,6 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r
 6. Select **Delete Team**.
 7. Review the confirmation message, then select **Delete**.
 
-{{< /tab >}}
-{{< tab name="Admin Console" >}}
-
-1. In the [Admin Console](https://app.docker.com/admin), select your organization.
-2. In the **User management** section, select **Teams**.
-3. Select the **Actions** icon next to the name of the team you want to delete.
-4. Select **Delete team**.
-5. Review the confirmation message, then select **Delete**.
-
 {{< /tab >}}
 {{< /tabs >}}
 

content/manuals/admin/organization/members.md

@@ -12,14 +12,16 @@ Learn how to manage members for your organization in Docker Hub and the Docker A
 ## Invite members
 
 {{< tabs >}}
-{{< tab name="Docker Hub" >}}
+{{< tab name="Admin Console" >}}
 
-{{% admin-users product="hub" %}}
+{{% admin-users product="admin" %}}
 
 {{< /tab >}}
-{{< tab name="Admin Console" >}}
+{{< tab name="Docker Hub" >}}
 
-{{% admin-users product="admin" %}}
+{{% include "hub-org-management.md" %}}
+
+{{% admin-users product="hub" %}}
 
 {{< /tab >}}
 {{< /tabs >}}
@@ -59,8 +61,20 @@ After inviting members, you can resend or remove invitations as needed.
 ### Resend an invitation
 
 {{< tabs >}}
+{{< tab name="Admin Console" >}}
+
+To resend an invitation from the Admin Console:
+
+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.
+
+{{< /tab >}}
 {{< tab name="Docker Hub" >}}
 
+{{% include "hub-org-management.md" %}}
+
 To resend an invitation from Docker Hub:
 
 1. Sign in to [Docker Hub](https://hub.docker.com/).
@@ -73,23 +87,25 @@ You can also resend an invitation using the Docker Hub API. For more information
 see the [Resend an invite](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1%7Bid%7D~1resend/patch) API endpoint.
 
 {{< /tab >}}
+{{< /tabs >}}
+
+### Remove an invitation
+
+{{< tabs >}}
 {{< tab name="Admin Console" >}}
 
-To resend an invitation from the Admin Console:
+To remove an invitation from the Admin Console:
 
 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.
+3. Select the **action menu** next to the invitee and select **Remove invitee**.
+4. Select **Remove** to confirm.
 
 {{< /tab >}}
-{{< /tabs >}}
-
-### Remove an invitation
-
-{{< tabs >}}
 {{< tab name="Docker Hub" >}}
 
+{{% include "hub-org-management.md" %}}
+
 To remove a member's invitation from Docker Hub:
 
 1. Sign in to [Docker Hub](https://hub.docker.com/).
@@ -100,16 +116,6 @@ To remove a member's invitation from Docker Hub:
 You can also remove an invitation using the Docker Hub API. For more information,
 see the [Cancel an invite](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1%7Bid%7D/delete) API endpoint.
 
-{{< /tab >}}
-{{< tab name="Admin Console" >}}
-
-To remove an invitation from the Admin Console:
-
-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.
-
 {{< /tab >}}
 {{< /tabs >}}
 
@@ -120,8 +126,23 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization
 ### Add a member to a team
 
 {{< tabs >}}
+{{< tab name="Admin Console" >}}
+
+To add a member to a team with the Admin Console:
+
+1. In the [Admin Console](https://app.docker.com/admin), select your organization.
+2. Select the team name.
+3. Select **Add member**. You can add the member by searching for their email address or username.
+
+   > [!NOTE]
+   >
+   > An invitee must first accept the invitation to join the organization before being added to the team.
+
+{{< /tab >}}
 {{< tab name="Docker Hub" >}}
 
+{{% include "hub-org-management.md" %}}
+
 To add a member to a team with Docker Hub:
 
 1. Sign in to [Docker Hub](https://hub.docker.com).
@@ -137,19 +158,6 @@ To add a member to a team with Docker Hub:
    >
    > An invitee must first accept the invitation to join the organization before being added to the team.
 
-{{< /tab >}}
-{{< tab name="Admin Console" >}}
-
-To add a member to a team with the Admin Console:
-
-1. In the [Admin Console](https://app.docker.com/admin), select your organization.
-2. Select the team name.
-3. Select **Add member**. You can add the member by searching for their email address or username.
-
-   > [!NOTE]
-   >
-   > An invitee must first accept the invitation to join the organization before being added to the team.
-
 {{< /tab >}}
 {{< /tabs >}}
 
@@ -162,16 +170,6 @@ To add a member to a team with the Admin Console:
 Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources.
 
 {{< tabs >}}
-{{< tab name="Docker Hub" >}}
-
-To remove a member from a specific team with Docker Hub:
-
-1. Sign in to [Docker Hub](https://hub.docker.com).
-2. Select **My Hub**, your organization, **Teams**, and then the team.
-3. Select the **X** next to the user’s name to remove them from the team.
-4. When prompted, select **Remove** to confirm.
-
-{{< /tab >}}
 {{< tab name="Admin Console" >}}
 
 To remove a member from a specific team with the Admin Console:
@@ -181,6 +179,18 @@ To remove a member from a specific team with the Admin Console:
 3. Select the **X** next to the user's name to remove them from the team.
 4. When prompted, select **Remove** to confirm.
 
+{{< /tab >}}
+{{< tab name="Docker Hub" >}}
+
+{{% include "hub-org-management.md" %}}
+
+To remove a member from a specific team with Docker Hub:
+
+1. Sign in to [Docker Hub](https://hub.docker.com).
+2. Select **My Hub**, your organization, **Teams**, and then the team.
+3. Select the **X** next to the user’s name to remove them from the team.
+4. When prompted, select **Remove** to confirm.
+
 {{< /tab >}}
 {{< /tabs >}}
 
@@ -190,19 +200,42 @@ Organization owners can manage [roles](/security/for-admins/roles-and-permission
 within an organization. If an organization is part of a company,
 the company owner can also manage that organization's roles. If you have SSO enabled, you can use [SCIM for role mapping](/security/for-admins/provisioning/scim/).
 
+{{< tabs >}}
+{{< tab name="Admin Console" >}}
+
+To update a member role in the Admin Console:
+
+1. In the [Admin Console](https://app.docker.com/admin), select your organization.
+2. Select the **Members** tab.
+3. Find the username of the member whose role you want to edit. Select the
+**Actions menu**, then **Edit role**.
+
 > [!NOTE]
 >
 > If you're the only owner of an organization,
 > you need to assign a new owner before you can edit your role.
 
-To update a member role:
+{{< /tab >}}
+{{< tab name="Docker Hub" >}}
+
+{{% include "hub-org-management.md" %}}
+
+To update a member role in Docker Hub:
 
 1. Sign in to [Docker Hub](https://hub.docker.com).
 2. Select **My Hub**, your organization, and then **Members**.
 3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon.
 4. Select **Edit role**.
 5. Select their organization, select the role you want to assign, and then select **Save**.
 
+> [!NOTE]
+>
+> If you're the only owner of an organization,
+> you need to assign a new owner before you can edit your role.
+
+{{< /tab >}}
+{{< /tabs >}}
+
 ## Export members CSV file
 
 {{< summary-bar feature_name="Admin orgs" >}}
@@ -216,22 +249,24 @@ Owners can export a CSV file containing all members. The CSV file for a company
 - Account Created: The time and date when the user account was created
 
 {{< tabs >}}
-{{< tab name="Docker Hub" >}}
+{{< tab name="Admin Console" >}}
 
 To export a CSV file of your members:
 
-1. Sign in to [Docker Hub](https://hub.docker.com).
-2. Select **My Hub**, your organization, and then **Members**.
-3. Select the **Action** icon and then select **Export users as CSV**.
+1. In the [Admin Console](https://app.docker.com/admin), select your organization.
+2. Select **Members**.
+3. Select the **download** icon to export a CSV file of all members.
 
 {{< /tab >}}
-{{< tab name="Admin Console" >}}
+{{< tab name="Docker Hub" >}}
+
+{{% include "hub-org-management.md" %}}
 
 To export a CSV file of your members:
 
-1. In the [Admin Console](https://app.docker.com/admin), select your organization.
-2. Select **Members**.
-3. Select the **download** icon to export a CSV file of all members.
+1. Sign in to [Docker Hub](https://hub.docker.com).
+2. Select **My Hub**, your organization, and then **Members**.
+3. Select the **Action** icon and then select **Export users as CSV**.
 
 {{< /tab >}}
 {{< /tabs >}}