Merge pull request #14625 from docker/master

Publish updates from master

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,11 @@
 <!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
     for this project's contribution guidelines. Remove these comments
-    as you go.
+    as you go.-->
-
-    Help us merge your changes more quickly by adding details and setting metadata
-    (such as labels, milestones, and reviewers) over at the right-hand side.-->
 
 ### Proposed changes
 
 <!--Tell us what you did and why-->
 
-### Unreleased project version (optional)
-
-<!--If this change only applies to an unreleased version of a project, note
-    that here and base your work on the `vnext-` branch for your project. If
-    this doesn't apply to this PR, you can remove this whole section.
-    Set a milestone if appropriate. -->
-
 ### Related issues (optional)
 
 <!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.

_config_production.yml

@@ -51,6 +51,26 @@ defaults:
 
   # Set the correct edit-URL for upstream resources. We usually don't create a direct
   # edit link for these, and instead point to the directory that contains the file.
+  - scope:
+      path: cloud/aci-compose-features.md
+    values:
+      edit_url: "https://github.com/docker/compose-cli/tree/master/docs/"
+  - scope:
+      path: cloud/aci-container-features.md
+    values:
+      edit_url: "https://github.com/docker/compose-cli/tree/master/docs/"
+  - scope:
+      path: cloud/ecs-architecture.md
+    values:
+      edit_url: "https://github.com/docker/compose-cli/tree/master/docs/"
+  - scope:
+      path: cloud/ecs-compose-features.md
+    values:
+      edit_url: "https://github.com/docker/compose-cli/tree/master/docs/"
+  - scope:
+      path: cloud/ecs-compose-examples.md
+    values:
+      edit_url: "https://github.com/docker/compose-cli/tree/master/docs/"
   - scope:
       path: engine/deprecated.md
     values:

_data/toc.yaml

@@ -47,7 +47,7 @@ guides:
       path: /get-started/09_image_best/
     - title: "Part 10: What next?"
       path: /get-started/11_what_next/
-- sectiontitle: Language-specific guides (New)
+- sectiontitle: Language-specific guides
   section:
   - path: /language/
     title: Overview

docker-hub/2fa/recover-hub-account.md

@@ -4,38 +4,6 @@ keywords: Docker, docker, registry, security, Docker Hub, authentication, two-fa
 title: Recover your Docker Hub account
 ---
 
-If you have lost your two-factor authentication device and need to access your
-Docker Hub account, you can gain access to your account using your two-factor
-authentication recovery code.
-
-## Prerequisites
-
-Two-factor authentication is enabled on your Docker Hub account and you have
-your two-factor authentication recovery code.
-
-> If you lose both your 2FA authentication device and recovery code, you may
-> not be able to recover your account.
-{: .important }
-
-## Recover your Docker Hub account with a recovery code
-
-Go through the login process on Docker Hub. When you're asked to enter your
-two-factor authentication code, click **I've lost my authentication device**.
-
-![Lost authentication device](../images/2fa-enter-2fa-code.png){:width="250px"}
-
-On the next screen, click "I have my recovery code".
-
-![You have your code](../images/2fa-have-recovery-code.png){:width="250px"}
-
-Enter your recovery code.
-
-![Enter recovery code](../images/2fa-enter-recover-code.png){:width="250px"}
-
-Once you have used your recovery code, you will have to re-enable two-factor
-authentication. See [Enabling two-factor authentication on Docker Hub](/docker-hub/2fa).
-
-## Alternative recovery methods
 
 If you have lost access to both your two-factor authentication application and
 your recovery code, get in touch with our Support team using the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout){:target="_blank" rel="noopener" class="_"}. You must enter the primary email address associated with your Docker ID in the Contact Support form for recovery instructions.

docker-hub/audit-log.md

@@ -5,33 +5,33 @@ title: Audit log
 ---
 
 {% include upgrade-cta.html
-  body="The Audit log feature is available for users subscribed to a Docker Team or a Business subscription. Upgrade now to start tracking events across your organization."
+  body="Audit log is available for users subscribed to a Docker Team or a Business subscription. Upgrade now to start tracking events across your organization."
   header-text="This feature requires a paid Docker subscription"
   target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_audit_log"
 %}
 
