Skip to content

Remove call outs per style guide #24238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akristen merged 12 commits into from
Mar 4, 2026
+35 −92
Merged

Remove call outs per style guide #24238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
41a8abc
remove call outs to manage seats doc
akristen Feb 27, 2026
a6f9052
msi installer ctas
akristen Feb 27, 2026
90d255c
update ECI index
akristen Mar 3, 2026
4d4343b
billing cycle ctas
akristen Mar 3, 2026
d12bdb3
reorganized ctas in this doc to be less noisy
akristen Mar 3, 2026
401e73e
remove 1 cta
akristen Mar 3, 2026
5c932f0
Merge branch 'main' into cta-cleanup
akristen Mar 3, 2026
c8d04ae
cycle updates
akristen Mar 3, 2026
9d9cda7
fix bake errors
akristen Mar 3, 2026
318eb55
remove claude and add .claude to gitignore
akristen Mar 3, 2026
a4d59fb
apply tech writer feedback :)
akristen Mar 3, 2026
7db83e1
i'll figure out why my vsc is doing this and also remember to validat…
akristen Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ cagent
.cagent
.pr-body.md
.validation.log
.claude
23 changes: 4 additions & 19 deletions content/manuals/billing/cycle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
{{< tabs >}}
{{< tab name="Docker subscription" >}}

> [!IMPORTANT]
>
> Pay by invoice is not available for subscription upgrades or changes.
Pay by invoice is not available for subscription upgrades or changes.

To change your billing cycle:

Expand All @@ -44,13 +42,7 @@
1. On the plans and usage page, select **Switch to annual billing**.
1. Verify your billing information.
1. Select **Continue to payment**.
1. Verify payment information and select **Upgrade subscription**.

> [!NOTE]
>
> 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).
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).

Check warning on line 45 in content/manuals/billing/cycle.md

View workflow job for this annotation

GitHub Actions / validate (vale) 

[vale] reported by reviewdog 🐶
[Docker.We] Avoid using first-person plural like 'US'.

Raw Output:
{"message": "[Docker.We] Avoid using first-person plural like 'US'.", "location": {"path": "content/manuals/billing/cycle.md", "range": {"start": {"line": 45, "column": 97}}}, "severity": "WARNING"}

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

Expand All @@ -76,9 +68,7 @@
{{< tabs >}}
{{< tab name="Docker subscription" >}}

> [!IMPORTANT]
>
> Pay by invoice is not available for subscription upgrades or changes.
Pay by invoice is not available for subscription upgrades or changes.

Follow these steps to switch from a monthly to annual billing cycle for your
organization's Docker subscription:
Expand All @@ -89,13 +79,8 @@
1. On the plans and usage page, select **Switch to annual billing**.
1. Verify your billing information.
1. Select **Continue to payment**.
1. Verify payment information and select **Upgrade subscription**.
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).

Check warning on line 82 in content/manuals/billing/cycle.md

View workflow job for this annotation

GitHub Actions / validate (vale) 

[vale] reported by reviewdog 🐶
[Docker.We] Avoid using first-person plural like 'US'.

Raw Output:
{"message": "[Docker.We] Avoid using first-person plural like 'US'.", "location": {"path": "content/manuals/billing/cycle.md", "range": {"start": {"line": 82, "column": 97}}}, "severity": "WARNING"}

> [!NOTE]
>
> 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).

{{< /tab >}}
{{< tab name="Legacy Docker subscription" >}}
Expand Down
8 changes: 2 additions & 6 deletions content/manuals/enterprise/enterprise-deployment/msi-install-and-configure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ Non-interactive installations are silent and any additional configuration must b

### Common installation commands

> [!IMPORTANT]
>
> Admin rights are required to run any of the following commands.
Admin rights are required to run any of the following commands.

#### Install interactively with verbose logging

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

### Configuration options

> [!IMPORTANT]
>
> 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).
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).

| Property | Description | Default |
| :--- | :--- | :--- |
Expand Down
12 changes: 4 additions & 8 deletions content/manuals/enterprise/security/enforce-sign-in/methods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Create the `registry.json` file (UTF-8 without BOM) at the appropriate location:
> [!TIP]
>
> If users have issues starting Docker Desktop after enforcing sign-in,
they may need to update to the latest version.
> they may need to update to the latest version.

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

1. Registry key (Windows only)
2. Configuration profiles (macOS only)
3. plist file (macOS only)
4. registry.json file

> [!IMPORTANT]
>
> 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.
1. Configuration profiles (macOS only)
1. plist file (macOS only)
1. registry.json file

## Troubleshoot sign-in enforcement

Expand Down
20 changes: 6 additions & 14 deletions ...als/enterprise/security/hardened-desktop/enhanced-container-isolation/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@ weight: 10

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.

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.

> [!NOTE]
>
> ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.
- 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.
- ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.

## Who should use Enhanced Container Isolation?

Enhanced Container Isolation is designed for:
ECI is designed for:

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

