Merge pull request #21668 from docker/published-update

publish updates from main

Author: sarahsanders-docker

content/includes/admin-company-overview.md

@@ -8,16 +8,15 @@ The following diagram depicts the setup of a company and how it relates to assoc
 
 With a company, administrators can:
 
-- View and manage all nested organizations and configure settings centrally.
-- Carefully control access to the company and company settings.
-- Have up to ten unique users assigned the company owner role.
-- Configure SSO and SCIM for all nested organizations.
-- Enforce SSO for all users in the company.
+- View and manage all nested organizations and configure settings centrally
+- Carefully control access to the company and company settings
+- Have up to ten unique users assigned the company owner role
+- Configure SSO and SCIM for all nested organizations
+- Enforce SSO for all users in the company
 
 ## Prerequisites
 
 Before you create a company, verify the following:
 
 - Any organizations you want to add to a company have a Docker Business subscription
-- You're an organization owner
-- You're an organization owner for any additional organizations you want to add to the company you create
+- You're an organization owner for your organization and any additional organizations you want to add

content/manuals/accounts/manage-account.md

@@ -63,6 +63,6 @@ For information on personal access tokens, see [Create and manage access tokens]
 
 You can take administrative actions for your account in Docker Home.
 
-For more information on converting your account, see [Convert an account into an organization](../admin/convert-account.md).
+For more information on converting your account, see [Convert an account into an organization](../admin/organization/convert-account.md).
 
 For information on deactivating your account, see [Deactivating a user account](./deactivate-user-account.md).

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

@@ -6,24 +6,27 @@ aliases:
 - /docker-hub/new-company/
 ---
 
