diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index 93818c67a7..9e45ad9f1f 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -51,21 +51,20 @@ The [Docker Admin Console](https://app.docker.com/admin) provides administrators A company groups multiple Docker organizations for centralized configuration. Companies are only available for Docker Business subscribers. -Companies have the following administrator role available: +Companies have the company owner administrator role available: -- Company owner: Can view and manage all organizations within the company. -Has full access to company-wide settings and inherits the same permissions as -organization owners. +- Can view and manage all organizations within the company +- Has full access to company-wide settings and inherits the same permissions as organization owners +- Do not occupy a seat ### Organization An organization contains teams and repositories. All Docker Team and Business subscribers must have at least one organization. -Organizations have the following administrator role available: +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. -- Organization owner: Can manage organization settings, users, and access -controls. +While creating a company is optional, organizations are required for Team and Business subscriptions. ### Team @@ -78,11 +77,6 @@ or functions. A member is any Docker user added to an organization. Organization and company owners can assign roles to members to define their level of access. -> [!NOTE] -> -> Creating a company is optional, but organizations are required for Team and -Business subscriptions. - ## Admin Console features Docker's [Admin Console](https://app.docker.com/admin) allows you to: diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 941c7ac38b..0d29918d78 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -112,7 +112,7 @@ After accepting an invitation, you are now a member of the organization. ## Manage invitations -After inviting members, you can resend or remove invitations as needed. +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. ### Resend an invitation @@ -159,9 +159,7 @@ organization. 1. Select the team name. 1. Select **Add member**. You can add the member by searching for their email address or username. - > [!NOTE] - > - > An invitee must first accept the invitation to join the organization before being added to the team. +An invitee must first accept the invitation to join the organization before being added to the team. ### Remove members from teams diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 00b84fef11..5e14d5253b 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -13,11 +13,10 @@ This page describes how to create an organization. ## Prerequisites -Before you begin creating an organization: +Before you create an organization, you need a [Docker ID](/accounts/create-account/). -- You need a [Docker ID](/accounts/create-account/) -- Review the [Docker subscriptions and features](https://www.docker.com/pricing/) - to determine what subscription to choose for your organization +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. ## Create an organization diff --git a/content/manuals/billing/payment-method.md b/content/manuals/billing/payment-method.md index b4deb75836..0c6afd1479 100644 --- a/content/manuals/billing/payment-method.md +++ b/content/manuals/billing/payment-method.md @@ -11,11 +11,7 @@ This page describes how to add or update a payment method for your personal account or for an organization. You can add a payment method or update your account's existing payment method -at any time. - -> [!IMPORTANT] -> -> If you want to remove all payment methods, you must first downgrade your +at any time. If you want to remove all payment methods, you must first downgrade your subscription to a free subscription. See [Downgrade](../subscription/change.md). The following payment methods are supported: @@ -75,10 +71,7 @@ the **Set as default** action. 1. Optional. You can remove non-default payment methods by selecting the **Delete** action. -> [!NOTE] -> -> If you want to set a US bank account as your default payment method, you must -> [verify the account](#verify-a-bank-account) first. +If you want to set a US bank account as your default payment method, you must [verify the account](#verify-a-bank-account) first. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -108,9 +101,7 @@ the **Actions** icon. Then, select **Delete**. ### Organization -> [!NOTE] -> -> You must be an organization owner to make changes to the payment information. +You must be an organization owner to make changes to the payment information. {{< tabs >}} {{< tab name="Docker subscription" >}} @@ -142,10 +133,7 @@ the **Set as default** action. 1. Optional. You can remove non-default payment methods by selecting the **Delete** action. -> [!NOTE] -> -> If you want to set a US bank account as your default payment method, you must -> verify the account first. +If you want to set a US bank account as your default payment method, you must verify the account first. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -194,6 +182,8 @@ organization. 1. Confirm your billing contact details. If you need to change them, select **Change** and enter your new details. +If you want to pay by invoice, [upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing/). + ## Verify a bank account There are two ways to verify a bank account as a payment method: @@ -246,9 +236,7 @@ verification email and enter the amount of this deposit to verify your account. ## Failed payments -> [!NOTE] -> -> You can't manually retry a failed payment. Docker will retry failed payments +You can't manually retry a failed payment. Docker will retry failed payments based on the retry schedule. If your subscription payment fails, there is a grace period of 15 days, diff --git a/content/manuals/enterprise/security/roles-and-permissions/core-roles.md b/content/manuals/enterprise/security/roles-and-permissions/core-roles.md index a426a90c7c..16521e3add 100644 --- a/content/manuals/enterprise/security/roles-and-permissions/core-roles.md +++ b/content/manuals/enterprise/security/roles-and-permissions/core-roles.md @@ -21,9 +21,7 @@ Docker organizations have three core roles: - **Editor**: Partial administrative access. Editors can create, edit, and delete repositories. They can also manage team permissions for repositories. - **Owner**: Full administrative access. Owners can manage all organization settings, including repositories, teams, members, billing, and security features. -> [!NOTE] -> -> A company owner has the same organization management permissions as an organization owner, but there are some content and registry permissions that company owners don't have (for example, repository pull/push). For more information, see [Company overview](/admin/company/). +A company owner has the same organization management permissions as an organization owner, but there are some content and registry permissions that company owners don't have (for example, repository pull/push). For more information, see [Company overview](/admin/company/). ### Content and registry permissions @@ -77,6 +75,13 @@ beyond their organization role: | Manage seats | ❌ | ❌ | ✅ | | Upgrade and downgrade plans | ❌ | ❌ | ✅ | +> [!TIP] +> +> If you want more granular access control, you can +> [upgrade to a Docker Business plan](https://www.docker.com/pricing/) +> for custom roles and advanced permissions. + + _\* If not part of a company_ ### Docker Scout permissions diff --git a/content/manuals/subscription/change.md b/content/manuals/subscription/change.md index d5f9b429b8..be93096cbe 100644 --- a/content/manuals/subscription/change.md +++ b/content/manuals/subscription/change.md @@ -26,7 +26,9 @@ You can upgrade or downgrade your Docker subscription at any time to match your ## Upgrade your subscription -When you upgrade your Docker subscription, you immediately get access to all features and entitlements in your new subscription tier. For detailed feature information, see [Docker Pricing](https://www.docker.com/pricing). +When you upgrade your Docker subscription, you immediately get access to all features and entitlements in your new subscription tier. + +For detailed feature information, see [Docker Pricing](https://www.docker.com/pricing). {{< tabs >}} {{< tab name="Docker subscription" >}} diff --git a/content/manuals/subscription/faq.md b/content/manuals/subscription/faq.md index 3e330daa0f..1d42b9cf57 100644 --- a/content/manuals/subscription/faq.md +++ b/content/manuals/subscription/faq.md @@ -7,7 +7,7 @@ tags: [FAQ] weight: 50 --- -For more information on Docker subscriptions, see [Docker subscription overview](_index.md). +For more information on Docker subscriptions, see [Docker subscription overview](_index.md). ## Can I transfer my subscription from one user or organization account to another? @@ -29,3 +29,7 @@ Docker offers two content contribution programs: - [Docker Verified Publisher (DVP)](../docker-hub/repos/manage/trusted-content/dvp-program.md) for commercial publishers You can also join the [Developer Preview Program](https://www.docker.com/community/get-involved/developer-preview/) or sign up for early access programs to participate in research and try new features. + +> [!TIP] +> +> Need to upgrade? Compare Docker Team and Docker Business to choose the plan that best fits your team's needs. \ No newline at end of file diff --git a/content/manuals/support/_index.md b/content/manuals/support/_index.md index 973720e2a7..be2db8cfc7 100644 --- a/content/manuals/support/_index.md +++ b/content/manuals/support/_index.md @@ -21,11 +21,9 @@ All Docker Pro, Team, and Business subscribers receive email support for Docker - Docker Team: 2 business day response, 24×5 availability - Docker Business: 1 business day response, 24×5 availability -> [!NOTE] +> [!TIP] > -> Premium Support with faster response times and 24×7 availability is available as an add-on for Docker Business subscribers. - -For detailed support features and response times, see [Docker Pricing](https://www.docker.com/pricing/). +> Premium Support with faster response times and 24×7 availability is available as an add-on for [Docker Business subscribers](https://www.docker.com/pricing/). ### Support severity levels