Docker implements ECI using the [Sysbox container runtime](https://github.com/nestybox/sysbox), a
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.
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
implicitly launch with Sysbox.

Even containers using the `--privileged` flag run securely with Enhanced Container Isolation, preventing them from breaching the Docker Desktop virtual machine or other containers.

> [!NOTE]
>
> When ECI is turned on, the Docker CLI `--runtime` flag is ignored.
Docker's default runtime remains runc, but all user containers
implicitly launch with Sysbox.
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.

## Key security features

Expand Down
26 changes: 7 additions & 19 deletions content/manuals/subscription/change.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@
weight: 30
---

{{% include "tax-compliance.md" %}}

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.

> [!NOTE]
>
> 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/).
{{% include "tax-compliance.md" %}}

## Upgrade your subscription

Expand All @@ -40,12 +36,7 @@
1. Select **Billing**.
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).
1. Select **Upgrade**.
1. Follow the on-screen instructions to complete your upgrade.

> [!NOTE]
>
> 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).
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).

Check warning on line 39 in content/manuals/subscription/change.md

View workflow job for this annotation

GitHub Actions / validate (vale) 

[vale] reported by reviewdog 🐶
[Docker.We] Avoid using first-person plural like 'US'.

Raw Output:
{"message": "[Docker.We] Avoid using first-person plural like 'US'.", "location": {"path": "content/manuals/subscription/change.md", "range": {"start": {"line": 39, "column": 93}}}, "severity": "WARNING"}

{{< /tab >}}
{{< tab name="Legacy Docker subscription" >}}
Expand All @@ -69,13 +60,10 @@

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


{{< tabs >}}
{{< tab name="Docker subscription" >}}

> [!IMPORTANT]
>
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.

To downgrade your subscription:

1. Sign in to [Docker Home](https://app.docker.com/) and select
Expand All @@ -87,10 +75,6 @@
{{< /tab >}}
{{< tab name="Legacy Docker subscription" >}}

> [!IMPORTANT]
>
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.

To downgrade your legacy Docker subscription:

1. Sign in to [Docker Hub](https://hub.docker.com/billing).
Expand All @@ -109,6 +93,10 @@
{{< /tab >}}
{{< /tabs >}}

> [!IMPORTANT]
>
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.

## Subscription pause policy

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.
37 changes: 11 additions & 26 deletions content/manuals/subscription/manage-seats.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,32 @@

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.

{{% include "tax-compliance.md" %}}
> [!IMPORTANT]
> If you have a sales-assisted Docker Business subscription,
> contact your account manager to add seats to your subscription.

## Add seats to your subscription

{{< tabs >}}
{{< tab name="Docker subscription" >}}

> [!IMPORTANT]
Copy link
Contributor

@aevesdocker aevesdocker Mar 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand why you've made this change, but I think it actually gets lost moving it out of the callout 🤔

Maybe it's worth having a combined callout at the top saying "If you have a sales-assisted Docker Business subscription, contact your account manager to add or remove seats to your subscription".
I'd then remove the tax callout (pretty sure you'll get the go-ahead to remove it anyway)

Copy link
Contributor Author

@akristen akristen Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, sweet. i'll make a follow up task to figure out what to do with all of these tax compliance call outs tbh.

>
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.

To add seats:

1. Sign in to [Docker Home](https://app.docker.com/) and select your
organization.
1. Select **Billing**.
- If you choose to pay using a US bank account, you must verify the account.

Check warning on line 32 in content/manuals/subscription/manage-seats.md

View workflow job for this annotation

GitHub Actions / validate (vale) 

[vale] reported by reviewdog 🐶
[Docker.We] Avoid using first-person plural like 'US'.

Raw Output:
{"message": "[Docker.We] Avoid using first-person plural like 'US'.", "location": {"path": "content/manuals/subscription/manage-seats.md", "range": {"start": {"line": 32, "column": 35}}}, "severity": "WARNING"}
- For more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
1. Select **Add seats** and follow the on-screen instructions to complete
adding seats. Note, you can't use pay by invoice for purchasing additional
seats. You must use a card or US bank account.

> [!NOTE]
>
> 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).
adding seats.
- You can't use pay by invoice for purchasing additional seats.
- You must use a card or US bank account.

Check warning on line 37 in content/manuals/subscription/manage-seats.md

View workflow job for this annotation

GitHub Actions / validate (vale) 

[vale] reported by reviewdog 🐶
[Docker.We] Avoid using first-person plural like 'US'.

Raw Output:
{"message": "[Docker.We] Avoid using first-person plural like 'US'.", "location": {"path": "content/manuals/subscription/manage-seats.md", "range": {"start": {"line": 37, "column": 29}}}, "severity": "WARNING"}

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

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

> [!IMPORTANT]
>
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.

To add seats to your Legacy Docker subscription:

1. Sign in to [Docker Hub](https://hub.docker.com).
Expand All @@ -75,14 +67,11 @@

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.


{{< tabs >}}
{{< tab name="Docker subscription" >}}

> [!IMPORTANT]
>
> If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription.

To remove seats:
If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats:

1. Sign in to [Docker Home](https://app.docker.com/) and select your
organization.
Expand All @@ -95,11 +84,7 @@
{{< /tab >}}
{{< tab name="Legacy Docker subscription" >}}

> [!IMPORTANT]
>
> 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:
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:

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