diff --git a/content/admin/company/settings/sso.md b/content/admin/company/settings/sso.md index b34fb60f23..417f5c2d81 100644 --- a/content/admin/company/settings/sso.md +++ b/content/admin/company/settings/sso.md @@ -1,7 +1,7 @@ --- -description: Single Sign-on -keywords: Single Sign-on, SSO, sign-on -title: Single Sign-On overview +description: Overview of Single Sign-On for companies. +keywords: Single Sign-On, SSO, sign-on +title: Single Sign-On overview for companies --- {{< include "admin-early-access.md" >}} diff --git a/content/admin/organization/general-settings.md b/content/admin/organization/general-settings.md index 7923da0879..be6ce33df5 100644 --- a/content/admin/organization/general-settings.md +++ b/content/admin/organization/general-settings.md @@ -1,7 +1,7 @@ --- description: Learn how about general settings for organizations. keywords: organization, settings -title: General settings +title: General organization settings --- {{< include "admin-early-access.md" >}} diff --git a/content/admin/organization/members.md b/content/admin/organization/members.md index 73d2316243..2d111bc017 100644 --- a/content/admin/organization/members.md +++ b/content/admin/organization/members.md @@ -1,7 +1,7 @@ --- description: Manage organization members keywords: members, teams, organizations -title: Manage members +title: Manage organization members --- {{< include "admin-early-access.md" >}} diff --git a/content/admin/organization/security-settings/sso.md b/content/admin/organization/security-settings/sso.md index 91899470e1..5683bdbdda 100644 --- a/content/admin/organization/security-settings/sso.md +++ b/content/admin/organization/security-settings/sso.md @@ -1,7 +1,7 @@ --- -description: Single sign-on overview -keywords: Single sign-on, SSO, sign-on -title: Single Sign-On overview +description: Single Sign-On overview for organizations +keywords: Single Sign-On, SSO, sign-on +title: Single Sign-On overview for organizations --- {{< include "admin-early-access.md" >}} diff --git a/content/docker-hub/2fa/recover-hub-account.md b/content/docker-hub/2fa/recover-hub-account.md index cc410e5c25..eb0343f897 100644 --- a/content/docker-hub/2fa/recover-hub-account.md +++ b/content/docker-hub/2fa/recover-hub-account.md @@ -1,8 +1,8 @@ --- -description: Recover your Docker Hub account +description: Recover your Docker account keywords: Docker, docker, registry, security, Docker Hub, authentication, two-factor authentication -title: Recover your Docker Hub account +title: Recover your Docker account --- If you have lost access to both your two-factor authentication application and your recovery code: diff --git a/content/docker-hub/builds/_index.md b/content/docker-hub/builds/_index.md index 436560527d..6591f53ac6 100644 --- a/content/docker-hub/builds/_index.md +++ b/content/docker-hub/builds/_index.md @@ -49,7 +49,7 @@ when the tests succeed. 5. Optional: Enable [autotests](automated-testing.md#enable-automated-tests-on-a-repository). -6. Review the default **Build Rules** +6. Review the default **Build Rules**. Build rules control what Docker Hub builds into images from the contents of the source code repository, and how the resulting images are tagged @@ -231,7 +231,7 @@ Docker build system, add the [environment variable](index.md#environment-variabl `DOCKER_BUILDKIT=0`. Refer to the [BuildKit](../../build/buildkit/index.md) page for more information on BuildKit. -## Autobuild for Teams +## Autobuild for teams When you create an automated build repository in your own user account, you can start, cancel, and retry builds, and edit and delete your own repositories. diff --git a/content/docker-hub/builds/advanced.md b/content/docker-hub/builds/advanced.md index 383dad017a..d1b42daa84 100644 --- a/content/docker-hub/builds/advanced.md +++ b/content/docker-hub/builds/advanced.md @@ -103,11 +103,11 @@ The following hooks are available: Docker Hub allows you to define build environment variables either in the hook files, or from the automated build interface, which you can then reference in hooks. -In the following example, we define a build hook that uses `docker build` arguments -to set the variable `CUSTOM` based on the value of variable we defined using the -Docker Hub build settings. `$DOCKERFILE_PATH` is a variable that we provide with -the name of the Dockerfile we wish to build, and `$IMAGE_NAME` is the name of -the image being built. +The following example defines a build hook that uses `docker build` arguments to +set the variable `CUSTOM` based on the value of variable defined using the +Docker Hub build settings. `$DOCKERFILE_PATH` is a variable that you provide +with the name of the Dockerfile you want to build, and `$IMAGE_NAME` is the name +of the image being built. ```console $ docker build --build-arg CUSTOM=$VAR -f $DOCKERFILE_PATH -t $IMAGE_NAME . @@ -122,7 +122,7 @@ the automated build fails. Refer to the [docker build documentation](../../engine/reference/commandline/build.md#build-arg) to learn more about Docker build-time variables. -#### Push to multiple repos +#### Push to multiple repositories By default the build process pushes the image only to the repository where the build settings are configured. If you need to push the same image to multiple @@ -137,7 +137,7 @@ $ docker push $DOCKER_REPO:$SOURCE_COMMIT ## Source repository or branch clones When Docker Hub pulls a branch from a source code repository, it performs -a shallow clone, it clones only the tip of the specified branch. This has the advantage +a shallow clone, it clones only the tip of the specified branch. This has the advantage of minimizing the amount of data transfer necessary from the repository and speeding up the build because it pulls only the minimal code necessary. diff --git a/content/docker-hub/builds/automated-testing.md b/content/docker-hub/builds/automated-testing.md index 243123a4d4..3b1e924c14 100644 --- a/content/docker-hub/builds/automated-testing.md +++ b/content/docker-hub/builds/automated-testing.md @@ -65,7 +65,7 @@ in the `test.yml` files. ## Enable Automated tests on a repository To enable testing on a source code repository, you must first create an -associated build-repository in Docker Hub. Your `Autotest` settings are +associated build-repository in Docker Hub. Your `Autotest` settings are configured on the same page as [automated builds](index.md), however you do not need to enable Autobuilds to use `Autotest`. Autobuild is enabled per branch or tag, and you do not need to enable it at all. diff --git a/content/docker-hub/builds/link-source.md b/content/docker-hub/builds/link-source.md index d8d4f34600..5ffde588f4 100644 --- a/content/docker-hub/builds/link-source.md +++ b/content/docker-hub/builds/link-source.md @@ -2,7 +2,7 @@ description: Link to GitHub and BitBucket keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, trusted, builds, trusted builds, automated builds, GitHub -title: Configure Automated builds from GitHub and BitBucket +title: Configure automated builds from GitHub and BitBucket aliases: - /docker-hub/github/ - /docker-hub/bitbucket/ @@ -29,7 +29,7 @@ If you are linking a source code provider to create autobuilds for a team, follo 3. Select **Link provider** for the source provider you want to link. - If you want to unlink your current GitHub account and relink to a new GitHub account, make sure to completely logout of [GitHub](https://github.com/) before linking via Docker Hub. + If you want to unlink your current GitHub account and relink to a new GitHub account, make sure to completely sign out of [GitHub](https://github.com/) before linking via Docker Hub. 4. Review the settings for the **Docker Hub Builder** OAuth application. @@ -83,12 +83,12 @@ To revoke Docker Hub's access to an organization's GitHub repositories: 1. From your GitHub Account settings, locate the **Organization settings** section at the lower left. -2. Click the organization you want to revoke Docker Hub's access to. +2. Select the organization you want to revoke Docker Hub's access to. -3. From the Organization Profile menu, click **Third-party access**. +3. From the Organization Profile menu, select **Third-party access**. The page displays a list of third party applications and their access status. -4. Click the pencil icon next to Docker Hub Builder. +4. Select the pencil icon next to Docker Hub Builder. 5. On the next page, select **Deny access**. diff --git a/content/docker-hub/builds/troubleshoot.md b/content/docker-hub/builds/troubleshoot.md index 4a506832ea..93a8f441f8 100644 --- a/content/docker-hub/builds/troubleshoot.md +++ b/content/docker-hub/builds/troubleshoot.md @@ -1,5 +1,5 @@ --- -title: Troubleshoot your builds +title: Troubleshoot your autobuilds description: How to troubleshoot Automated builds keywords: docker hub, troubleshoot, automated builds, autobuilds --- diff --git a/content/docker-hub/configure-sign-in.md b/content/docker-hub/configure-sign-in.md index cb4cd0346a..60c1a54534 100644 --- a/content/docker-hub/configure-sign-in.md +++ b/content/docker-hub/configure-sign-in.md @@ -2,7 +2,7 @@ description: Configure registry.json to enforce users to sign into Docker Desktop toc_max: 2 keywords: authentication, registry.json, configure, -title: Configure registry.json to enforce sign-in +title: Enforce sign-in for Desktop --- By default, members of your organization can use Docker Desktop on their machines without signing in to any Docker account. To ensure that a user signs in to a Docker account that is a member of your organization and that the diff --git a/content/docker-hub/convert-account.md b/content/docker-hub/convert-account.md index 91e69d6631..5e01724099 100644 --- a/content/docker-hub/convert-account.md +++ b/content/docker-hub/convert-account.md @@ -7,7 +7,7 @@ keywords: docker hub, hub, organization You can convert an existing user account to an organization. This is useful if you need multiple users to access your account and the repositories that it’s connected to. Converting it to an organization gives you better control over permissions for these users through [teams](manage-a-team.md). When you convert a user account to an organization, the account -is migrated to a Team plan and charged $35 per month for 5 seats. For more information, +is migrated to a Team plan that requires a paid subscription. For more information, see [Docker Pricing](https://www.docker.com/pricing). > **Important** @@ -30,7 +30,7 @@ Before you convert a user account to an organization, ensure that you meet the f - You must have a separate Docker ID ready to assign it as the owner of the organization during conversion. - If you wish to convert your user account into an organization account and you do not have any other user accounts, you need to create a new user account to assign it as the owner of the new organization. With the owner role assigned, this user account has full administrative access to configure and manage the organization. You can assign more users the owner role after the conversion. + If you want to convert your user account into an organization account and you don't have any other user accounts, you need to create a new user account to assign it as the owner of the new organization. With the owner role assigned, this user account has full administrative access to configure and manage the organization. You can assign more users the owner role after the conversion. ## Convert an account into an organization @@ -44,4 +44,4 @@ Before you convert a user account to an organization, ensure that you meet the f 5. Enter a **Docker ID** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert. -6. Select **Convert and Purchase** to confirm. The new owner receives a notification email. Use that owner account to log in to your new organization. \ No newline at end of file +6. Select **Convert and Purchase** to confirm. The new owner receives a notification email. Use that owner account to sign in to your new organization. \ No newline at end of file diff --git a/content/docker-hub/deactivate-account.md b/content/docker-hub/deactivate-account.md index b394d88ca5..05eabed510 100644 --- a/content/docker-hub/deactivate-account.md +++ b/content/docker-hub/deactivate-account.md @@ -8,14 +8,14 @@ You can deactivate an account at any time. >**Warning** > -> If your Docker Hub account or organization is linked to other Docker products and services, deactivating your account also removes access to those products and services. +> All Docker products and services that use your Docker account or organization account will be inaccessible after deactivating your account. { .warning } ## Deactivate a user account ### Prerequisites -Before deactivating your Docker Hub account, ensure that you meet the following requirements: +Before deactivating your Docker account, ensure that you meet the following requirements: - You must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company. @@ -45,7 +45,7 @@ Once you have completed all the steps above, you can deactivate your account. ## Deactivate an organization -Before deactivating an organization, please complete the following: +Before deactivating an organization, complete the following: - Download any images and tags you want to keep: `docker pull -a :`. diff --git a/content/docker-hub/service-accounts.md b/content/docker-hub/service-accounts.md index af4f8b575f..0592f6f28c 100644 --- a/content/docker-hub/service-accounts.md +++ b/content/docker-hub/service-accounts.md @@ -6,7 +6,7 @@ title: Service accounts > **Note** > -> Service accounts requires a +> Service accounts require a > [Docker Team, or Business subscription](../subscription/index.md). A service account is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the organization. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process. @@ -49,7 +49,7 @@ To create a new service account for your Team account: > **Note** > -> If you want a read-only PAT just for your open-source repos, or to access +> If you want a read-only PAT just for your open-source repositories, or to access official images and other public images, you don't have to grant any access permissions to the new Docker ID. ## Additional information @@ -57,4 +57,4 @@ official images and other public images, you don't have to grant any access perm Refer to the following topics for additional information: - [Mirroring Docker Hub](../registry/recipes/mirror.md) -- [Resource Consumption Updates FAQ](https://www.docker.com/pricing/resource-consumption-updates) \ No newline at end of file +- [Docker pricing FAQs](https://www.docker.com/pricing/faq/) \ No newline at end of file diff --git a/content/docker-hub/webhooks.md b/content/docker-hub/webhooks.md index 33de80a094..826ffd4fb6 100644 --- a/content/docker-hub/webhooks.md +++ b/content/docker-hub/webhooks.md @@ -10,18 +10,18 @@ You can use webhooks to cause an action in another service in response to a push To create a webhook: 1. In your chosen repository, select the **Webhooks** tab. -2. Provide a name for the webhook +2. Provide a name for the webhook. 3. Provide a destination webhook URL. This is where webhook POST requests are delivered. -4. Select **Create**. +4. Select **Create**. ## View webhook delivery history To view the history of the webhook: -1. Hover over your webhook under the **Current Webhooks section**. +1. Hover over your webhook under the **Current Webhooks section**. 2. Select the **Menu options** icon. -3. Select **View History**. +3. Select **View History**. -You can then view the delivery history, and whether delivering the POST request was successful or not: +You can then view the delivery history, and whether delivering the POST request was successful or not. ## Example webhook payload @@ -79,7 +79,7 @@ The following parameters are recognized in callback data: * `target_url`: The URL where the results of the operation can be found. Can be retrieved on the Docker Hub. -*Example callback payload:* +The following is an example of a callback payload: { "state": "success", diff --git a/content/single-sign-on/_index.md b/content/single-sign-on/_index.md index 4974cc8344..beacf02bf9 100644 --- a/content/single-sign-on/_index.md +++ b/content/single-sign-on/_index.md @@ -1,7 +1,7 @@ --- -description: Single Sign-on -keywords: Single Sign-on, SSO, sign-on -title: Overview +description: Overview of Single Sign-On +keywords: Single Sign-On, SSO, sign-on +title: Single Sign-On overview --- {{% admin-sso product="hub" %}} \ No newline at end of file diff --git a/content/single-sign-on/configure/_index.md b/content/single-sign-on/configure/_index.md index b78f4d76ed..c488694461 100644 --- a/content/single-sign-on/configure/_index.md +++ b/content/single-sign-on/configure/_index.md @@ -1,7 +1,7 @@ --- -description: SSO configuration +description: Learn how to configure Single Sign-On for your organization or company. keywords: configure, sso, docker hub, hub -title: Configure +title: Configure Single Sign-On aliases: - /docker-hub/domains/ - /docker-hub/sso-connection/ diff --git a/content/single-sign-on/manage/_index.md b/content/single-sign-on/manage/_index.md index 479602cb54..1dda9be6d6 100644 --- a/content/single-sign-on/manage/_index.md +++ b/content/single-sign-on/manage/_index.md @@ -1,7 +1,7 @@ --- -description: Manage SSO +description: Learn how to manage Single Sign-On for your organization or company. keywords: manage, single sign-on, SSO, sign-on -title: Manage SSO +title: Manage Single Sign-On --- ## Manage organizations diff --git a/layouts/shortcodes/admin-domains.html b/layouts/shortcodes/admin-domains.html index 7b44699e91..63f6625ae8 100644 --- a/layouts/shortcodes/admin-domains.html +++ b/layouts/shortcodes/admin-domains.html @@ -6,7 +6,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "[Docker Admin](https://admin.docker.com)" }} - {{ $domain_navigation := "Select your organization in the left navigation drop-down menu, and then select **Domain management**." }} + {{ $domain_navigation = "Select your organization in the left navigation drop-down menu, and then select **Domain management**." }} {{ if eq (.Get "layer") "company" }} {{ $domain_navigation = "Select your company in the left navigation drop-down menu, and then select **Domain management**." }} {{ end }}