Skip to content

Commit 50f1c0b

Browse files
authored
Promoting upsells to callouts (#24153)
Per feedback from leadership, promoting upsells to callouts and demoting other redundant banners.
1 parent 84aa208 commit 50f1c0b

4 files changed

Lines changed: 63 additions & 105 deletions

File tree

content/manuals/admin/_index.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,26 @@ The [Docker Admin Console](https://app.docker.com/admin) provides administrators
4848

4949
### Company
5050

51-
A company groups multiple Docker organizations for centralized configuration.
52-
Companies are only available for Docker Business subscribers.
51+
A company groups multiple Docker organizations for centralized configuration. Companies have the company owner administrator role available.
5352

54-
Companies have the company owner administrator role available:
53+
The company owner:
5554

5655
- Can view and manage all organizations within the company
5756
- Has full access to company-wide settings and inherits the same permissions as organization owners
5857
- Do not occupy a seat
5958

59+
Companies are only available for Docker Business subscribers.
60+
6061
### Organization
6162

62-
An organization contains teams and repositories. All Docker Team and Business
63-
subscribers must have at least one organization.
63+
Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/admin/faqs/organization-faqs/#what-is-the-difference-between-user-invitee-seat-and-member).
64+
65+
- An organization contains teams and repositories.
66+
- All Docker Team and Business subscribers must have at least one organization.
6467

65-
Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/admin/faqs/organization-faqs/#what-is-the-difference-between-user-invitee-seat-and-member). If you want to [upgrade to a Docker Business plan](https://www.docker.com/pricing/), you can access the company owner role.
6668

67-
While creating a company is optional, organizations are required for Team and Business subscriptions.
69+
> [!TIP]
70+
> [Upgrading to a Docker Business plan](https://www.docker.com/pricing/) grants you the company owner role so you can manage multiple organizations.
6871
6972
### Team
7073

content/manuals/admin/organization/members.md

Lines changed: 29 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ Use the following steps to invite members to your organization via Docker ID or
2222
1. Select **Emails or usernames**.
2323
1. Follow the on-screen instructions to invite members. Invite a maximum of 1000 members and separate multiple entries by comma, semicolon, or space.
2424

25-
> [!NOTE]
26-
>
27-
> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for
25+
When you invite members, you assign them a role. See [Roles and permissions](/enterprise/security/roles-and-permissions) for
2826
details about the access permissions for each role.
2927

3028
Pending invitations appear in the table. Invitees receive an email with a link to Docker Hub where they can accept or decline the invitation.
@@ -33,49 +31,26 @@ Pending invitations appear in the table. Invitees receive an email with a link t
3331

3432
To invite multiple members to an organization via a CSV file containing email addresses:
3533

36-
1. Sign in to [Docker Home](https://app.docker.com) and select your organization from the top-left account drop-down.
37-
1. Select **Members**, then **Invite**.
38-
1. Select **CSV upload**.
39-
1. Optional. Select **Download the template CSV file** to download an example CSV file. The following is an example of the contents of a valid CSV file.
40-
41-
```text
42-
email
43-
docker.user-0@example.com
44-
docker.user-1@example.com
45-
```
34+
1. Sign in to [Docker Home](https://app.docker.com) and select your organization from the top-left account drop-down. Select **Members** > **Invite** > **CSV upload**.
35+
1. Optional. Select **Download the template CSV file** to download an example CSV file. The following is an example of the contents of a valid CSV file:
4636

47-
CSV file requirements:
37+
```text
38+
email
39+
docker.user-0@example.com
40+
docker.user-1@example.com
41+
```
4842
49-
- The file must contain a header row with at least one heading named email. Additional columns are allowed and are ignored in the import.
50-
- The file must contain a maximum of 1000 email addresses (rows). To invite more than 1000 users, create multiple CSV files and perform all steps in this task for each file.
43+
The example file demonstrates CSV file requirements:
5144
45+
- The file must contain a header row with at least one heading named email. Additional columns are allowed and are ignored in the import.
46+
- The file must contain a maximum of 1000 email addresses (rows). To invite more than 1000 users, create multiple CSV files and perform all steps in this task for each file.
5247
1. Create a new CSV file or export a CSV file from another application.
53-
54-
- To export a CSV file from another application, see the application’s documentation.
55-
- To create a new CSV file, open a new file in a text editor, type email on the first line, type the user email addresses one per line on the following lines, and then save the file with a .csv extension.
56-
48+
- To export a CSV file from another application, see the application’s documentation.
49+
- To create a new CSV file, open a new file in a text editor, type email on the first line, type the user email addresses one per line on the following lines, and then save the file with a .csv extension.
5750
1. Select **Browse files** and then select your CSV file, or drag and drop the CSV file into the **Select a CSV file to upload** box. You can only select one CSV file at a time.
58-
59-
> [!NOTE]
60-
>
61-
> If the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you cannot continue to invite members. To invite members, you can purchase more seats, or remove some email addresses from the CSV file and re-select the new file. To purchase more seats, see [Add seats](/manuals/subscription/manage-seats.md) to your subscription or [Contact sales](https://www.docker.com/pricing/contact-sales/).
62-
63-
1. After the CSV file has been uploaded, select **Review**.
64-
65-
Valid email addresses and any email addresses that have issues appear. Email addresses may have the following issues:
66-
67-
- Invalid email: The email address is not a valid address. The email address will be ignored if you send invites. You can correct the email address in the CSV file and re-import the file.
68-
- Already invited: The user has already been sent an invite email and another invite email will not be sent.
69-
- Member: The user is already a member of your organization and an invite email will not be sent.
70-
- Duplicate: The CSV file has multiple occurrences of the same email address. The user will be sent only one invite email.
71-
51+
1. After the CSV file has been uploaded, select **Review** to identify any invalid email addresses, already invited users, invited users who are already members, or duplicated email addresses within the same CSV file.
7252
1. Follow the on-screen instructions to invite members.
7353
74-
> [!NOTE]
75-
>
76-
> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for
77-
details about the access permissions for each role.
78-
7954
Pending invitations appear in the table. The invitees receive an email with a link to Docker Hub where they can accept or decline the invitation.
8055
8156
### Invite members via API
@@ -84,21 +59,14 @@ You can bulk invite members using the Docker Hub API. For more information, see
8459
8560
## Accept invitation
8661
87-
When an invitation is to a user's email address, they receive
88-
a link to Docker Hub where they can accept or decline the invitation.
62+
After receiving an email invitation, users can access
63+
a link to Docker Hub where they can accept or decline the invitation.
64+
8965
To accept an invitation:
9066
9167
1. Check your email inbox and open the Docker email with an invitation to
9268
join the Docker organization.
9369
1. To open the link to Docker Hub, select the **click here** link.
94-
95-
> [!WARNING]
96-
>
97-
> Invitation email links expire after 14 days. If your email link has expired,
98-
> you can sign in to [Docker Hub](https://hub.docker.com/) with the email
99-
> address the link was sent to and accept the invitation from the
100-
> **Notifications** panel.
101-
10270
1. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**.
10371
If you do not have an account yet, create an account using the same email
10472
address you received the invitation through.
@@ -110,9 +78,14 @@ email.
11078
11179
After accepting an invitation, you are now a member of the organization.
11280
81+
Invitation email links expire after 14 days. If your email link has expired, you can sign in to [Docker Hub](https://hub.docker.com/) with the email address the link was sent to and accept the invitation from the **Notifications** panel.
82+
11383
## Manage invitations
11484
115-
After inviting members, you can resend or remove invitations as needed. Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing/) and advanced role management.
85+
After inviting members, you can resend or remove invitations as needed. Each invitee occupies one seat, so if the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you won't be able to invite more members.
86+
87+
> [!TIP]
88+
> Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing/) and advanced role management. You can also [add seats](/subscription/manage-seats) to your subscription.
11689
11790
### Resend an invitation
11891
@@ -163,18 +136,13 @@ An invitee must first accept the invitation to join the organization before bein
163136
164137
### Remove members from teams
165138
166-
> [!NOTE]
167-
>
168-
> If your organization uses single sign-on (SSO) with [SCIM](/manuals/enterprise/security/provisioning/scim.md) enabled, you should remove members from your identity provider (IdP). This will automatically remove members from Docker. If SCIM is disabled, you must manually manage members in Docker.
139+
If your organization uses single sign-on (SSO) with [SCIM](/enterprise/security/provisioning/scim) enabled, you should remove members from your identity provider (IdP). This automatically removes members from Docker. If SCIM is disabled, follow procedures in this doc to remove members manually in Docker.
169140
170-
Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources.
171-
172-
To remove a member from a specific team with the Admin Console:
141+
Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources. To remove a member from a specific team with the Admin Console:
173142
174143
1. Sign in to [Docker Home](https://app.docker.com/) and select your
175144
organization.
176-
1. Select **Teams**.
177-
1. Select the team name.
145+
1. Select **Teams**, then choose the name of the team member you want to remove.
178146
1. Select the **X** next to the user's name to remove them from the team.
179147
1. When prompted, select **Remove** to confirm.
180148
@@ -184,11 +152,6 @@ Organization owners can manage [roles](/security/for-admins/roles-and-permission
184152
within an organization. If an organization is part of a company,
185153
the company owner can also manage that organization's roles. If you have SSO enabled, you can use [SCIM for role mapping](/security/for-admins/provisioning/scim/).
186154
187-
> [!NOTE]
188-
>
189-
> If you're the only owner of an organization, you need to assign a new owner
190-
before you can edit your role.
191-
192155
To update a member role in the Admin Console:
193156
194157
1. Sign in to [Docker Home](https://app.docker.com/) and select your
@@ -197,6 +160,9 @@ organization.
197160
1. Find the username of the member whose role you want to edit. Select the
198161
**Actions** menu, then **Edit role**.
199162
163+
If you're the only owner of an organization and you want to edit your role, assign a new owner
164+
for your organization so you can edit your role.
165+
200166
## Export members CSV file
201167
202168
{{< summary-bar feature_name="Admin orgs" >}}

content/manuals/admin/organization/orgs.md

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,39 @@ aliases:
99

1010
{{< summary-bar feature_name="Admin orgs" >}}
1111

12-
This page describes how to create an organization.
13-
14-
## Prerequisites
15-
16-
Before you create an organization, you need a [Docker ID](/accounts/create-account/).
17-
18-
Need a different plan for your team's needs? Review different [Docker subscriptions and features](https://www.docker.com/pricing/)
19-
to choose a subscription for your organization.
20-
21-
## Create an organization
22-
2312
There are multiple ways to create an organization. You can either:
2413

2514
- Create a new organization using the **Create Organization** option in the
2615
Admin Console or Docker Hub
2716
- Convert an existing user account to an organization
2817

29-
The following section contains instructions on how to create a new organization. For prerequisites and
30-
detailed instructions on converting an existing user account to an organization, see
18+
These procedures walk you through creating an organization from the Admin Console.
19+
20+
## Prerequisites
21+
22+
* Before you create an organization, you need a [Docker ID](/accounts/create-account/).
23+
* For prerequisites and detailed instructions on converting an existing user account to an organization, see
3124
[Convert an account into an organization](/manuals/admin/organization/convert-account.md).
3225

33-
To create an organization:
26+
> [!TIP]
27+
> Need a different plan for your team's needs? Review different [Docker subscriptions and features](https://www.docker.com/pricing/) to choose a subscription for your organization.
28+
29+
## Create an organization
3430

3531
1. Sign in to [Docker Home](https://app.docker.com/) and navigate to the bottom
36-
of the organization list.
37-
1. Select **Create new organization**.
32+
of the organization list. Select **Create new organization**.
3833
1. Choose a subscription for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business subscription.
39-
1. Select **Continue to profile**.
40-
1. Select **Create an organization** to create a new one.
34+
1. Select **Continue to profile**, then **Create an organization** to create a new organization.
4135
1. Enter an **Organization namespace**. This is the official, unique name for
42-
your organization in Docker Hub. It's not possible to change the name of the
43-
organization after you've created it.
44-
45-
> [!NOTE]
46-
>
47-
> You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/convert-account.md).
48-
49-
1. Enter your **Company name**. This is the full name of your company. Docker
50-
displays the company name on your organization page and in the details of any
51-
public images you publish. You can update the company name anytime by navigating
52-
to your organization's **Settings** page.
53-
1. Select **Continue to billing** to continue.
54-
1. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal.
36+
your organization in Docker Hub.
37+
* It's not possible to change the name of the organization after you've created it.
38+
* Your Docker ID and organization can't share the same name.
39+
* If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/convert-account.md).
40+
1. Enter your **Company name**. This is the full name of your company.
41+
* Docker displays the company name on your organization page and in the details of any
42+
public images you publish.
43+
* You can update the company name anytime by navigating to your organization's **Settings** page.
44+
1. Select **Continue to billing** to continue, then enter your organization's billing information. Select **Continue to payment** to continue to the billing portal.
5545
1. Provide your payment details and select **Purchase**.
5646

5747
You've now created an organization.
@@ -84,9 +74,7 @@ the following steps:
8474
1. Manually move over your data, including all repositories.
8575
1. Once you're done moving all of your users and data, [downgrade](../../subscription/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle.
8676

87-
> [!TIP]
88-
>
89-
> If your organization has a Docker Business subscription with a purchase
77+
If your organization has a Docker Business subscription with a purchase
9078
order, contact Support or your Account Manager at Docker.
9179

9280
## More resources

content/manuals/billing/payment-method.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ organization.
182182
1. Confirm your billing contact details. If you need to change them, select
183183
**Change** and enter your new details.
184184

185-
If you want to pay by invoice, [upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing/).
185+
> [!TIP]
186+
> Do you need to pay by invoice? [Upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing/) and choose the annual subscription.
186187
187188
## Verify a bank account
188189

0 commit comments

Comments
 (0)