Update and refresh company docs (#18656)

* update company faqs structure diagram and implement support feedback

* update faq and callout

* implement feedback and fix conditional

content/admin/_index.md

@@ -24,7 +24,7 @@ The [Docker Admin](https://admin.docker.com) console provides administrators wit
   - Company owner: A company can have multiple owners. Company owners have company-wide observability and can manage company-wide settings that apply to all associated organizations. In addition, company owners have the same access as organization owners for all associated organizations.
 - Organization: An organization is a collection of teams and repositories. Docker Team and Business subscribers must have at least one organization.
   - Organization owner: An organization can have multiple owners. Organization owners have observability into their organization and can manage its users and settings.
-- Team: A team is a group of Docker members that belong to an organization. Organization and company owners can group members into additional teams to configure repository permissions on a per-team basis.
-  - Member: A member is a Docker user that's a member of at least one team in an organization.
+- Team: A team is a group of Docker members that belong to an organization. Organization and company owners can group members into additional teams to configure repository permissions on a per-team basis. Using teams to group members is optional.
+- Member: A member is a Docker user that's a member of an organization. Organization and company owners can assign roles to members to define their permissions.
 
 {{< grid >}}

content/admin/company/_index.md

@@ -29,6 +29,10 @@ grid:
   description: Add and verify your domains.
   icon: domain_verification
   link: /admin/company/settings/domains/
+- title: FAQs
+  description: Explore common company FAQs.
+  link: /docker-hub/company-faqs/
+  icon: help
 ---
 
 {{< include "admin-early-access.md" >}}

content/admin/organization/_index.md

@@ -33,6 +33,10 @@ grid:
   description: Add, verify, and audit your domains.
   link: /admin/organization/security-settings/domains/
   icon: domain_verification
+- title: FAQs
+  description: Explore common organization FAQs.
+  link: /docker-hub/organization-faqs/
+  icon: help
 ---
 
 {{< include "admin-early-access.md" >}}

content/docker-hub/company-faqs.md

@@ -6,11 +6,11 @@ title: FAQs on companies
 
 ### Are existing subscriptions affected when a company is created and organizations are added to the company?
 
-Subscriptions and related billing details continue to be managed at the organization level at this time.
+You can manage subscriptions and related billing details at the organization level.
 
 ### Some of my organizations don’t have a Docker Business subscription. Can I still use a parent company?
 
-Yes, but only organizations with a Docker Business subscription can be placed under a company.
+Yes, but you can only add organizations with a Docker Business subscription to a company.
 
 ### What happens if one of my organizations downgrades from Docker Business, but I still need access as a company owner?
 
@@ -22,36 +22,40 @@ No, you can continue with business as usual.
 
 ### How many company owners can I add?
 
-A maximum of 10 company owners can be added to a single company account.
+You can add a maximum of 10 company owners to a single company account.
 
-### What permission does the company owner have in the associated/nested organizations?
+### 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.
+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?
 
-Domain verification, Single Sign-on, and System for Cross-domain Identity Management (SCIM) are supported at the company level. The following aren't supported:
+You can manage domain verification, Single Sign-on, and System for Cross-domain Identity Management (SCIM) at the company level. The following features aren't supported at the company level, but you can manage them at the organization level:
 
 - Image Access Management
 - Registry Access Management
 - 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.
+
+Domain audit is not supported for companies or organizations within a company.
+
 ### What's required to create a company name?
 
 A company name must be unique to that of its child organization. If a child organization requires the same name as a company, we suggest modifying slightly. For example, **Docker Inc** (parent company), **Docker** (child organization).
 
 ### How does a company owner add an organization to the company?
 
-Contact your designated CSM team member or Docker Support with a list of the Docker Business organizations you want to add to the new 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).
 
 ### How does a company owner manage SSO/SCIM settings from my new parent 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 my IdP?
 
-See [SCIM](scim.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/docker-hub/new-company.md

@@ -8,21 +8,32 @@ keywords: company, hub, organization, company owner
 
 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.
+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**. 
+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 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**.

content/includes/admin-company-overview.md

@@ -12,4 +12,12 @@ With a company, administrators can:
 - 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.
+- 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

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

@@ -26,6 +26,11 @@ Before you audit your domains, the following prerequisites are required:
 - Your organization must be part of a Docker Business subscription. To upgrade your existing account to a Docker Business subscription, see [Upgrade your subscription](../../subscription/upgrade.md).
 - You must add and verify your domains.
 
+> **Important**
+>
+> Domain audit is not supported for companies or organizations within a company.
+{ .important }
+
 ## Audit your domains for uncaptured users
 
 {{< tabs >}}

layouts/shortcodes/admin-users.html

@@ -18,7 +18,7 @@
 {{ if eq (.Get "product") "admin" }}
 {{ $invite_button = "**Invite**" }}
 {{ $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**." }}
+{{ $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)" }}
 {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/scim/)" }}