Restructure administration docs IA (#18940)

* cli: use the new add-host separator

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>

* update organization admin sections

* update company sections and move faqs

* add create company steps and clean up overview

* update faq paths in tiles and add ea banner to admin tab

* fix spaces and update admin console references

* update banner message, clarify content, and streamline onboarding guide

---------

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>

content/admin/_index.md

@@ -1,22 +1,35 @@
 ---
-description: Docker Admin provides administrators with centralized observability,
+description: Discover manuals on administration for accounts, organizations, and companies.
-  access management, and controls for their company and organizations.
+keywords: admin, administration, company, organization, Admin Console, user accounts, account management
-keywords: admin, administration, company, organization
+title: Administration overview
-title: Docker Admin overview
 grid:
 - title: Company administration
-  description: Explore how to manage a company in Docker Admin.
+  description: Explore how to manage a company.
   icon: apartment
   link: /admin/company/
 - title: Organization administration
-  description: Learn about organization administration in Docker Admin.
+  description: Learn about organization administration.
   icon: store
   link: /admin/organization/
+- title: Company FAQ
+  description: Discover common questions and answers about companies.
+  icon: help
+  link: /faq/admin/company-faqs/
+- title: Organization FAQ
+  description: Explore popular FAQ topics about organizations.
+  icon: help
+  link: /faq/admin/organization-faqs/
+- title: Security
+  description: Explore security features for administrators.
+  icon: shield_locked
+  link: /security/
+aliases:
+- /docker-hub/admin-overview
 ---
 
-{{< include "admin-early-access.md" >}}
+Administrators can manage companies and organizations using Docker Hub or the Docker Admin Console.
 
-The [Docker Admin](https://admin.docker.com) console 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 is available in [Early Access](../release-lifecycle.md#early-access-ea) to all company owners and organization owners that have a Docker Business or Docker Team 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.
 
 ![Docker hierarchy](./images/docker-admin-structure.webp)
 

content/admin/company/_index.md

@@ -1,8 +1,12 @@
 ---
-description: Learn about companies.
+description: Learn about managing companies.
 keywords: company, multiple organizations, manage companies
 title: Overview
 grid:
+- title: Create a company
+  description: Get started by learning how to create a company.
+  icon: apartment
+  link: /admin/company/new-company/
 - title: Manage organizations
   description: Learn how to add and manage organizations as well as seats within your
     company.
@@ -31,17 +35,14 @@ grid:
   link: /admin/company/settings/domains/
 - title: FAQs
   description: Explore common company FAQs.
-  link: /docker-hub/company-faqs/
+  link: /faq/admin/company-faqs/
   icon: help
+aliases:
+- /docker-hub/creating-companies/
 ---
 
-{{< include "admin-early-access.md" >}}
-
 {{< include "admin-company-overview.md" >}}
 
-To create a company, see
+Learn how to administer a company in the following sections.
-[Create a company](../organization/general-settings.md#create-a-company).
-
-Learn how to administer a company using Docker Admin in the following sections.
 
 {{< grid >}}

content/admin/company/new-company.md

@@ -0,0 +1,61 @@
+---
+title: Create a company
+description: Learn how to create a company.
+keywords: company, hub, organization, company owner, Admin Console, company management
+---
+
+You can create a new company in Docker Hub or Docker Admin Console. Before you begin, make sure you're the owner of the organization you want to add to the new company. The organization also needs to have a Docker Business subscription.
+
+{{< tabs >}}
+
+{{< tab name="Docker Hub" >}}
+
+## Create a company
+
+To create a new company:
+
+1. In Docker Hub, navigate to the organization you want to place under a company. The organization must have a Business subscription, and you must be an owner of the organization.
+2. Select **Settings**.
+3. Near the bottom of the **General** tab, select **Create a company**.
+4. 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.
+    { .tip }
+
+5. Review the company migration details and then select **Create company**.
+
+{{< /tab >}}
+
+{{< tab name="Admin Console" >}}
+
+{{< include "admin-early-access.md" >}}
+
+## Create a company
+
+To create a new company:
+
+1. In the Admin Console, navigate to the organization you want to place under a company. The organization must have a Business subscription, and you must be an owner of the organization.
+2. Under **Organization Settings**, select **General**.
+3. In the **Organization management** section, select **Create a company**.
+4. 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.
+    { .tip }
+
+5. 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).
+
+{{< /tab >}}
+
+{{< /tabs >}}
+
+## Next steps
+
+- [Manage organizations](./organizations.md)
+- [Manage company users](./users.md)
+- [Manage company owners](./owners.md)

content/admin/company/organizations.md

@@ -1,14 +1,48 @@
 ---
-description: Manage organizations for a company in Docker Admin.
+description: Learn how to manage organization in a company.
 keywords: company, multiple organizations, manage organizations
 title: Manage organizations
 ---
 
+You can manage the organizations in a company in Docker Hub and the Docker Admin Console. In Docker Hub, you can manage seats and members at the organization-level. When you use the Admin Console, you can do more to manage organizations at the company-level.
+
+{{< tabs >}}
+{{< tab name="Docker Hub" >}}
+
+## View all organizations
+
+1. In Docker Hub, select **Organizations**.
+2. Select your company.
+3. From the company page, you can view all organizations in the **Overview** tab.
+
+## Add organizations to a company
+
+>**Important**
+>
+> You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add.
+{ .important }
+
+There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.
+
+>**Important**
+>
+> Once you add an organization to a company, you can't remove it from the company.
+{ .important }
+
+1. In Docker Hub, select **Organizations**.
+2. Select your company.
+3. From the company page, select **Add organization**.
+4. Choose the organization you want to add from the drop-down menu.
+5. Select **Add organization** to confirm.
+
+{{< /tab >}}
+{{< tab name="Admin Console" >}}
+
 {{< include "admin-early-access.md" >}}
 
 ## View all organizations
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.
 3. Under **Organizations**, select **Overview**.
 
@@ -16,17 +50,26 @@ title: Manage organizations
 
 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 [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.
 3. Under **Organizations**, select **Overview**.
 4. Select the action icon in the organization's card, and then select **Get more seats**.
 
-
 ## Add organizations to a company
 
+>**Important**
+>
+> You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add.
+{ .important }
+
 There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+>**Important**
+>
+> Once you add an organization to a company, you can't remove it from the company.
+{ .important }
+
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.
 3. Select **Add organization**.
 4. Choose the organization you want to add from the drop-down menu.
@@ -34,8 +77,11 @@ There is no limit to the number of organizations you can have under a company la
 
 ## Manage an organization
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.
 3. Select the organization that you want to manage.
 
-For more details about managing an organization, see [Organization administration](../organization/index.md).
+For more details about managing an organization, see [Organization administration](../organization/index.md).
+{{< /tab >}}
+
+{{< /tabs >}}

content/admin/company/owners.md

@@ -2,15 +2,39 @@
 description: Learn about company owners.
 keywords: company, owners
 title: Manage company owners
+aliases:
+- /docker-hub/company-owner/
 ---
 
-{{< include "admin-early-access.md" >}}
-
 As a company owner, you can configure [Single Sign-on (SSO)](../../security/for-admins/single-sign-on/_index.md) and [System for Cross-domain Identity Management (SCIM)](../../security/for-admins/scim.md) for all organizations under the company.
 
+{{< tabs >}}
+{{< tab name="Docker Hub" >}}
+
 ## Add a company owner
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to [Docker Hub](https://hub.docker.com/), navigate to the **Organizations** page, and select your company.
+2. In the **Overview** tab, select **Add owner** and enter their Docker ID or email address.
+3. Once you've selected **Add Owner**, you can view the user in the **Company Owners** table.
+
+    ![company-overview](../images/company-overview.png)
+
+## Remove a company owner
+
+1. Sign in to [Docker Hub](https://hub.docker.com/), navigate to the **Organizations** page, and select your company.
+2. In the **Overview** tab, find the **Company Owner** you want to remove.
+3. Select the **Action** icon and remove the owner.
+
+    ![remove-owner](../images/remove-owner.png)
+
+{{< /tab >}}
+{{< tab name="Admin Console" >}}
+
+{{< include "admin-early-access.md" >}}
+
+## 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.
 3. Select **Company Owners**.
 4. Select **Add Owner**.
@@ -19,8 +43,11 @@ As a company owner, you can configure [Single Sign-on (SSO)](../../security/for-
 
 ## Remove a company owner
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.
 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**.
+5. Select **Remove as Company Owner**.
+
+{{< /tab >}}
+{{< /tabs >}}

content/admin/company/users.md

@@ -1,13 +1,15 @@
 ---
-description: Manage company users
+description: Learn how to manage company users in the Docker Admin Console.
-keywords: company, company users, users, admin, docker admin
+keywords: company, company users, users, admin, Admin Console
 title: Manage company users
 ---
 
 {{< include "admin-early-access.md" >}}
 
+You can manage users at the company-level in the Docker Admin Console.
+
 {{% admin-users product="admin" layer="company" %}}
 
 ## Manage members on a team
 
-Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members in Docker Hub](../../docker-hub/members.md).
+Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members in Docker Hub](#).

content/admin/convert-account.md

@@ -2,6 +2,8 @@
 description: Convert your Docker Hub user account into an organization
 title: Convert an account into an organization
 keywords: docker hub, hub, organization
+aliases:
+- /docker-hub/convert-account/
 ---
 
 You can convert an existing user account to an organization. This is useful if you need multiple users to access your account and the repositories that it’s connected to. Converting it to an organization gives you better control over permissions for these users through [teams](manage-a-team.md) and [roles](roles-and-permissions.md).

content/admin/deactivate-account.md

@@ -2,6 +2,8 @@
 title: Deactivating an account or an organization
 description: Learn how to deactivate a Docker Hub account or an organization
 keywords: Docker Hub, delete, deactivate, account, organization
+aliases:
+- /docker-hub/deactivate-account/
 ---
 
 You can deactivate an account at any time. 

content/admin/organization/_index.md

@@ -35,16 +35,14 @@ grid:
   icon: domain_verification
 - title: FAQs
   description: Explore common organization FAQs.
-  link: /docker-hub/organization-faqs/
+  link: /faq/admin/organization-faqs/
   icon: help
 ---
 
-{{< include "admin-early-access.md" >}}
-
 {{< include "admin-org-overview.md" >}}
 
-To create an organization, see [Create your organization](../../docker-hub/orgs.md).
+To create an organization, see [Create your organization](../organization/orgs.md).
 
-Learn how to administer an organization using Docker Admin in the following sections.
+Learn how to administer an organization in the following sections.
 
 {{< grid >}}

content/admin/organization/activity-logs.md

@@ -2,8 +2,36 @@
 description: Learn about activity logs.
 keywords: team, organization, activity, log, audit, activities
 title: Activity logs
+aliases:
+- /docker-hub/audit-log/
 ---
 
+Activity logs display a chronological list of activities that occur at organization and repository levels. It provides a report to owners on all their member activities.
+
+With activity logs, owners can view and track:
+ - What changes were made
+ - The date when a change was made
+ - Who initiated the change
+
+For example, activity logs display activities such as the date when a repository was created or deleted, the member who created the repository, the name of the repository, and when there was a change to the privacy settings.
+
+Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team plan.
+
+> **Note**
+>
+> Activity logs requires a [Docker Team or Business subscription](../../subscription/_index.md).
+
+{{< tabs >}}
+{{< tab name="Docker Hub" >}}
+
+{{% admin-org-audit-log product="hub" %}}
+
+{{< /tab >}}
+{{< tab name="Admin Console" >}}
+
 {{< include "admin-early-access.md" >}}
 
-{{% admin-org-audit-log product="admin" %}}
+{{% admin-org-audit-log product="admin" %}}
+
+{{< /tab >}}
+{{< /tabs >}}

content/admin/organization/general-settings.md

@@ -1,11 +1,13 @@
 ---
-description: Learn how about general settings for organizations.
+description: Learn how to manage general settings for organizations.
-keywords: organization, settings
+keywords: organization, settings, Admin Console
 title: General organization settings
 ---
 
 {{< include "admin-early-access.md" >}}
 
+This section describes how to manage general settings in the Docker Admin Console.
+
 ## Configure general information
 
 General organization information appears on your organization landing page in Docker Hub.
@@ -19,7 +21,7 @@ This information includes:
 
 To edit this information:
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your organization in the drop-down menu.
 3. Under **Organization Settings**, select **General**.
 4. Specify the organization information and select **Save**.
@@ -28,7 +30,7 @@ To edit this information:
 
 To create a new company:
 
-1. Sign in to [Docker Admin](https://admin.docker.com).
+1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your organization in the drop-down menu.
 3. Under **Organization Settings**, select **General**.
 4. In the **Organization management** section, select **Create a company**.

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

@@ -1,10 +1,14 @@
 ---
-description: Docker Hub Teams & Organizations
+description: Learn how to create and manage teams for your organization
 keywords: Docker, docker, registry, teams, organizations, plans, Dockerfile, Docker
-  Hub, docs, documentation
+  Hub, docs, documentation, repository permissions
 title: Create and manage a team
+aliases:
+- /docker-hub/manage-a-team/
 ---
 
+You can manage teams for your organization in Docker Hub.
+
 A team is a group of Docker users that belong to an organization. An
 organization can have multiple teams. An
 organization owner can then create new teams and add members to an existing team
@@ -26,7 +30,7 @@ An organization owner is an administrator who is responsible to manage
 repositories and add team members to the organization. They have full access to
 private repositories, all teams, billing information, and org settings. An org
 owner can also specify [permissions](#permissions-reference) for each team in
-the organization. Only an org owner can enable [SSO](../security/for-admins/single-sign-on/index.md)
+the organization. Only an org owner can enable [SSO](../../security/for-admins/single-sign-on/_index.md)
 for
 the organization. When SSO is enabled for your organization, the org owner can
 also manage users. Docker can auto-provision Docker IDs for new end-users or
@@ -51,9 +55,9 @@ To give a team access to a repository
 4. Choose a permission from the **Permissions** drop-down list and select
    **Add**.
 
-    ![Team Repo Permissions](images/team-repo-permission.png)
+    ![Team Repo Permissions](../images/team-repo-permission.png)
 
-Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](/security/for-admins/roles-and-permissions/) for more about the editor role.
+Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](../../security/for-admins/roles-and-permissions.md) for more about the editor role.
 
 ### Permissions reference
 

content/admin/organization/members.md

@@ -1,13 +1,55 @@
 ---
-description: Manage organization members
+description: Learn how to manage organization members in Docker Hub and Docker Admin Console.
-keywords: members, teams, organizations
+keywords: members, teams, organizations, invite members, manage team members
 title: Manage organization members
+aliases:
+- /docker-hub/members/
 ---
 
+Learn how to manage members for your organization in Docker Hub and the Docker Admin Console.
+
+{{< tabs >}}
+{{< tab name="Docker Hub" >}}
+
+{{% admin-users product="hub" %}}
+
+{{< /tab >}}
+{{< tab name="Admin Console" >}}
+
 {{< include "admin-early-access.md" >}}
 
 {{% admin-users product="admin" %}}
 
+{{< /tab >}}
+{{< /tabs >}}
+
 ## Manage members on a team
 
-Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members in Docker Hub](../../docker-hub/members.md).
+Use Docker Hub to add a member to a team or remove a member from a team.
+
+### Add a member to a team
+
+Organization owners can add a member to one or more teams within an organization.
+
+To add a member to a team:
+
+1. Sign in to [Docker Hub](https://hub.docker.com).
+2. Select **Organizations**, your organization, and then **Members**.
+3. Select the **Action** icon, and then select **Add to team**.
+
+   > **Note**
+   >
+   > You can also navigate to **Organizations** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email.
+4. Select the team and then select **Add**.
+
+   > **Note**
+   >
+   > The invitee must first accept the invitation to join the organization before being added to the team.
+### Remove a member from a team
+
+To remove a member from a specific team:
+
+1. Sign in to [Docker Hub](https://hub.docker.com).
+2. Select **Organizations**, 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.

content/admin/organization/onboard.md

@@ -4,8 +4,14 @@ keywords: business, team, organizations, get started, onboarding
 title: Onboard your organization
 toc_min: 1
 toc_max: 2
+aliases:
+- /docker-hub/onboard/
+- /docker-hub/onboard-team/
+- /docker-hub/onboard-business/
 ---
 
 {{< include "admin-early-access.md" >}}
 
-{{% admin-org-onboarding product="admin" %}}
+Learn how to onboard your organization using Docker Hub or the Docker Admin Console.
+
+{{% admin-org-onboarding %}}

content/admin/organization/orgs.md

@@ -1,13 +1,17 @@
 ---
-description: Docker Hub Teams & Organizations
+description: Learn how to create an organization.
 keywords: Docker, docker, registry, teams, organizations, plans, Dockerfile, Docker
   Hub, docs, documentation
 title: Create your organization
 aliases:
 - /docker-cloud/orgs/
+- /docker-hub/orgs/
 ---
 
-{{< include "admin-org-overview.md" >}}
+This section describes how to create an organization. Before you begin:
+
+- You need a [Docker ID](../../docker-id/_index.md).
+- Review the [Docker subscriptions and features](../../subscription/details.md) to determine what plan to choose for your organization.
 
 ## Create an organization
 
@@ -16,11 +20,11 @@ organization using the **Create Organization** option in Docker Hub, or you can
 convert an existing user account to an organization. The following section
 contains instructions on how to create a new organization. For prerequisites and
 detailed instructions on converting an existing user account to an organization, see
-[Convert an account into an organization](convert-account.md).
+[Convert an account into an organization](../convert-account.md).
 
 To create an organization:
 
-1. Sign in to [Docker Hub](https://hub.docker.com/) using your [Docker ID](../docker-id/index.md), your email address, or your social provider.
+1. Sign in to [Docker Hub](https://hub.docker.com/) using your [Docker ID](../../docker-id/_index.md), your email address, or your social provider.
 2. Select **Organizations** and then **Create Organization** to create a new
    organization.
 3. Choose a plan for your organization and select **Buy Now**. See
@@ -38,7 +42,7 @@ organization after you've created it.
 
    > **Note**
    >
-   > You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](convert-account.md).
+   > You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](../convert-account.md).
 
 5. Enter the name of your company. This is the full name of your company. Docker
 displays the company name on your organization page and in the details of any
@@ -68,7 +72,7 @@ To view an organization:
       >
       > You can't _directly_ log in to an organization. This is especially
       > important to note if you create an organization by
-      [converting a user account](convert-account.md), as conversion means you lose the ability to log into that
+      [converting a user account](../convert-account.md), as conversion means you lose the ability to log into that
       > "account", since it no longer exists. To view the organization you 
       > need to log in with the new owner account assigned during the
       > conversion or another account that was added as a member. If you 
@@ -83,29 +87,28 @@ The organization landing page displays various options that allow you to
 configure your organization.
 
 - **Members**: Displays a list of team members. You
-  can invite new members using the **Invite members** button. See [Manage members](../docker-hub/members.md) for details.
+  can invite new members using the **Invite members** button. See [Manage members](./members.md) for details.
 
 - **Teams**: Displays a list of existing teams and the number of
-  members in each team. See [Create a team](manage-a-team.md) for details.
+  members in each team. See [Create a team](./manage-a-team.md) for details.
 
 - **Repositories**: Displays a list of repositories associated with the
-  organization. See [Repositories](../docker-hub/repos/index.md) for detailed information about
+  organization. See [Repositories](../../docker-hub/repos/index.md) for detailed information about
   working with repositories.
 
 - **Activity** Displays the audit logs, a chronological list of activities that
   occur at organization and repository levels. It provides the org owners a
-  report of all their team member activities. See [Audit logs](audit-log.md) for
+  report of all their team member activities. See [Audit logs](./activity-logs.md) for
   details.
 
 - **Settings**: Displays information about your
   organization, and allows you to view and change your repository privacy
   settings, configure org permissions such as
-  [Image Access Management](image-access-management.md), configure notification settings, and [deactivate](deactivate-account.md#deactivate-an-organization) your
+  [Image Access Management](../../security/for-admins/image-access-management.md), configure notification settings, and [deactivate](../deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the
-  organization. You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the
    organization's **Settings** page.
 
 - **Billing**: Displays information about your existing
-[Docker subscription (plan)](../subscription/index.md), including the number of seats and next payment due date. For how to access the billing history and payment methods for your organization, see [View billing history](../billing/history.md).
+[Docker subscription (plan)](../../subscription/_index.md), including the number of seats and next payment due date. For how to access the billing history and payment methods for your organization, see [View billing history](../../billing/history.md).
 
 ## Videos
 

content/config/daemon/prometheus.md

@@ -102,7 +102,7 @@ Next, start a Prometheus container using this configuration.
 $ docker run --name my-prometheus \
     --mount type=bind,source=/tmp/prometheus.yml,destination=/etc/prometheus/prometheus.yml \
     -p 9090:9090 \
-    --add-host host.docker.internal:host-gateway \
+    --add-host host.docker.internal=host-gateway \
     prom/prometheus
 ```
 

content/desktop/extensions/settings-feedback.md

@@ -17,7 +17,7 @@ Docker Extensions is switched on by default. To change your settings:
 
 >**Note**
 >
-> If you are an [organization owner](../../docker-hub/manage-a-team.md#organization-owner), you can turn off extensions for your users. Navigate to the `settings.json` file, and set `"extensionsEnabled"` to `false`. 
+> If you are an [organization owner](../../admin/organization/manage-a-team.md#organization-owner), you can turn off extensions for your users. Open the `settings.json` file, and set `"extensionsEnabled"` to `false`. 
 > The `settings.json` file is located at:
 >   - `~/Library/Group Containers/group.com.docker/settings.json` on Mac
 >   - `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings.json` on Windows

content/desktop/previous-versions/edge-releases-mac.md

@@ -1125,7 +1125,7 @@ TCP connection is idle for more than five minutes (related to
 
 - Add daemon options validation
 - Diagnose can be cancelled & Improved help information. Fixes [docker/for-mac#1134](https://github.com/docker/for-mac/issues/1134), [docker/for-mac#1474](https://github.com/docker/for-mac/issues/1474)
-- Support paging of Docker Cloud [repositories](../../docker-hub/repos/index.md) and [organizations](../../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
+- Support paging of Docker Cloud [repositories](../../docker-hub/repos/index.md) and [organizations](../../admin/organization/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
 
 ### Docker Community Edition 17.06.1-ce-mac20, 2017-07-18
 

content/docker-hub/_index.md

@@ -27,7 +27,7 @@ Docker Hub is a service provided by Docker for finding and sharing container ima
 
 It's the world’s largest repository of container images with an array of content sources including container community developers, open source projects, and independent software vendors (ISV) building and distributing their code in containers.
 
-Docker Hub is also where you can go to [change your Docker account settings and carry out administrative tasks](admin-overview.md).
+Docker Hub is also where you can go to [change your Docker account settings and carry out administrative tasks](/admin/). If you have a Docker Team or Business subscription, you can also carry out administrative tasks in the [Docker Admin Console](https://admin.docker.com).
 
 {{< tabs >}}
 {{< tab name="What key features are included in Docker Hub?" >}}
@@ -41,7 +41,7 @@ GitHub and Bitbucket and push them to Docker Hub.
 {{< /tab >}}
 {{< tab name="What administrative tasks can I perform in Docker Hub?" >}}
 * [Create and manage teams and organizations](orgs.md)
-* [Create a company](creating-companies.md)
+* [Create a company](../admin/company/new-company.md)
 * [Enforce sign in](configure-sign-in.md)
 * Set up [SSO](../security/for-admins/single-sign-on/index.md) and [SCIM](../security/for-admins/scim.md)
 * Use [Group mapping](group-mapping.md)

content/docker-hub/admin-overview.md

@@ -1,22 +0,0 @@
----
-title: Administration
-description: landing page for administration topic
-keywords: administration, docker hub, admin
-grid:
-- title: Create your organization
-  icon: add_business
-  description: Explore and set up an organization in Docker Hub.
-  link: /docker-hub/orgs/
-- title: Onboard your organization
-  icon: explore
-  link: /docker-hub/onboard/
-  description: Learn how to onboard users to your organization.
-- title: Enable Single Sign-On
-  description: Understand and use Single Sign-On.
-  link: /security/for-admins/single-sign-on/
-  icon: key
----
-
-Sign in to Docker Hub to change account settings and carry out administrative related tasks. 
-
-{{< grid >}}

content/docker-hub/api/latest.yaml

@@ -83,7 +83,7 @@ tags:
       The Audit Logs API endpoints allow you to query audit log events across a
       namespace.
 
-      For more information, see [Audit Log](https://docs.docker.com/docker-hub/audit-log/).
+      For more information, see [Audit Log](https://docs.docker.com/admin/organization/activity-logs/).
   - name: org-settings
     x-displayName: Org Settings
     description: |

content/docker-hub/audit-log.md

@@ -1,11 +0,0 @@
----
-description: Audit logs
-keywords: Team, organization, activity, log, audit, activities
-title: Audit logs
----
-
-> **Note**
->
-> Audit logs requires a [Docker Team or Business subscription](../subscription/index.md).
-
-{{% admin-org-audit-log product="hub" %}}

content/docker-hub/company-owner.md

@@ -1,23 +0,0 @@
----
-description: company owners
-keywords: company, owners
-title: Manage company owners
----
-
-As a company owner, you can configure [Single Sign-on (SSO)](../security/for-admins/single-sign-on/configure/index.md) and [System for Cross-domain Identity Management (SCIM)](../security/for-admins/scim.md) for all organizations under the company. This is only visible if your organization has a Docker Business subscription. If you want to upgrade your subscription to include the organization under the company, see [upgrade your subscription](../subscription/upgrade.md).
-
-## Add a company owner
-
-1. Sign in to [Docker Hub](https://hub.docker.com/), navigate to the **Organizations** page, and select your company.
-2. In the **Overview** tab, select **Add owner** and enter their Docker ID or email address.
-3. Once you've selected **Add Owner**, you can view the user in the **Company Owners** table.
-
-    ![company-overview](images/company-overview.png)
-
-## Remove a company owner
-
-1. Sign in to [Docker Hub](https://hub.docker.com/), navigate to the **Organizations** page, and select your company.
-2. In the **Overview** tab, find the **Company Owner** you want to remove.
-3. Select the **Action** icon and remove the owner.
-
-    ![remove-owner](images/remove-owner.png)

content/docker-hub/creating-companies.md

@@ -1,22 +0,0 @@
----
-description: manage companies
-keywords: company, multiple organizations, manage companies
-title: Overview
-grid:
-- title: Create a company
-  description: Learn how to create a new company layer and add existing organizations.
-  link: /docker-hub/new-company/
-  icon: note_add
-- title: Manage company owners
-  description: Find out more about company owners and how to manage them.
-  link: /docker-hub/company-owner/
-  icon: group_add
-- title: FAQs
-  description: Explore common company FAQs.
-  link: /docker-hub/company-faqs/
-  icon: help
----
-
-{{< include "admin-company-overview.md" >}}
-
-{{< grid >}}

content/docker-hub/members.md

@@ -1,38 +0,0 @@
----
-description: Manage organization members
-keywords: members, teams, organizations
-title: Manage members
----
-
-This section describes how to manage members in your [teams and organizations](../docker-hub/orgs.md).
-
-{{% admin-users product="hub" %}}
-
-## Add a member to a team
-
-Organization owners can add a member to one or more teams within an organization.
-
-To add a member to a team:
-
-1. Sign in to [Docker Hub](https://hub.docker.com).
-2. Select **Organizations**, your organization, and then **Members**.
-3. Select the **Action** icon, and then select **Add to team**.
-
-    > **Note**
-    >
-    > You can also navigate to **Organizations** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email.
-
-4. Select the team and then select **Add**.
-
-    > **Note**
-    >
-    > The invitee must first accept the invitation to join the organization before being added to the team.
-
-## Remove a member from a team
-
-To remove a member from a specific team:
-
-1. Sign in to [Docker Hub](https://hub.docker.com).
-2. Select **Organizations**, 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.

content/docker-hub/new-company.md

@@ -1,41 +0,0 @@
----
-title: Create a company
-description: Learn how to create a company.
-keywords: company, hub, organization, company owner
----
-
-## Create a company
-
-To create a new company:
-
-1. In Docker Hub, navigate to the organization you want to place under a company. The organization must have a Business subscription, and you must be an owner of the organization.
-2. Select **Settings**.
-3. Near the bottom of the **General** tab, select **Create a company**.
-4. 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.
-    { .tip }
-
-5. Review the company migration details and then select **Create company**.
-
-## Add organizations to a company
-
->**Important**
->
-> You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you wish to add.
-{ .important }
-
-There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.
-
->**Important**
->
-> Once you add an organization to a company, you can't remove it from the company.
-{ .important }
-
-1. In Docker Hub, select **Organizations**.
-2. Select your company.
-3. From the company page, select **Add organization**.
-4. Choose the organization you want to add from the drop-down menu.
-5. Select **Add organization** to confirm.

content/docker-hub/release-notes.md

@@ -62,7 +62,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/pro
 
 ### Bug fixes and enhancements
 
-- You can now [export a CSV file of members](../docker-hub/members.md/#export-members) from organizations that you own.
+- You can now [export a CSV file of members](../admin/organization//members.md/#export-members) from organizations that you own.
 
 ## 2022-07-22
 
@@ -155,7 +155,7 @@ Docker introduces the Advanced Image Management dashboard that enables you to vi
 
 Docker introduces Audit logs, a new feature that allows team owners to view a list of activities that occur at organization and repository levels. This feature begins tracking the activities from the release date, that is, **from 25 January 2021**.
 
-For more information about this feature and for instructions on how to use it, see [Audit logs](audit-log.md).
+For more information about this feature and for instructions on how to use it, see [Activity logs](../admin/organization/activity-logs.md).
 
 ## 2020-11-10
 

content/docker-hub/repos/access.md

@@ -22,7 +22,7 @@ repository from that repository's **Settings** page.
 
 You can also assign more granular collaborator rights ("Read", "Write", or
 "Admin") on Docker Hub by using organizations and teams. For more information
-see the [organizations documentation](../../../docker-hub/orgs.md#create-an-organization).
+see the [organizations documentation](../../admin/organization/orgs.md#create-an-organization).
 
 ## View repository tags
 

content/docker-hub/repos/create.md

@@ -22,7 +22,7 @@ A single Docker Hub repository can hold many Docker images which are stored as *
 When creating a new repository:
 
 - You can choose to locate it under your own user account, or under any
-  [organization](../../docker-hub/orgs.md) where you are an [owner](../manage-a-team.md#organization-owner).
+  [organization](../../admin/organization//orgs.md) where you are an [owner](../../admin/organization//manage-a-team.md#organization-owner).
 - The repository name needs to:
     - Be unique
     - Have between 2 and 255 characters

content/faq/_index.md

@@ -9,9 +9,9 @@ grid:
 - title: Billing
   icon: credit_score
   link: /billing/faqs/
-- title: Docker Hub
+- title: Docker account
   icon: lan
-  link: /docker-hub/general-faqs/
+  link: /faq/admin/general-faqs/
 - title: Enforcing Single Sign-On
   icon: key
   link: /single-sign-on/enforcement-faqs/

content/faq/admin/company-faqs.md

@@ -2,6 +2,8 @@
 description: Company FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management
 title: FAQs on companies
+aliases:
+- /docker-hub/company-faqs/
 ---
 
 ### Are existing subscriptions affected when you create a company and add organizations to it?
@@ -26,7 +28,7 @@ You can add a maximum of 10 company owners to a single company account.
 
 ### What permissions does the company owner have in the associated/nested organizations?
 
-Company owners can navigate to the **Organizations** page to view all their nested organizations in a single location. They can also view or edit organization members and change SSO and SCIM settings. Changes to company settings impact all users in each organization under the company. See [Roles and permissions](../security/for-admins/roles-and-permissions.md).
+Company owners can navigate to the **Organizations** page to view all their nested organizations in a single location. They can also view or edit organization members and change SSO and SCIM settings. Changes to company settings impact all users in each organization under the company. See [Roles and permissions](../../security/for-admins/roles-and-permissions.md).
 
 ### What features are supported at the company level?
 
@@ -37,7 +39,7 @@ You can manage domain verification, Single Sign-on, and System for Cross-domain
 - 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 Docker Admin.
+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).
 
 Domain audit isn't supported for companies or organizations within a company.
 
@@ -47,15 +49,15 @@ A company name must be unique to that of its child organization. If a child orga
 
 ### How does a company owner add an organization to the company?
 
-You can add organizations to a company in [Docker Admin](../admin/company/organizations.md/#add-organizations-to-a-company.md) or [Docker Hub](./new-company.md/#add-organizations-to-a-company.md).
+You can add organizations to a company in the [Admin Console](../../admin/company/organizations.md/#add-organizations-to-a-company.md) or [Docker Hub](../../admin/company/new-company.md/#add-organizations-to-a-company.md).
 
 ### How does a company owner manage SSO/SCIM settings from a company?
 
-See your [SCIM](scim.md) and [SSO](../security/for-admins/single-sign-on/configure/index.md) settings.
+See your [SCIM](scim.md) and [SSO](../../security/for-admins/single-sign-on/configure/index.md) settings.
 
 ### How does a company owner enable group mapping in an IdP?
 
-See [SCIM](scim.md) and [Group mapping](../security/for-admins/group-mapping.md) for more information.
+See [SCIM](scim.md) and [Group mapping](../../security/for-admins/group-mapping.md) for more information.
 
 ### What's the definition of a company vs an organization?
 

content/faq/admin/general-faqs.md

@@ -4,6 +4,8 @@ description: Frequently asked Docker account and administration questions
 keywords: onboarding, docker, teams, orgs, user accounts, organization accounts
 redirect:
 - /docker-hub/onboarding-faqs/
+aliases:
+- /docker-hub/general-faqs/
 ---
 
 ### What is a Docker ID?
@@ -11,7 +13,7 @@ redirect:
 A Docker ID is a username for your Docker account that lets you access Docker products. All you need is an email address to create a Docker ID, or you can sign up with your Google or GitHub account. Your Docker ID must be between 4 and 30 characters long, and can only contain
 numbers and lowercase letters. You can't use any special characters or spaces.
 
-For more information, see [Docker ID](../docker-id/index.md). If your administrator enforces [Single sign-on (SSO)](../security/for-admins/single-sign-on/index.md), this provisions a Docker ID for new users.
+For more information, see [Docker ID](../../docker-id/index.md). If your administrator enforces [Single sign-on (SSO)](../../security/for-admins/single-sign-on/index.md), this provisions a Docker ID for new users.
 
 Developers may have multiple Docker IDs in order to separate their Docker IDs associated with an organization with a Docker Business or Team subscription, and their personal use Docker IDs.
 
@@ -37,7 +39,7 @@ A team is a group of Docker users that belong to an organization. An organizatio
 
 ### What's a company?
 
-A company is a management layer that centralizes administration of multiple organizations. Administrators can add organizations with a Docker Business subscription to a company and configure settings for all organizations under the company. See [Set up your company](creating-companies.md).
+A company is a management layer that centralizes administration of multiple organizations. Administrators can add organizations with a Docker Business subscription to a company and configure settings for all organizations under the company. See [Set up your company](/admin/company/).
 
 ### Who is an organization owner?
 
@@ -57,14 +59,14 @@ The organization owner can also add additional owners to help them manage users,
 ### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?
 
 Docker SSO allows only one IdP configuration per organization. For more
-information, see [Configure SSO](../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../faq/security/single-sign-on/faqs.md).
+information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../security/single-sign-on/faqs.md).
 
 ### What is a service account?
 
-A [service account](../docker-hub/service-accounts.md) is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the Team or Business plan. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
+A [service account](../../docker-hub/service-accounts.md) is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the Team or Business plan. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
 
 ### Can I delete or deactivate a Docker account for another user?
 
-Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../docker-hub/deactivate-account.md/).
+Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/deactivate-account.md).
 
-If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](/docker-hub/members/#remove-a-member-or-invitee).
+If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team).

content/faq/admin/organization-faqs.md

@@ -2,6 +2,8 @@
 description: Organization FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration
 title: FAQs on organizations
+aliases:
+- /docker-hub/organization-faqs/
 ---
 
 ### What if the Docker ID I want for my organization or company is taken?
@@ -14,11 +16,11 @@ You can create multiple organizations or multiple teams under a single company.
 
 ### How do I add an organization owner?
 
-An existing owner can add additional team members as organization owners. You can invite a member and assign them the owner role in [Docker Hub](members.md#invite-members) or [Docker Admin](../admin/organization/members.md#invite-members).
+An existing owner can add additional team members as organization owners. You can [invite a member](../../admin/organization/members.md#invite-members) and assign them the owner role in Docker Hub or the Docker Admin Console.
 
 ### How do I know how many active users are part of my organization?
 
-If your organization uses a Software Asset Management tool, you can use it to find out how many users have Docker Desktop installed. If your organization doesn't use this software, you can run an internal survey to find out who is using Docker Desktop. See [Identify your Docker users and their Docker accounts](../docker-hub/onboard.md#step-1-identify-your-docker-users-and-their-docker-accounts). With a Docker Business subscription, you can manage members in your identity provider and automatically provision them to your Docker organization with [SSO](../security/for-admins/single-sign-on/_index.md) or [SCIM](../security/for-admins/scim.md).
+If your organization uses a Software Asset Management tool, you can use it to find out how many users have Docker Desktop installed. If your organization doesn't use this software, you can run an internal survey to find out who is using Docker Desktop. See [Identify your Docker users and their Docker accounts](../../admin/organization/onboard.md#step-1-identify-your-docker-users-and-their-docker-accounts). With a Docker Business subscription, you can manage members in your identity provider and automatically provision them to your Docker organization with [SSO](../../security/for-admins/single-sign-on/_index.md) or [SCIM](../../security/for-admins/scim.md).
 
 ### Do users first need to authenticate with Docker before an owner can add them to an organization?
 
@@ -26,9 +28,9 @@ No. Organization owners can invite users through email and also choose a team fo
 
 ### Can I force my organization's members to authenticate before using Docker Desktop and are there any benefits?
 
-Yes. You can [enforce sign-in](../security/for-admins/configure-sign-in.md) and some benefits are:
+Yes. You can [enforce sign-in](../../security/for-admins/configure-sign-in.md) and some benefits are:
 
-- Administrators can enforce features like [Image Access Management](../security/for-admins/image-access-management.md) and [Registry Access Management](../security/for-admins/registry-access-management.md).
+- Administrators can enforce features like [Image Access Management](../../security/for-admins/image-access-management.md) and [Registry Access Management](../../security/for-admins/registry-access-management.md).
  - Administrators can ensure compliance by blocking Docker Desktop usage for users who don't sign in as members of the organization.
 
 ### If a user has their personal email associated with a user account in Docker Hub, do they have to convert to using the organization's domain before they can be invited to join an organization?
@@ -82,7 +84,7 @@ Yes. You can configure repository access on a per-team basis. For example, you
 can specify that all teams within an organization have **Read and Write** access
 to repositories A and B, whereas only specific teams have **Admin** access. Org
 owners have full administrative access to all repositories within the
-organization. See [Configure repository permissions for a team](manage-a-team.md#configure-repository-permissions-for-a-team). Administrators can also assign members the editor role, which grants administrative permissions for repositories across the namespace of the organization. See [Roles and permissions](../security/for-admins/roles-and-permissions.md).
+organization. See [Configure repository permissions for a team](manage-a-team.md#configure-repository-permissions-for-a-team). Administrators can also assign members the editor role, which grants administrative permissions for repositories across the namespace of the organization. See [Roles and permissions](../../security/for-admins/roles-and-permissions.md).
 
 ### Does my organization need to use Docker's registry?
 

content/faq/security/general.md

@@ -50,7 +50,7 @@ Docker provides various types of audit logs and log retention varies. For exampl
 
 ### Can I export a list of all users with their assigned roles and privileges and if so, in what format?
 
-Using the [Export Members](../../docker-hub/members.md) feature, you can export to CSV a list of your organization's users with role and team information. 
+Using the [Export Members](../../admin/organization/members.md#export-members) feature, you can export to CSV a list of your organization's users with role and team information. 
 
 ### How does Docker Desktop handle and store authentication information?
 

content/faq/security/single-sign-on/users-faqs.md

@@ -57,7 +57,7 @@ When SSO is enabled and enforced, your users just have to sign in using the emai
 
 ### Is Docker SSO fully synced with the IdP?
 
-Docker SSO provides Just-In-Time (JIT) provisioning by default. This provisioning only happens when a user signs in. If a user leaves the organization, administrators must sign in to Docker Hub and manually [remove the user](/docker-hub/members/#remove-a-member-or-invitee) from the organization. [SCIM](../../../security/for-admins/scim.md) is available to provide full synchronization with users and groups.
+Docker SSO provides Just-In-Time (JIT) provisioning by default. This provisioning only happens when a user signs in. If a user leaves the organization, administrators must sign in to Docker Hub and manually [remove the user](../../../admin/organization/members.md#remove-a-member-or-invitee) from the organization. [SCIM](../../../security/for-admins/scim.md) is available to provide full synchronization with users and groups.
 
 Additionally, you can use the [Docker Hub API](/docker-hub/api/latest/) to complete this process.
 

content/includes/admin-early-access.md

@@ -1,6 +1,6 @@
 > **Early Access**
 >
-> Docker Admin is an [early access](/release-lifecycle#early-access-ea) product.
+> The Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) product.
 >
-> It's currently available to all company owners and organization owners that have a Docker Business or Docker Team subscription. You can still manage companies and organizations in Docker Hub. For details about managing companies or organizations in Docker Hub, see [Administration](/docker-hub/admin-overview/).
+> It's available to all company owners and organization owners that have a Docker Business or Docker Team subscription. You can still manage companies and organizations in Docker Hub, but the Admin Console includes enhanced features for company-level management.
 { .restricted }

content/security/for-admins/configure-sign-in.md

@@ -43,7 +43,7 @@ following occurs:
 ## Create a registry.json file to enforce sign-in
 
 1. Ensure that the user is a member of your organization in Docker. For more
-details, see [Manage members](../../docker-hub/members.md).
+details, see [Manage members](/admin/organization/members/).
 
 2. Create the `registry.json` file.
 

content/security/for-admins/domain-audit.md

@@ -39,7 +39,7 @@ Before you audit your domains, review the following required prerequisites:
 {{% admin-domain-audit product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 

content/security/for-admins/image-access-management.md

@@ -28,7 +28,7 @@ You need to [configure a registry.json to enforce sign-in](configure-sign-in.md)
 {{% admin-image-access product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 

content/security/for-admins/registry-access-management.md

@@ -34,7 +34,7 @@ You need to [configure a registry.json to enforce sign-in](/docker-hub/configure
 {{% admin-registry-access product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 

content/security/for-admins/roles-and-permissions.md

@@ -2,7 +2,7 @@
 description: >
   Use roles in your organization to control who has access to content,
   registry, and organization management permissions.
-keywords: members, teams, organization, company, roles, access, docker hub, docker admin, security 
+keywords: members, teams, organization, company, roles, access, docker hub, admin console, security 
 title: Roles and permissions
 aliases:
 - /docker-hub/roles-and-permissions/
@@ -21,7 +21,7 @@ The following roles are available to assign:
 - **Organization owner** - Full organization administrative access. Organization owners can manage organization repositories, teams, members, settings, and billing.
 - **Company owner** - In addition to the permissions of an organization owner, company owners can configure settings for their associated organizations.
 
-Owners can manage roles for members of an organization on [Docker Hub](/docker-hub/members/#update-a-member-role), as well members of an [organization](/admin/organization/members/#update-a-member-role) or a [company](/admin/company/users/#update-a-member-role) on [Docker Admin](/admin/).
+Owners can manage roles for members of an organization on [Docker Hub](/admin/organization/members/#update-a-member-role), as well members of an [organization](/admin/organization/members/#update-a-member-role) or a [company](/admin/company/users/#update-a-member-role) in the [Docker Admin Console](/admin/).
 
 ## Permissions
 
@@ -50,7 +50,7 @@ Company owners have the same access as organization owners for all associated or
 | View teams                                            | ❌     | ✅     | ✅                 |
 | Assign team permissions to repositories               | ❌     | ✅     | ✅                 |
 
-When you add members to a team, you can manage their repository permissions. For team repository permissions, see [Create and manage a team permissions reference](/docker-hub/manage-a-team/#permissions-reference).
+When you add members to a team, you can manage their repository permissions. For team repository permissions, see [Create and manage a team permissions reference](/admin/organization/manage-a-team/#permissions-reference).
 
 See the following diagram for an example of how permissions may work for a user. In this example, the first permission check is for the role: member or editor. Editors have administrative permissions for repositories across the namespace of the organization. Members may have administrative permissions for a repository if they're a member of a team that grants those permissions.
 

content/security/for-admins/scim.md

@@ -44,7 +44,7 @@ You must make sure you have [configured SSO](single-sign-on/configure/_index.md)
 {{% admin-scim %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 

content/security/for-admins/single-sign-on/_index.md

@@ -1,6 +1,6 @@
 ---
 description: Overview of Single Sign-On
-keywords: Single Sign-On, SSO, sign-on, admin, docker hub, docker admin, security
+keywords: Single Sign-On, SSO, sign-on, admin, docker hub, admin console, security
 title: Single Sign-On overview
 aliases:
 - /single-sign-on/
@@ -22,7 +22,7 @@ The following diagram shows how SSO operates and is managed in Docker Hub and Do
 
 Before enabling SSO in Docker, administrators must first configure their IdP to work with Docker. Docker provides the Assertion Consumer Service (ACS) URL and the Entity ID. Administrators use this information to establish a connection between their IdP server and Docker Hub.
 
-After establishing the connection between the IdP server and Docker, administrators sign in to Docker Hub or Docker Admin and complete SSO enablement.
+After establishing the connection between the IdP server and Docker, administrators sign in to Docker Hub or the Docker Admin Console and complete SSO enablement.
 
 When you enable SSO for your company, a first-time user can sign in to Docker Hub using their company's domain email address. They're then added to your company, assigned to an organization, and optionally assigned to a team.
 

content/security/for-admins/single-sign-on/configure/_index.md

@@ -21,7 +21,7 @@ Follow the steps on this page to configure SSO for your organization or company.
 {{% admin-domains product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 
@@ -38,7 +38,7 @@ Follow the steps on this page to configure SSO for your organization or company.
 {{% admin-sso-config product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{% admin-sso-config product="admin" %}}
 

content/security/for-admins/single-sign-on/manage/_index.md

@@ -1,6 +1,6 @@
 ---
 description: Learn how to manage Single Sign-On for your organization or company.
-keywords: manage, single sign-on, SSO, sign-on, docker hub, docker admin, admin, security
+keywords: manage, single sign-on, SSO, sign-on, docker hub, admin console, admin, security
 title: Manage Single Sign-On
 aliases:
 - /admin/company/settings/sso-management/
@@ -11,7 +11,7 @@ aliases:
 
 > **Note**
 >
-> You must have a [company](/docker-hub/creating-companies/) to manage more than one organization.
+> You must have a [company](/admin/company/) to manage more than one organization.
 
 {{< tabs >}}
 {{< tab name="Docker Hub" >}}
@@ -19,7 +19,7 @@ aliases:
 {{% admin-sso-management-orgs product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 
@@ -36,7 +36,7 @@ aliases:
 {{% admin-sso-management product="hub" %}}
 
 {{< /tab >}}
-{{< tab name="Docker Admin" >}}
+{{< tab name="Admin Console" >}}
 
 {{< include "admin-early-access.md" >}}
 

content/subscription/add-seats.md

@@ -27,4 +27,4 @@ When you add seats to your subscription in the middle of your billing cycle, you
 5. Select **Purchase** to confirm. 
     The **Billing** tab displays the new number of seats. 
 
-6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../docker-hub/members.md#add-a-member-to-a-team).
+6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../admin/organization/members.md#add-a-member-to-a-team).

content/subscription/details.md

@@ -46,7 +46,7 @@ Docker Team includes:
 - Unlimited [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md)
 - 5000 image [pulls per day](../docker-hub/download-rate-limit.md) for each team member
 
-There are also advanced collaboration and management tools, including organization and team management with [Role Based Access Control (RBAC)](../security/for-admins/roles-and-permissions.md), [audit logs](../docker-hub/audit-log.md), and more.
+There are also advanced collaboration and management tools, including organization and team management with [Role Based Access Control (RBAC)](../security/for-admins/roles-and-permissions.md), [activity logs](../admin/organization/activity-logs.md), and more.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
@@ -59,7 +59,7 @@ Docker Business includes:
 - [Hardened Docker Desktop](../desktop/hardened-desktop/index.md) 
 - [Image Access Management](../security/for-admins/image-access-management.md) which lets admins control what content developers can access
 - [Registry Access Management](../security/for-admins/registry-access-management.md) which lets admins control what registries developers can access
-- [Company layer](../docker-hub/creating-companies.md) to manage multiple organizations and settings
+- [Company layer](../admin/company/_index.md) to manage multiple organizations and settings
 - [Single Sign-On](../security/for-admins/single-sign-on/index.md)
 - [System for Cross-domain Identity Management](../security/for-admins/scim.md) and more.
 

content/subscription/upgrade.md

@@ -13,7 +13,7 @@ When you upgrade to a paid subscription, you immediately have access to all the
 
 1. Sign in to your [Docker Hub](https://hub.docker.com) account.
 
-2. Optional: If you're upgrading from a free user account to a Team subscription and want to keep your account name, [convert your user account into an organization](../docker-hub/convert-account.md).
+2. Optional: If you're upgrading from a free user account to a Team subscription and want to keep your account name, [convert your user account into an organization](../admin/convert-account.md).
 
 3. Select your avatar in the top-right corner of Docker Hub.
 

content/support.md

@@ -98,7 +98,7 @@ For more information, see [Docker Data Processing Agreement](https://www.docker.
 Before seeking support, you can perform basic troubleshooting. See [Diagnose and troubleshooting](../desktop/troubleshoot/overview.md) for more information.
 
 You can also see if an answer already exists in the following FAQs:
-- [Docker Business or Team onboarding](../docker-hub/general-faqs.md)
+- [Docker Business or Team onboarding](faq/admin/general-faqs.md)
 - [Docker Desktop](../desktop/faqs/general.md)
 - [Docker Desktop for Linux](../desktop/faqs/linuxfaqs.md)
 - [Docker Desktop for Mac](../desktop/faqs/macfaqs.md)

content/trusted-content/insights-analytics.md

@@ -120,7 +120,7 @@ represents an image pull.
 
 [1]: #action-classification-rules
 [2]: /registry/spec/api/
-[3]: /docker-hub/orgs/
+[3]: /admin/organization/orgs/
 [4]: /docker-hub/repos/
 
 ### Summary data

data/toc.yaml

@@ -2053,59 +2053,41 @@ Manuals:
   - path: /docker-hub/release-notes/
     title: Release notes
 
-- sectiontitle: Docker Admin (Early Access)
+- sectiontitle: Administration
   section:
   - path: /admin/
     title: Overview
+  - sectiontitle: Organization administration
+    section:
+    - path: /admin/organization/
+      title: Overview
+    - path: /admin/organization/orgs/
+      title: Create your organization
+    - path: /admin/organization/onboard/
+      title: Onboard your organization
+    - path: /admin/organization/members/
+      title: Manage members
+    - path: /admin/organization/manage-a-team/
+      title: Create and manage a team
+    - path: /admin/organization/activity-logs/
+      title: Activity logs
+    - path: /admin/organization/general-settings/
+      title: General settings
   - sectiontitle: Company administration
     section:
     - path: /admin/company/
       title: Overview
+    - path: /admin/company/new-company/
+      title: Create a company
     - path: /admin/company/organizations/
       title: Manage organizations
     - path: /admin/company/users/
       title: Manage users
     - path: /admin/company/owners/
       title: Manage company owners
-
+  - path: /admin/convert-account/
-  - sectiontitle: Organization administration
-    section:
-    - path: /admin/organization/
-      title: Overview
-    - path: /admin/organization/onboard/
-      title: Onboard your organization
-    - path: /admin/organization/members/
-      title: Manage members
-    - path: /admin/organization/activity-logs/
-      title: Activity logs
-    - path: /admin/organization/general-settings/
-      title: General settings
-
-- sectiontitle: Administration 
-  section:
-  - path: /docker-hub/admin-overview/
-    title: Overview
-  - path: /docker-hub/orgs/
-    title: Create your organization
-  - path: /docker-hub/onboard/
-    title: Onboard your organization
-  - sectiontitle: Set up your company
-    section:
-    - path: /docker-hub/creating-companies/
-      title: Overview
-    - path: /docker-hub/new-company/
-      title: Create a company
-    - path:  /docker-hub/company-owner/
-      title: Manage company owners
-  - path: /docker-hub/convert-account/
     title: Convert an account into an organization
-  - path: /docker-hub/manage-a-team/
+  - path: /admin/deactivate-account/
-    title: Create and manage a team
-  - path: /docker-hub/members/
-    title: Manage members
-  - path: /docker-hub/audit-log/
-    title: Audit logs
-  - path: /docker-hub/deactivate-account/
     title: Deactivate an account or organization
 
 - sectiontitle: Security
@@ -2233,13 +2215,13 @@ FAQ:
       title: Linux
     - path: /desktop/faqs/releases/
       title: Releases
-  - sectiontitle: Docker Hub and admin
+  - sectiontitle: Docker account and admin
     section:
-    - path: /docker-hub/general-faqs/
+    - path: /faq/admin/general-faqs/
       title: General
-    - path: /docker-hub/organization-faqs/
+    - path: /faq/admin/organization-faqs/
       title: Organization
-    - path: /docker-hub/company-faqs/
+    - path: /faq/admin/company-faqs/
       title: Company
   - path: /subscription/faq/
     title: Subscription

layouts/shortcodes/admin-domain-audit.md

@@ -2,14 +2,12 @@
 {{ $domain_navigation := "Select **Organizations**, your organization, **Settings**, and then **Security**." }}
 {{ $sso_link := "[SSO](/security/for-admins/single-sign-on/)" }}
 {{ $scim_link := "[SCIM](/security/for-admins/scim/)" }}
-{{ $invite_link := "[Invite members](/docker-hub/members/)" }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $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**." }}
   {{ $sso_link = "[SSO](/security/for-admins/single-sign-on/)" }}
   {{ $scim_link = "[SCIM](/security/for-admins/scim/)" }}
-  {{ $invite_link = "[Invite members](/admin/organization/members/)" }}
 {{ end }}
 
 To audit your domains:
@@ -22,12 +20,12 @@ To audit your domains:
    - Username: The Docker ID of the user.
    - Email: The email address of the user.
 
-You can invite all the uncaptured users to your organization using the exported CSV file. For more details, see {{ $invite_link }}. Optionally, enforce single sign-on or enable SCIM to add users to your organization automatically. For more details, see {{ $sso_link }} or {{ $scim_link }}.
+You can invite all the uncaptured users to your organization using the exported CSV file. For more details, see [Invite members](/admin/organization/members/). Optionally, enforce single sign-on or enable SCIM to add users to your organization automatically. For more details, see {{ $sso_link }} or {{ $scim_link }}.
 
 > **Note**
 >
 > Domain audit may identify accounts of users who are no longer a part of your organization. If you don't want to add a user to your organization and you don't want the user to appear in future domain audits, you must deactivate the account or update the associated email address.
 >
-> Only someone with access to the Docker account can deactivate the account or update the associated email address. For more details, see [Deactivating an account](/docker-hub/deactivate-account/).
+> Only someone with access to the Docker account can deactivate the account or update the associated email address. For more details, see [Deactivating an account](/admin/deactivate-account/).
 >
 > If you don't have access to the account, you can contact [Docker support](/support/) to discover if more options are available.

layouts/shortcodes/admin-domains.html

@@ -5,7 +5,7 @@
    - Company: Select **Organizations**, your company, and then **Settings**.` }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
   {{ $domain_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **Domain management**." }}
 {{ end }}
 

layouts/shortcodes/admin-image-access.html

@@ -2,7 +2,7 @@
 {{ $iam_navigation := "Select **Organizations**, your organization, **Settings**, and then select **Image Access**." }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
   {{ $iam_navigation = "Select your organization in the left navigation drop-down menu, and then select **Image Access**." }}
 {{ end }}
 

layouts/shortcodes/admin-org-audit-log.html

@@ -1,24 +1,13 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
 {{ $audit_navigation := "Select **Organizations**, your organization, and then **Activity**." }}
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
   {{ $audit_navigation = "Select your organization in the left navigation drop-down menu, and then select **Activity Logs**." }}
 {{ end }}
 
-Audit logs display a chronological list of activities that occur at organization and repository levels. It provides a report to owners on all their member activities.
+## View the activity logs
 
-With audit logs, owners can view and track:
+To view the activity logs:
- - What changes were made
- - The date when a change was made
- - Who initiated the change
-
- For example, audit logs display activities such as the date when a repository was created or deleted, the member who created the repository, the name of the repository, and when there was a change to the privacy settings.
-
-Owners can also see the audit logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team plan.
-
-## View the audit logs
-
-To view the audit logs:
 
 1. Sign in to {{ $product_link }}.
 2. {{ $audit_navigation }}
@@ -27,13 +16,13 @@ To view the audit logs:
 >
 > Docker retains the activity data for a period of three months.
 
-## Customize the audit logs
+## Customize the activity logs
 
-By default, all activities that occur are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the audit logs of all the activities that occurred during that period are displayed.
+By default, all activities that occur are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the activity logs of all the activities that occurred during that period are displayed.
 
 > **Note**
 >
-> Activities created by the Docker Support team as part of resolving customer issues appear in the audit logs as **dockersupport**.
+> Activities created by the Docker Support team as part of resolving customer issues appear in the activity logs as **dockersupport**.
 
 Select the **All Activities** drop-down to view activities that are specific to an organization, repository, or billing. In Docker Hub, if you select the **Activities** tab from the **Repository** view, you can only filter repository-level activities.
 

layouts/shortcodes/admin-org-onboarding.md

@@ -1,12 +1,10 @@
 {{ $sso_link := "[Configure SSO](/security/for-admins/single-sign-on/)" }}
 {{ $scim_link := "[Configure SCIM](/security/for-admins/scim/)" }}
-{{ $members_link := "[Invite members](/docker-hub/members/)" }}
 {{ $audit_link := "[Audit your domains](/docker-hub/domain-audit/)" }}
 
 {{ if eq (.Get "product") "admin" }}
   {{ $sso_link = "[Configure SSO](/security/for-admins/single-sign-on/)" }}
   {{ $scim_link = "[Configure SCIM](/security/for-admins/scim/)" }}
-  {{ $members_link = "[Invite members](/admin/organization/members/)" }}
   {{ $audit_link = "[Audit your domains](/admin/organization/security-settings/domains/)" }}
 {{ end }}
 
@@ -19,9 +17,9 @@ Before you start to onboard your organization, ensure that you:
 
   > **Note**
   >
-  > When purchasing a subscription through [Pricing & Subscriptions](https://www.docker.com/pricing/), the on-screen instructions guide you through creating an organization. If you have purchased a subscription through Docker Sales and you have not yet created an organization, see [Create an organization](/docker-hub/orgs#create-an-organization).
+  > When purchasing a subscription through [Pricing & Subscriptions](https://www.docker.com/pricing/), the on-screen instructions guide you through creating an organization. If you have purchased a subscription through Docker Sales and you have not yet created an organization, see [Create an organization](/admin/organization/orgs).
 
-- Familiarize yourself with Docker concepts and terminology in the [glossary](/glossary/) and [FAQs](/docker-hub/general-faqs/).
+- Familiarize yourself with Docker concepts and terminology in the [glossary](/glossary/) and [FAQs](/faq/admin/general-faqs/).
 
 ## Step 1: Identify your Docker users and their Docker accounts
 
@@ -42,13 +40,13 @@ Identifying your users will ensure that you allocate your subscription seats eff
 
 When you create an organization, you are the only owner. You may optionally add additional owners. Owners can help you onboard and manage your organization.
 
-To add an owner, invite a user and assign them the owner role. For more details, see {{ $members_link }}.
+To add an owner, invite a user and assign them the owner role. For more details, see [Invite members](/admin/organization/members/).
 
 ## Step 3: Invite members
 
 When you add users to your organization, you gain visibility into their activity and you can enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits.
 
-To add a member, invite a user and assign them the member role. For more details, see {{ $members_link }}.
+To add a member, invite a user and assign them the member role. For more details, see [Invite members](/admin/organization/members/).
 
 ## Step 4: Manage members with SSO and SCIM
 
@@ -66,7 +64,7 @@ By default, members of your organization can use Docker Desktop on their machine
 ## What's next
 
 - [Create](/docker-hub/repos/create/) and [manage](/docker-hub/repos/) repositories.
-- Create [teams](/docker-hub/manage-a-team/) for fine-grained repository access.
+- Create [teams](/admin/organization/manage-a-team/) for fine-grained repository access.
 - Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development.
 - {{ $audit_link }} to ensure that all Docker users in your domain are part of your organization.
 

layouts/shortcodes/admin-registry-access.html

@@ -1,6 +1,6 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
 {{ end }}
 
 To configure Registry Access Management permissions, perform the following steps:

layouts/shortcodes/admin-scim.html

@@ -4,7 +4,7 @@
    - Company: Select **Organizations**, your company, and then **Settings**.` }}
 
 {{ if eq (.Get "product") "admin" }}
-{{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+{{ $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.**" }}
 {{ end }}
 

layouts/shortcodes/admin-sso-config.md

@@ -4,7 +4,7 @@
    - Company: Select **Organizations**, your company, and then **Settings**.` }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $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.**" }}
 {{ end }}
 

layouts/shortcodes/admin-sso-management-orgs.md

@@ -1,7 +1,7 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
 {{ $sso_navigation := "Select **Organizations**, your company, and then **Settings**." }}
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $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**." }}
 {{ end }}
 

layouts/shortcodes/admin-sso-management.md

@@ -7,7 +7,7 @@
 {{ $remove_button := "**Remove member**" }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+  {{ $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**." }}
   {{ $member_navigation := `Navigate to the user management page for your organization or company. 

layouts/shortcodes/admin-users.html

@@ -20,7 +20,7 @@
 {{ $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**." }}
 {{ $remove_button = "**Remove member**" }}
-{{ $product_link = "[Docker Admin](https://admin.docker.com)" }}
+{{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
 {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/scim/)" }}
 {{ if eq (.Get "layer") "company" }}
 {{ $export_fields = `The CSV file for a company contains the following fields: