Skip to content

Commit 4aa3ef4

Browse files
Merge pull request #22448 from docker/published-update
publish updates from main
2 parents 425b0b4 + 060688a commit 4aa3ef4

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

content/manuals/admin/company/owners.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@ A company can have multiple owners. Company owners have company-wide
1212
observability and can manage company-wide settings that apply to all associated
1313
organizations. In addition, company owners have the same access as organization
1414
owners for all associated organizations. Unlike organization owners, company
15-
owners don't need to be member of an organization. When company owners aren't a
16-
member in an organization, they don't occupy a seat.
15+
owners don't need to be member of an organization.
16+
17+
> [!NOTE]
18+
>
19+
> Company owners do not occupy a seat unless one of the following is true:
20+
>
21+
> - They are added as a member of an organization under your company
22+
> - SSO is enabled
1723
1824
## Add a company owner
1925

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,22 @@ You can add a maximum of 10 company owners to a single company account.
3232

3333
### Do company owners occupy a subscription seat?
3434

35-
Company owners don't occupy a seat in any organization unless they are added as a
36-
member of the organization. Since company owners have the same access as
37-
organization owners for all organizations associated with the company, it is not
38-
necessary to add company owners to an organization.
39-
40-
Note that when you first create a company, your account will be both a company
41-
owner and an organization owner. Your account will occupy a seat as long as
42-
you're an organization owner.
35+
Company owners do not occupy a seat unless one of the following is true:
36+
37+
- They are added as a member of an organization under your company
38+
- SSO is enabled
39+
40+
Although company owners have the same access as organization owners across all
41+
organizations in the company, it's not necessary to add them to any
42+
organization. Doing so will cause them to occupy a seat.
43+
44+
When you first create a company, your account is both a company owner and an
45+
organization owner. In that case, your account will occupy a seat as long as
46+
you remain an organization owner.
47+
48+
To avoid occupying a seat, [assign another user as the organization owner](/manuals/admin/organization/members.md#update-a-member-role) and remove yourself from the organization.
49+
You'll retain full administrative access as a company owner without using a
50+
subscription seat.
4351

4452
### What permissions does the company owner have in the associated/nested organizations?
4553

content/manuals/desktop/features/kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Turning the Kubernetes server on or off in Docker Desktop does not affect your o
3737
4. Choose your [cluster provisioning method](#cluster-provisioning-method).
3838
5. Select **Apply & Restart** to save the settings.
3939

40-
This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\Resources\bin\kubectl.exe` (Windows).
40+
This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\resources\bin\kubectl.exe` (Windows).
4141

4242
> [!NOTE]
4343
>

0 commit comments

Comments
 (0)