-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.
+You can create a new company in the Docker Admin Console. Before you begin, you must:
+- Be the owner of the organization you want to add to your company
+- Have a Docker Business subscription
 
 {{< 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 **Company management**.
-3. Select **Create a company**.
-4. Enter a unique name for your company, then select **Continue**.
+1. Sign in to the [Admin Console](https://app.docker.com/admin).
+2. Select your organization you want to add to your company from the **Choose profile** page.
+3. Under **Organization settings**, select **Company management**.
+4. Select **Create a company**.
+5. Enter a unique name for your company, then select **Continue**.
 
     > [!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**.
+6. Review the company migration details and then select **Create company**.
 
 For more information on how you can add organizations to your company, see [Add organizations to a company](./organizations.md#add-organizations-to-a-company).
 

content/manuals/admin/company/organizations.md

@@ -1,7 +1,7 @@
 ---
-description: Learn how to manage organization in a company.
+description: Learn how to manage organizations in a company.
 keywords: company, multiple organizations, manage organizations
-title: Manage organizations
+title: Manage company organizations
 ---
 
 You can manage the organizations in a company in the Docker Admin Console.
@@ -14,32 +14,28 @@ You can manage the organizations in a company in the Docker Admin Console.
 2. Select your company on the **Choose profile** page.
 3. Under **Organizations**, select **Overview**.
 
+The organization overview page displays all organizations under your company.
+
 ## Add seats to an organization
 
-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.
+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. If you have a sales-assisted subscription, you can contact Docker support or sales to add seats.
 
-1. Sign in to the [Admin Console](https://admin.docker.com).
-2. Select your company on the **Choose profile** page.
-3. Under **Organizations**, select **Overview**.
-4. Select the action icon in the organization's card, and then select **Get more seats**.
+For more information about adding seats, see [Manage seats](/manuals/subscription/manage-seats.md#add-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.
-
-There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.
+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]
+> [!IMPORTANT]
 >
 > Once you add an organization to a company, you can't remove it from the company.
 
 1. Sign in to the [Admin Console](https://admin.docker.com).
 2. Select your company on the **Choose profile** page.
-3. Select **Add organization**.
-4. Choose the organization you want to add from the drop-down menu.
-5. Select **Add organization** to confirm.
+3. Select **Organizations**, then **Overview**.
+4. Select **Add organization**.
+5. Choose the organization you want to add from the drop-down menu.
+6. Select **Add organization** to confirm.
 
 ## Manage an organization
 

content/manuals/admin/company/users.md

@@ -4,12 +4,12 @@ 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" %}}
 
+{{< include "admin-early-access.md" >}}
+
 ## 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](../organization/members.md#manage-members-on-a-team).

content/manuals/admin/deactivate-account.md

@@ -8,7 +8,7 @@ aliases:
 
 You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate an organization account. For information on deactivating a user account, see [Deactivate a user account](../accounts/deactivate-user-account.md).
 
->[!WARNING]
+> [!WARNING]
 >
 > All Docker products and services that use your Docker account or organization account will be inaccessible after deactivating your account.
 
@@ -44,7 +44,7 @@ Once you have completed all the previous steps, you can deactivate your organiza
 4. Select **Deactivate organization**.
 
 {{< /tab >}}
-{{< tab name="Hub" >}}
+{{< tab name="Docker Hub" >}}
 
 1. On Docker Hub, select **Organizations**.
 2. Choose the organization you want to deactivate.

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

@@ -32,7 +32,7 @@ You can add a maximum of 10 company owners to a single company account.
 
 ### Do company owners occupy a subscription seat?
 
-Company owners don't occupy a seat in any organization unless they are added as
+Company owners don't occupy a seat in any organization unless they are added as a
 member of the organization. Since company owners have the same access as
 organization owners for all organizations associated with the company, it is not
 necessary to add company owners to an organization.
@@ -43,7 +43,7 @@ you're an organization owner.
 
 ### 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 single sign-on (SSO) and System for Cross-domain Identity Management (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 single sign-on (SSO) and System for Cross-domain Identity Management (SCIM) settings. Changes to company settings impact all users in each organization under the company. For more information, see [Roles and permissions](../../security/for-admins/roles-and-permissions.md).
 
 ### What features are supported at the company level?
 
@@ -64,16 +64,16 @@ 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).
+You can add organizations to a company in the Admin Console. For more information, see [Add organizations to a company](../../admin/company/organizations.md#add-organizations-to-a-company.md).
 
-### How does a company owner manage SSO/SCIM settings from a company?
+### How does a company owner manage SSO/SCIM settings for a company?
 
 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/provisioning/group-mapping.md) for more information.
 
-### What's the definition of a company vs an organization?
+### What's the definition of a company versus an organization?
 
 A company is a collection of organizations that are managed together. An organization is a collection of repositories and teams that are managed together.

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

@@ -13,8 +13,7 @@ aliases:
 
 ### What is a Docker ID?
 
-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.
+A Docker ID is a username for your Docker account that lets you access Docker products. To create a Docker ID, you need an email address or you can sign up with your social or GitHub accounts. 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](/accounts/create-account/). If your administrator enforces [single sign-on (SSO)](../../security/for-admins/single-sign-on/_index.md), this provisions a Docker ID for new users.
 
@@ -66,6 +65,10 @@ information, see [Configure SSO](../../security/for-admins/single-sign-on/config
 
 ### What is a service account?
 
+> [!IMPORTANT]
+>
+> As of December 10, 2024, service accounts are no longer available. Existing Service Account agreements will be honored until their current term expires, but new purchases or renewals of service accounts no longer available and customers must renew under a new subscription plan. It is recommended to transition to Organization Access Tokens (OATs), which can provide similar functionality. For more information, see [Organization access tokens (Beta)](/manuals/security/for-admins/access-tokens.md).
+
 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?
@@ -76,4 +79,4 @@ If the user is a member of your organization, you can remove the user from your
 
 ### How do I manage settings for a user account?
 
-You can manage your account settings any time when you sign in to your [Docker account](https://app.docker.com/login). In Docker Home, select your avatar in the top-right navigation, then select **My Account**. You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control.
+You can manage your account settings anytime when you sign in to your [Docker account](https://app.docker.com/login). In Docker Home, select your avatar in the top-right navigation, then select **My Account**. You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control.

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

@@ -12,7 +12,7 @@ aliases:
 
 ### What if the Docker ID I want for my organization or company is taken?
 
-All Docker IDs are first-come, first-served except for companies that have a US Trademark on a username. If you have a trademark for your namespace, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you.
+All Docker IDs are first-come, first-served except for companies that have a U.S. Trademark on a username. If you have a trademark for your namespace, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you.
 
 ### How do I add an organization owner?
 
@@ -24,11 +24,11 @@ If your organization uses a Software Asset Management tool, you can use it to fi
 
 ### Do users first need to authenticate with Docker before an owner can add them to an organization?
 
-No. Organization owners can invite users with their email address, and also assign them to a team during the invite process.
+No. Organization owners can invite users with their email addresses, and also assign them to a team during the invite process.
 
 ### 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/enforce-sign-in/_index.md) and some benefits are:
+Yes. You can [enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md). Some benefits of enforcing sign-in are:
 
 - Administrators can enforce features like [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md) and [Registry Access Management](../../security/for-admins/hardened-desktop/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.
@@ -46,9 +46,7 @@ revert it to a personal user account. For prerequisites and instructions, see
 
 ### Our users create Docker Hub accounts through self-service. How do we know when the total number of users for the requested licenses has been met? Is it possible to add more members to the organization than the total number of licenses?
 
-There isn't any automatic notification when the total number of users for the requested licenses has been met. However, if the number of team
-members exceed the number of licenses, you will receive an error informing you
-to contact the administrator due to lack of seats. You can [add seats](../../subscription/manage-seats.md) if needed.
+There isn't any automatic notification when the total number of users for the requested licenses has been met. However, if the number of team members exceed the number of licenses, you will receive an error informing you to contact the administrator due to lack of seats. You can [add seats](../../subscription/manage-seats.md) if needed.
 
 ### How can I merge organization accounts?
 
@@ -66,13 +64,13 @@ Yes. Organization owners will take up a seat.
 
 ### What is the difference between user, invitee, seat, and member?
 
-User may refer to a Docker user with a Docker ID.
+User refers to a Docker user with a Docker ID.
 
-An invitee is a user that an administrator has invited to join an organization, but has not yet accepted their invitation.
+An invitee is a user that an administrator has invited to join an organization but has not yet accepted their invitation.
 
-Seats is the number of planned members within an organization.
+Seats are the number of planned members within an organization.
 
-Member may refer to a user that has received and accepted an invitation to join an organization. Member can also refer to a member of a team within an organization.
+Member may refer to a user who has received and accepted an invitation to join an organization. Member can also refer to a member of a team within an organization.
 
 ### If there are two organizations and a user belongs to both organizations, do they take up two seats?
 

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

@@ -2,6 +2,7 @@
 description: Convert your Docker Hub user account into an organization
 title: Convert an account into an organization
 keywords: docker hub, hub, organization, convert account, migrate account
+weight: 35
 aliases:
 - /docker-hub/convert-account/
 ---
@@ -12,7 +13,7 @@ When you convert a user account to an organization, the account is migrated to a
 
 > [!IMPORTANT]
 >
-> Once you convert your account to an organization, you can’t revert it to a user account. 
+> Once you convert your account to an organization, you can’t revert it to a user account.
 
 ## Prerequisites