Skip to content

Commit 5f9216c

Browse files
authored
Remove call outs per style guide (#24238)
This PR captures work for docs in BRIDGE that have >2 but <5 CTAs per doc. * Keep most pertinent/urgent/helpful CTAs with a maximum of ~~2~~ 3. * Some CTAs include security info that should be privileged / override style guidance * I've limited scope for this PR to address docs with 4-5 CTAs per doc. * Find natural home for other CTAs, careful to ensure that the information is still prominent as the CTAs were likely added because users need that information. Follow-up work: * Some work was started on SCIM and Configure JSON, but both docs need a deeper look into about their efficacy. * For SCIM especially, the doc has a lot of relevant call outs. * I want to confirm with stakeholders about possibly segmenting this doc into smaller and more topic-focused docs within the provisioning section * Need to find point person on legacy notices in docs * Need to find point person on tax compliance notices, as they're quite noisy. (Not urgent as this is just a personal preference lol)
1 parent c86fd78 commit 5f9216c

7 files changed

Lines changed: 35 additions & 92 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ cagent
1717
.cagent
1818
.pr-body.md
1919
.validation.log
20+
.claude

content/manuals/billing/cycle.md

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ When you change your billing cycle:
3232
{{< tabs >}}
3333
{{< tab name="Docker subscription" >}}
3434

35-
> [!IMPORTANT]
36-
>
37-
> Pay by invoice is not available for subscription upgrades or changes.
35+
Pay by invoice is not available for subscription upgrades or changes.
3836

3937
To change your billing cycle:
4038

@@ -44,13 +42,7 @@ To change your billing cycle:
4442
1. On the plans and usage page, select **Switch to annual billing**.
4543
1. Verify your billing information.
4644
1. Select **Continue to payment**.
47-
1. Verify payment information and select **Upgrade subscription**.
48-
49-
> [!NOTE]
50-
>
51-
> If you choose to pay using a US bank account, you must verify the account. For
52-
> more information, see
53-
> [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
45+
1. Verify payment information and select **Upgrade subscription**. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
5446

5547
The billing plans and usage page will now reflect your new annual plan details.
5648

@@ -76,9 +68,7 @@ You must be an organization owner to make changes to the payment information.
7668
{{< tabs >}}
7769
{{< tab name="Docker subscription" >}}
7870

79-
> [!IMPORTANT]
80-
>
81-
> Pay by invoice is not available for subscription upgrades or changes.
71+
Pay by invoice is not available for subscription upgrades or changes.
8272

8373
Follow these steps to switch from a monthly to annual billing cycle for your
8474
organization's Docker subscription:
@@ -89,13 +79,8 @@ organization's Docker subscription:
8979
1. On the plans and usage page, select **Switch to annual billing**.
9080
1. Verify your billing information.
9181
1. Select **Continue to payment**.
92-
1. Verify payment information and select **Upgrade subscription**.
82+
1. Verify payment information and select **Upgrade subscription**. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
9383

94-
> [!NOTE]
95-
>
96-
> If you choose to pay using a US bank account, you must verify the account. For
97-
> more information, see
98-
> [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
9984

10085
{{< /tab >}}
10186
{{< tab name="Legacy Docker subscription" >}}

content/manuals/enterprise/enterprise-deployment/msi-install-and-configure.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ Non-interactive installations are silent and any additional configuration must b
7171

7272
### Common installation commands
7373

74-
> [!IMPORTANT]
75-
>
76-
> Admin rights are required to run any of the following commands.
74+
Admin rights are required to run any of the following commands.
7775

7876
#### Install interactively with verbose logging
7977

@@ -199,9 +197,7 @@ msiexec /x "DockerDesktop.msi" /quiet
199197

200198
### Configuration options
201199

202-
> [!IMPORTANT]
203-
>
204-
> In addition to the following custom properties, the Docker Desktop MSI installer also supports the standard [Windows Installer command line options](https://learn.microsoft.com/en-us/windows/win32/msi/standard-installer-command-line-options).
200+
In addition to the following custom properties, the Docker Desktop MSI installer also supports the standard [Windows Installer command line options](https://learn.microsoft.com/en-us/windows/win32/msi/standard-installer-command-line-options).
205201

206202
| Property | Description | Default |
207203
| :--- | :--- | :--- |

content/manuals/enterprise/security/enforce-sign-in/methods.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ Create the `registry.json` file (UTF-8 without BOM) at the appropriate location:
248248
> [!TIP]
249249
>
250250
> If users have issues starting Docker Desktop after enforcing sign-in,
251-
they may need to update to the latest version.
251+
> they may need to update to the latest version.
252252

253253
{{< /tab >}}
254254
{{< tab name="Command line setup" >}}
@@ -304,13 +304,9 @@ sudo hdiutil detach /Volumes/Docker
304304
When multiple configuration methods exist on the same system, Docker Desktop uses this precedence order:
305305

306306
1. Registry key (Windows only)
307-
2. Configuration profiles (macOS only)
308-
3. plist file (macOS only)
309-
4. registry.json file
310-
311-
> [!IMPORTANT]
312-
>
313-
> Docker Desktop version 4.36 and later supports multiple organizations in a single configuration. Earlier versions (4.35 and below) fail silently when multiple organizations are specified.
307+
1. Configuration profiles (macOS only)
308+
1. plist file (macOS only)
309+
1. registry.json file
314310

315311
## Troubleshoot sign-in enforcement
316312

content/manuals/enterprise/security/hardened-desktop/enhanced-container-isolation/_index.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ weight: 10
1515

1616
Enhanced Container Isolation (ECI) prevents malicious containers from compromising Docker Desktop or the host system. It applies advanced security techniques automatically while maintaining full developer productivity and workflow compatibility.
1717

18-
ECI strengthens container isolation and locks in security configurations created by administrators, such as [Registry Access Management policies](/manuals/enterprise/security/hardened-desktop/registry-access-management.md) and [Settings Management](../settings-management/_index.md) controls.
19-
20-
> [!NOTE]
21-
>
22-
> ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.
18+
- ECI strengthens container isolation and locks in security configurations created by administrators, such as [Registry Access Management policies](/manuals/enterprise/security/hardened-desktop/registry-access-management.md) and [Settings Management](../settings-management/_index.md) controls.
19+
- ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.
2320

2421
## Who should use Enhanced Container Isolation?
2522

26-
Enhanced Container Isolation is designed for:
23+
ECI is designed for:
2724

2825
- Organizations that want to prevent container-based attacks and reduce security vulnerabilities in developer environments
2926
- Security teams that need stronger container isolation without impacting developer workflows
@@ -32,15 +29,10 @@ Enhanced Container Isolation is designed for:
3229
## How Enhanced Container Isolation works
3330

3431
Docker implements ECI using the [Sysbox container runtime](https://github.com/nestybox/sysbox), a
35-
security-enhanced fork of the standard OCI runc runtime. When ECI is turned on, containers created through `docker run` or `docker create` automatically use Sysbox instead of runc without requiring any changes to developer workflows.
32+
security-enhanced fork of the standard OCI runc runtime. When ECI is turned on, containers created through `docker run` or `docker create` automatically use Sysbox instead of runc without requiring any changes to developer workflows. Docker's default runtime remains runc, but all user containers
33+
implicitly launch with Sysbox.
3634

37-
Even containers using the `--privileged` flag run securely with Enhanced Container Isolation, preventing them from breaching the Docker Desktop virtual machine or other containers.
38-
39-
> [!NOTE]
40-
>
41-
> When ECI is turned on, the Docker CLI `--runtime` flag is ignored.
42-
Docker's default runtime remains runc, but all user containers
43-
implicitly launch with Sysbox.
35+
When ECI is turned on, the Docker CLI `--runtime` flag is ignored. Even containers using the `--privileged` flag run securely with ECI, preventing them from breaching the Docker Desktop virtual machine or other containers.
4436

4537
## Key security features
4638

content/manuals/subscription/change.md

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ aliases:
1616
weight: 30
1717
---
1818

19-
{{% include "tax-compliance.md" %}}
20-
2119
You can upgrade or downgrade your Docker subscription at any time to match your changing needs. This page explains how to make subscription changes and what to expect with billing and feature access.
2220

23-
> [!NOTE]
24-
>
25-
> Legacy Docker subscribers have different interfaces for subscription changes. Legacy subscriptions apply to subscribers who last purchased or renewed before December 10, 2024. For details, see [Announcing Upgraded Docker Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/).
21+
{{% include "tax-compliance.md" %}}
2622

2723
## Upgrade your subscription
2824

@@ -40,12 +36,7 @@ you want to upgrade.
4036
1. Select **Billing**.
4137
1. Optional. If you're upgrading from a free Personal subscription to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/organization/convert-account.md).
4238
1. Select **Upgrade**.
43-
1. Follow the on-screen instructions to complete your upgrade.
44-
45-
> [!NOTE]
46-
>
47-
> If you choose to pay using a US bank account, you must verify the account. For
48-
> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
39+
1. Follow the on-screen instructions to complete your upgrade. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
4940

5041
{{< /tab >}}
5142
{{< tab name="Legacy Docker subscription" >}}
@@ -69,13 +60,10 @@ Consider the following before downgrading:
6960

7061
For feature limits in each tier, see [Docker Pricing](https://www.docker.com/pricing).
7162

63+
7264
{{< tabs >}}
7365
{{< tab name="Docker subscription" >}}
7466

75-
> [!IMPORTANT]
76-
>
77-
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
78-
7967
To downgrade your subscription:
8068

8169
1. Sign in to [Docker Home](https://app.docker.com/) and select
@@ -87,10 +75,6 @@ the organization you want to downgrade.
8775
{{< /tab >}}
8876
{{< tab name="Legacy Docker subscription" >}}
8977

90-
> [!IMPORTANT]
91-
>
92-
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
93-
9478
To downgrade your legacy Docker subscription:
9579

9680
1. Sign in to [Docker Hub](https://hub.docker.com/billing).
@@ -109,6 +93,10 @@ To downgrade your Docker Build Cloud subscription:
10993
{{< /tab >}}
11094
{{< /tabs >}}
11195

96+
> [!IMPORTANT]
97+
>
98+
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
99+
112100
## Subscription pause policy
113101

114102
You can't pause or delay a subscription. If a subscription invoice isn't paid by the due date, there's a 15-day grace period starting from the due date.

content/manuals/subscription/manage-seats.md

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,32 @@ weight: 20
1515

1616
You can add or remove seats from your Docker Team or Business subscription at any time to accommodate team changes. When you add seats mid-billing cycle, you're charged a prorated amount for the additional seats.
1717

18-
{{% include "tax-compliance.md" %}}
18+
> [!IMPORTANT]
19+
> If you have a sales-assisted Docker Business subscription,
20+
> contact your account manager to add seats to your subscription.
1921
2022
## Add seats to your subscription
2123

2224
{{< tabs >}}
2325
{{< tab name="Docker subscription" >}}
2426

25-
> [!IMPORTANT]
26-
>
27-
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.
28-
2927
To add seats:
3028

3129
1. Sign in to [Docker Home](https://app.docker.com/) and select your
3230
organization.
3331
1. Select **Billing**.
32+
- If you choose to pay using a US bank account, you must verify the account.
33+
- For more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
3434
1. Select **Add seats** and follow the on-screen instructions to complete
35-
adding seats. Note, you can't use pay by invoice for purchasing additional
36-
seats. You must use a card or US bank account.
37-
38-
> [!NOTE]
39-
>
40-
> If you choose to pay using a US bank account, you must verify the account. For
41-
> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
35+
adding seats.
36+
- You can't use pay by invoice for purchasing additional seats.
37+
- You must use a card or US bank account.
4238

4339
You can now add more members to your organization. For more information, see [Manage organization members](../admin/organization/members.md).
4440

4541
{{< /tab >}}
4642
{{< tab name="Legacy Docker subscription" >}}
4743

48-
> [!IMPORTANT]
49-
>
50-
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.
51-
5244
To add seats to your Legacy Docker subscription:
5345

5446
1. Sign in to [Docker Hub](https://hub.docker.com).
@@ -75,14 +67,11 @@ You can remove seats from your Team or Business subscription at any time. Change
7567

7668
For example, if you're billed on the 8th of every month for 10 seats and remove 2 seats on the 15th, the 2 seats remain available until your next billing cycle. Your payment for 8 seats begins on the next billing cycle.
7769

70+
7871
{{< tabs >}}
7972
{{< tab name="Docker subscription" >}}
8073

81-
> [!IMPORTANT]
82-
>
83-
> If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription.
84-
85-
To remove seats:
74+
If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats:
8675

8776
1. Sign in to [Docker Home](https://app.docker.com/) and select your
8877
organization.
@@ -95,11 +84,7 @@ You can cancel the removal of seats before your next billing cycle. To do so, se
9584
{{< /tab >}}
9685
{{< tab name="Legacy Docker subscription" >}}
9786

98-
> [!IMPORTANT]
99-
>
100-
> If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription.
101-
102-
To remove seats from your Legacy Docker subscription:
87+
If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats from your Legacy Docker subscription:
10388

10489
1. Sign in to [Docker Hub](https://hub.docker.com).
10590
1. Select your organization, then select **Billing**.

0 commit comments

Comments
 (0)