admin: remove company mgmt from hub (#21035)

* admin: remove company mgmt from hub

Signed-off-by: Craig <craig.osterhout@docker.com>

content/includes/admin-company-overview.md

@@ -1,4 +1,4 @@
-A company provides a single point of visibility across multiple organizations. This view simplifies the management of Docker organizations and settings. It's available to Docker Business subscribers.
+A company provides a single point of visibility across multiple organizations. This view simplifies the management of Docker organizations and settings. Organization owners with a Docker Business subscription can create a company and then manage it through the [Docker Admin Console](https://app.docker.com/admin).
 
 The following diagram depicts the setup of a company and how it relates to associated organizations.
 

content/includes/admin-early-access.md

@@ -4,5 +4,5 @@
 {{% restricted title="Early Access" %}}
 The Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) product.
 
-It's available to all company owners and organization owners. You can still manage companies and organizations in Docker Hub, but the Admin Console includes enhanced features for company-level management.
+It's available to all company owners and organization owners. You can still manage organizations in Docker Hub, but the Admin Console includes company-level management and enhanced features for organization management.
 {{% /restricted %}}

content/manuals/admin/_index.md

@@ -33,7 +33,7 @@ aliases:
 - /docker-hub/admin-overview
 ---
 
-Administrators can manage companies and organizations using Docker Hub or the Docker Admin Console.
+Administrators can manage companies and organizations using the Docker Admin Console, or manage organizations in Docker Hub.
 
 The Docker Admin Console is available in [Early Access](../release-lifecycle.md#early-access-ea) to all company owners and organization owners. 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.
 

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

@@ -6,30 +6,7 @@ aliases:
 - /docker-hub/new-company/
 ---
 
-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.
-
-5. Review the company migration details and then select **Create company**.
-
-{{< /tab >}}
-
-{{< tab name="Admin Console" >}}
+You can create a new company in the 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.
 
 {{< include "admin-early-access.md" >}}
 
@@ -50,9 +27,6 @@ To create a new 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
 

content/manuals/admin/company/organizations.md

@@ -4,37 +4,7 @@ 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.
-
-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.
-
-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" >}}
+You can manage the organizations in a company in the Docker Admin Console.
 
 {{< include "admin-early-access.md" >}}
 
@@ -78,9 +48,6 @@ There is no limit to the number of organizations you can have under a company la
 3. Select the organization that you want to manage.
 
 For more details about managing an organization, see [Organization administration](../organization/_index.md).
-{{< /tab >}}
-
-{{< /tabs >}}
 
 ## More resources
 

content/manuals/admin/company/owners.md

@@ -13,28 +13,6 @@ owners for all associated organizations. Unlike organization owners, company
 owners don't need to be member of an organization. When company owners aren't a
 member in an organization, they don't occupy a seat.
 
-{{< tabs >}}
-{{< tab name="Docker Hub" >}}
-
-## 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. After you find the user, select **Add company owner**.
-
-Once you've added the new owner, you can view the user in the **Company owners** table.
-
-## 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
@@ -53,6 +31,3 @@ Once you've added the new owner, you can view the user in the **Company owners**
 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**.
-
-{{< /tab >}}
-{{< /tabs >}}

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

@@ -64,7 +64,7 @@ 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 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).
+You can add organizations to a company in the [Admin Console](../../admin/company/organizations.md#add-organizations-to-a-company.md).
 
 ### How does a company owner manage SSO/SCIM settings from a company?
 

content/manuals/docker-hub/_index.md

@@ -32,7 +32,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/). 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).
+Docker Hub is also where you can go to [carry out administrative tasks for organizations](/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?" >}}

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

@@ -21,7 +21,7 @@ The steps to set up your SSO configuration are:
 3. [Configure your IdP](./configure-idp.md) to work with Docker.
 4. [Complete your SSO connection](../connect/_index.md) in Docker.
 
-This page walks through steps 1 and 2 using Docker Hub or the Admin Console.
+This page walks through steps 1 and 2 using Docker Hub or the Admin Console. To configure SSO for a company, use the Admin Console.
 
 ## Step one: Add and verify your domain
 

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

@@ -14,21 +14,10 @@ aliases:
 >
 > You must have a [company](/admin/company/) to manage more than one organization.
 
-{{< tabs >}}
-{{< tab name="Admin Console" >}}
-
 {{< include "admin-early-access.md" >}}
 
 {{% admin-sso-management-orgs product="admin" %}}
 
-{{< /tab >}}
-{{< tab name="Docker Hub" >}}
-
-{{% admin-sso-management-orgs product="hub" %}}
-
-{{< /tab >}}
-{{< /tabs >}}
-
 ## Manage domains
 
 {{< tabs >}}

layouts/shortcodes/admin-domains.html

@@ -1,25 +1,14 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
-{{ $domain_navigation := `Navigate to the domain settings page for your organization or company.
-
-   - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**.
-   - Company: Select **Organizations**, your company, and then **Settings**.` }}
+{{ $domain_navigation := `Navigate to the domain settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }}
 
 {{ if eq (.Get "product") "admin" }}
-  {{ $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**." }}
+{{ $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**. Note that when an organization is part of a company, you must select the company and configure the domain for that organization at the company level. Each organization in a company can have its own domain, but it must be configured at the company level." }}
 {{ end }}
 
 
 1. Sign in to {{ $product_link }}.
 2. {{ $domain_navigation }}
-
-   > [!NOTE]
-   >
-   > When an organization is part of a company, you must select the company and
-   > configure the domain for that organization at the company level. Each
-   > organization in a company can have its own domain, but it must be
-   > configured at the company level.
-
 3. Select **Add a domain**.
 4. Continue with the on-screen instructions to get a verification code for
    your domain as a **TXT Record Value**.

layouts/shortcodes/admin-sso-config.md

@@ -1,11 +1,9 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
-{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company.
-   - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**.
-   - Company: Select **Organizations**, your company, and then **Settings**.` }}
+{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }}
 
 {{ if eq (.Get "product") "admin" }}
   {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
-  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }}
+  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }}
 {{ end }}
 
 > [!IMPORTANT]
