Merge pull request #13340 from docker/master

Publish the latest changes from master

_data/toc.yaml

@@ -1404,17 +1404,17 @@ manuals:
     title: Release notes
 - sectiontitle: Docker subscription
   section:
-  - path: /docker-hub/billing/
+  - path: /subscription/
     title: Overview
-  - path: /docker-hub/billing/upgrade/
+  - path: /subscription/upgrade/
     title: Upgrade your plan
-  - path: /docker-hub/billing/downgrade/
+  - path: /subscription/downgrade/
     title: Downgrade your plan
-  - path: /docker-hub/billing/add-seats/
+  - path: /subscription/add-seats/
     title: Add seats
-  - path: /docker-hub/billing/remove-seats/
+  - path: /subscription/remove-seats/
     title: Remove seats
-  - path: /docker-hub/billing/faq/
+  - path: /subscription/faq/
     title: Pricing FAQs
 - sectiontitle: Open-source projects
   section:

_includes/landing-page/apple-silicon.html

@@ -1,19 +0,0 @@
-<section class="cta-banner dockercon">
-  <div class="container">
-    <div class="row">
-      <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
-        <h2>
-          Docker Desktop for Apple silicon is now GA!
-        </h2>
-        <h5>
-          We are excited to announce the general availability of Docker Desktop for Mac with Apple silicon, continuing to delight millions of developers in our community with their choice of local development environments.
-        </h5>
-      </div>
-      <div class="col-xs-12 col-md-6 col-lg-4 text-center">
-        <a class="btn" href="https://docs.docker.com/docker-for-mac/apple-silicon/" target="_blank" rel="noopener">
-          Check out the details
-        </a>
-      </div>
-    </div>
-  </div>
-</section>

_includes/landing-page/dev-environments.html

@@ -1,4 +1,4 @@
-<section class="cta-banner dockercon">
+<section class="cta-banner">
   <div class="container">
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">

_includes/landing-page/docker-aci.html

@@ -1,19 +0,0 @@
-<section class="cta-banner dockercon">
-  <div class="container">
-    <div class="row">
-      <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
-        <h2>
-          Get started with the cloud
-        </h2>
-        <h5>
-          Try out the new Docker to Azure experience with Azure Container Instances (ACI) to get your containers running in the cloud in under 10 minutes.
-        </h5>
-      </div>
-      <div class="col-xs-12 col-md-6 col-lg-4 text-center">
-        <a class="btn" href="https://www.docker.com/blog/running-a-container-in-aci-with-docker-desktop-edge/" target="_blank" class="card">
-          Find out more
-        </a>
-      </div>
-    </div>
-  </div>
-</section>

_includes/landing-page/docker-hub-signup.html

@@ -1,4 +1,4 @@
-<section class="cta-banner dockercon">
+<section class="cta-banner">
   <div class="container">
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">

_includes/landing-page/docker-pricing.html

@@ -1,4 +1,4 @@
-<section class="cta-banner dockercon">
+<section class="cta-banner">
   <div class="container">
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">

docker-hub/release-notes.md

@@ -32,7 +32,7 @@ You can now specify any email address to receive billing-related emails for your
 
 To change the email address receiving billing-related emails, log into Docker Hub and navigate to the **Billing** tab of your organization. Select **Payment Methods** > **Contact Information**. Enter the new email address that you'd like to use in the **Email** field. Click **Update** for the changes to take effect.
 
-For details on how to update your billing information, see [Update billing information](/billing/index.md#update-billing-information).
+For details on how to update your billing information, see [Update billing information](../subscription/index.md#update-billing-information).
 
 # 2021-03-22
 
@@ -67,7 +67,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
 
 ### New features
 
-* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../docker-hub/billing/index.md).
+* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/index.md).
 
 * Docker has enabled download rate limits for downloads and pull requests on Docker Hub. This caps the number of objects that users can download within a specified timeframe. For more information, see [Download rate limit](download-rate-limit.md).
 
@@ -139,7 +139,7 @@ Each organization page now breaks down into these tabs:
 
 ### Enhancements
 
