Skip to content

Commit

Permalink
First proofread
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahsanders-docker committed Dec 17, 2024
1 parent 4cd5d71 commit 1d23f11
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion content/manuals/admin/company/organizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ 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.

For more information about adding seats, see [Manage seats](/manuals/subscription/manage-seats.md#add-seats).

Expand Down
4 changes: 2 additions & 2 deletions content/manuals/admin/company/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion content/manuals/admin/deactivate-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions content/manuals/admin/faqs/company-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -66,7 +66,7 @@ A company name must be unique to that of its child organization. If a child orga

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?

Check warning on line 69 in content/manuals/admin/faqs/company-faqs.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.HeadingLength] Try to keep headings short (< 8 words). Raw Output: {"message": "[Docker.HeadingLength] Try to keep headings short (\u003c 8 words).", "location": {"path": "content/manuals/admin/faqs/company-faqs.md", "range": {"start": {"line": 69, "column": 5}}}, "severity": "INFO"}

See your [SCIM](scim.md) and [SSO](../../security/for-admins/single-sign-on/configure/_index.md) settings.

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/admin/faqs/general-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,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.
12 changes: 6 additions & 6 deletions content/manuals/admin/faqs/organization-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand All @@ -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). Somme benefits of enforcing sign-in 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.
Expand Down Expand Up @@ -66,11 +66,11 @@ Yes. Organization owners will take up a seat.

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?

Expand Down

0 comments on commit 1d23f11

Please sign in to comment.