@@ -21,14 +19,6 @@ After your domain is verified, create an SSO connection.
 
 1. Sign in to {{ $product_link }}.
 2. {{ $sso_navigation }}
-
-   > [!NOTE]
-   >
-   > When an organization is part of a company, you must select the company and
-   > configure SSO for that organization at the company level. Each organization
-   > can have its own SSO configuration and domain, but it must be configured at
-   > the company level.
-
 3. In the SSO connections table select **Create Connection**, and create a name for the connection.
 
    > [!NOTE]

layouts/shortcodes/admin-sso-connect.md

@@ -1,11 +1,9 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
-{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company.
-   - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**.
-   - Company: Select **Organizations**, your company, and then **Settings**.` }}
+{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }}
 
 {{ if eq (.Get "product") "admin" }}
   {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
-  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }}
+  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }}
 {{ end }}
 
 1. In {{ $product_link }}, select the verified domains you want to apply the connection to.
@@ -36,14 +34,6 @@ The SSO connection is now created. You can continue to set up SCIM without enfor
 
 1. Sign in to {{ $product_link }}.
 2. {{ $sso_navigation }}
-
-   > [!NOTE]
-   >
-   > When an organization is part of a company, you must select the company and
-   > configure SSO enforcement for that organization at the company level. Each
-   > organization in a company can have its own configuration, but it must be
-   > configured at the company level.
-
 3. In the SSO connections table, select the **Action** icon and then **Enable enforcement**.
 
    When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. You must enable 2FA through your IdP.

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

@@ -1,25 +1,15 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
-{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company.
-   - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**.
-   - Company: Select **Organizations**, your company, and then **Settings**.` }}
+{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }}
 
 {{ if eq (.Get "product") "admin" }}
   {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}
-  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }}
+  {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }}
 {{ end }}
 
 ### Edit a connection
 
 1. Sign in to {{ $product_link }}.
 2. {{ $sso_navigation }}
-
-   > [!NOTE]
-   >
-   > When an organization is part of a company, you must select the company and
-   > manage the SSO settings for that organization at the company level. Each
-   > organization can have its own domain and SSO configuration, but it must be
-   > managed at the company level.
-
 3. In the SSO connections table, select the **Action** icon.
 4. Select **Edit connection** to edit your connection.
 5. Follow the on-screen instructions to edit the connection.
@@ -28,15 +18,6 @@
 
 1. Sign in to {{ $product_link }}.
 2. {{ $sso_navigation }}
-
-   > [!NOTE]
-   >
-   > When an organization is part of a company, you must select the company and
-   > delete the SSO connection for that organization at the company level. If a
-   > connection is used by mulitple organizations and you only want to delete
-   > the connection for specific organizations, you can [remove those
-   > organizations](/security/for-admins/single-sign-on/manage/#remove-an-organization).
-
 3. In the SSO connections table, select the **Action** icon.
 4. Select **Delete connection**.
 5. Follow the on-screen instructions to delete a connection.

layouts/shortcodes/admin-sso-management.md

@@ -1,7 +1,5 @@
 {{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
-{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company.
-   - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**.
-   - Company: Select **Organizations**, your company, and then **Settings**.` }}
+{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }}
 
 {{ if eq (.Get "product") "admin" }}
   {{ $product_link = "the [Admin Console](https://admin.docker.com)" }}