-Audit log displays a chronological list of activities that occur at organization and repository levels. It provides owners of Docker Team accounts a report of all their team member activities. This allows the team owners to view and track what changes were made, the date when a change was made, and who initiated the change. For example, the Audit log displays activities such as the date when a repository was created or deleted, the team member who created the repository, the name of the repository, and when there was a change to the privacy settings.
+Audit log displays a chronological list of activities that occur at organization and repository levels. It provides owners of Docker Team accounts a report of all their team member activities. This allows the team owners to view and track what changes were made, the date when a change was made, and who initiated the change. For example, the audit log displays activities such as the date when a repository was created or deleted, the team member who created the repository, the name of the repository, and when there was a change to the privacy settings.
 
-Team owners can also see the Audit log for their repository if the repository is part of the organization subscribed to a Docker Team plan.
+Team owners can also see the audit log for their repository if the repository is part of the organization subscribed to a Docker Team plan.
 
-## View the Audit log
+## View the audit log
 
-To view the Audit log:
+To view the audit log:
 
 1. Sign into an owner account for the organization in Docker Hub.
 2. Select your organization from the list and then click on the **Activity** tab.
 
     ![Organization activity tab](images/org-activity-tab.png){:width="700px"}
 
-The Audit log begins tracking activities from the date the feature is live, that is from **25 January 2021**. Activities that took place before this date are not captured.
+The audit log begins tracking activities from the date the feature is live, that is from **25 January 2021**. Activities that took place before this date are not captured.
 
 > **Note**
 >
-> Docker will retain the Audit log activity data for a period of three months.
+> Docker will retain the audit log activity data for a period of three months.
 
-## Customize the Audit log
+## Customize the audit log
 
-By default, all activities that occur at organization and repository levels are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the **Activity** tab displays the Audit log of all the activities that occurred during that period.
+By default, all activities that occur at organization and repository levels are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the **Activity** tab displays the audit log of all the activities that occurred during that period.
 
 ![Activities list](images/activity-list.png){:width="600px"}
 
@@ -39,7 +39,7 @@ By default, all activities that occur at organization and repository levels are
 
 > **Note**
 >
-> Activities created by the Docker Support team as part of resolving customer issues appear in the Audit log as **dockersupport**.
+> Activities created by the Docker Support team as part of resolving customer issues appear in the audit log as **dockersupport**.
 
 <br />
 

language/index.md

@@ -39,6 +39,4 @@ Learn how to set up your Docker environment and start containerizing your applic
     </div>
 </div>
 
-To request a guide in other programming languages, create an issue in the [Docker Docs github repository](https://github.com/docker/docker.github.io/issues/new?title=Language-specific%20guides%20request){:target="_blank" rel="noopener" class="_"}.
-
 <br />

reference/index.md

@@ -37,5 +37,5 @@ various APIs, CLIs, and file formats.
 | Driver                                                 | Description                                                                        |
 |:-------------------------------------------------------|:-----------------------------------------------------------------------------------|
 | [Image specification](/registry/spec/manifest-v2-2/)   | Describes the various components of a Docker image                                 |
-| [Registry token authentication](/registry/spec/auth/)  | Outlines the Docker registry authentication scheme                                 |
+| [Registry token authentication](/registry/spec/auth/)  | Outlines the Docker Registry authentication scheme                                 |
 | [Registry storage drivers](/registry/storage-drivers/) | Enables support for given cloud providers when storing images with Registry        |

subscription/faq.md

@@ -200,7 +200,7 @@ More details are available at the [Docker Pricing](https://www.docker.com/pricin
 * Support for an unlimited number of teams
 * Unlimited Hub image vulnerability scans
 * Higher scan limits in Docker Desktop
-* Audit Logs
+* Audit logs
 * Slack notifications
 * Premium customer support for Docker Desktop
 

subscription/index.md

@@ -48,7 +48,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 
 **Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities.
 
-Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit Logs](../docker-hub/audit-log.md), and more.
+Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, an [audit log](../docker-hub/audit-log.md), and more.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.