-* The [billing page](https://docs.docker.com/docker-hub/upgrade/) for personal accounts has been updated. You can access the page at its new URL: [https://hub.docker.com/billing/plan](https://hub.docker.com/billing/plan).
+* The [billing page](../subscription/upgrade.md) for personal accounts has been updated. You can access the page at its new URL: [https://hub.docker.com/billing/plan](https://hub.docker.com/billing/plan).
 
 ### Known Issues
 

engine/release-notes/index.md

@@ -66,7 +66,7 @@ for Docker Engine.
 - Windows: Fix a situation where containers were not stopped if `HcsShutdownComputeSystem`
   returned an `ERROR_PROC_NOT_FOUND` error [moby/moby#42613](https://github.com/moby/moby/pull/42613) 
 
-## Swarm
+### Swarm
 
 - Fix a possibility where overlapping IP addresses could exist as a result of the
   node failing to clean up its old loadbalancer IPs [moby/moby#42538](https://github.com/moby/moby/pull/42538)

subscription/add-seats.md

@@ -2,6 +2,8 @@
 description: Add seats to your plan
 keywords: Docker, Docker Hub, subscription, update, add, seats
 title: Add seats to your plan
+redirect_from:
+- /docker-hub/billing/add-seats/
 ---
 
 You can manage your Docker Hub subscription anytime by adding seats to your plan.

subscription/downgrade.md

@@ -4,6 +4,7 @@ keywords: Docker Hub, downgrade, subscription, Pro, Team, Free, pricing plan,
 title: Downgrade your plan
 redirect_from:
 - /docker-hub/cancel-downgrade/
+- /docker-hub/billing/downgrade/
 ---
 
 You can downgrade your Pro or Team plan anytime. When you downgrade your plan, changes will be applied at the end of your billing cycle.

subscription/faq.md

@@ -4,6 +4,8 @@ keywords: Docker, Docker Hub, billing FAQs, pull rate limiting FAQs, subscriptio
 title: Subscription & Billing FAQs
 toc_min: 1
 toc_max: 2
+redirect_from:
+- /docker-hub/billing/faq/
 ---
 
 ## Subscription tiers

subscription/index.md

@@ -2,12 +2,14 @@
 description: Docker subscription overview
 keywords: Docker, pricing, billing, Pro, Team, subscription, plans,
 title: Docker subscription overview
+redirect_from:
+- /docker-hub/billing/
 ---
 
 On May 14, 2020, Docker announced a new, per-seat pricing model that aligns with Docker’s [product strategy](https://www.docker.com/blog/docker-strategy-helping-devs-build-and-ship-faster/){: target="_blank" rel="noopener" class="_"} to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** subscriptions that include unlimited private repositories and up to 50,000 container pulls in a 24-hour period.
 Starting with May 14, 2020, new customers who sign up for Docker can choose between the new Free, Pro, and Team plans.
 
-Existing Docker customers who had subscribed to a paid plan before May 14, 2020 have been converted to the new Pro or Team plan after January 31, 2021. 
+Existing Docker customers who had subscribed to a paid plan before May 14, 2020 have been converted to the new Pro or Team plan after January 31, 2021.
 
 ## Pricing plans
 

subscription/remove-seats.md

@@ -2,6 +2,8 @@
 description: Remove seats from your plan
 keywords: Docker, Docker Hub, subscription, update, remove, seats
 title: Remove seats from your plan
+redirect_from:
+- /docker-hub/billing/remove-seats/
 ---
 
 You can manage your Docker Hub subscription anytime by removing seats from your plan. If you remove seats in the middle of the billing cycle, changes are applied immediately and reflect in the next billing cycle.

subscription/upgrade.md

@@ -4,6 +4,7 @@ keywords: Docker Hub, upgrade, subscription, Pro, Team, pricing plan,
 title: Upgrade your plan
 redirect_from:
 - /docker-hub/upgrade/
+- /docker-hub/billing/upgrade/
 ---
 
 You can upgrade to a Pro or a Team plan from a Free plan, or from your current legacy plan. When you upgrade to a Pro or a Team plan, you will be able to immediately use all the features and entitlements offered in your new plan. For detailed information on features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.