From ac04f7b0a05ad17a921cc3d1e0e970f8d7d78f58 Mon Sep 17 00:00:00 2001 From: Foster Snowhill Date: Sun, 8 Aug 2021 18:01:23 +0200 Subject: [PATCH 1/3] Release notes: fix incorrect header level for 20.10.8 Swarm --- engine/release-notes/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/release-notes/index.md b/engine/release-notes/index.md index 5e44ce523a..cd70f92050 100644 --- a/engine/release-notes/index.md +++ b/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) From 3d9265a041d1de35a34291d72a3f2a40a26c36b4 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 12 Aug 2021 10:38:26 +0100 Subject: [PATCH 2/3] Clean up the homepage banners Signed-off-by: Usha Mandya --- _includes/landing-page/apple-silicon.html | 19 ------------------- _includes/landing-page/dev-environments.html | 2 +- _includes/landing-page/docker-aci.html | 19 ------------------- _includes/landing-page/docker-hub-signup.html | 2 +- _includes/landing-page/docker-pricing.html | 2 +- 5 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 _includes/landing-page/apple-silicon.html delete mode 100644 _includes/landing-page/docker-aci.html diff --git a/_includes/landing-page/apple-silicon.html b/_includes/landing-page/apple-silicon.html deleted file mode 100644 index 193c03f5e8..0000000000 --- a/_includes/landing-page/apple-silicon.html +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
-
-

- Docker Desktop for Apple silicon is now GA! -

-
- 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. -
-
-
- - Check out the details - -
-
-
-
diff --git a/_includes/landing-page/dev-environments.html b/_includes/landing-page/dev-environments.html index 78e6e9d3df..f971f83409 100644 --- a/_includes/landing-page/dev-environments.html +++ b/_includes/landing-page/dev-environments.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/docker-aci.html b/_includes/landing-page/docker-aci.html deleted file mode 100644 index 152fd1f3cd..0000000000 --- a/_includes/landing-page/docker-aci.html +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
-
-

- Get started with the cloud -

-
- 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. -
-
-
- - Find out more - -
-
-
-
diff --git a/_includes/landing-page/docker-hub-signup.html b/_includes/landing-page/docker-hub-signup.html index 7d49a95092..577cb8e446 100644 --- a/_includes/landing-page/docker-hub-signup.html +++ b/_includes/landing-page/docker-hub-signup.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/docker-pricing.html b/_includes/landing-page/docker-pricing.html index 07b472d699..8c87353eba 100644 --- a/_includes/landing-page/docker-pricing.html +++ b/_includes/landing-page/docker-pricing.html @@ -1,4 +1,4 @@ -
+
From bf844f81acc13eb61530fea2a1f6856ad99052b6 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 12 Aug 2021 16:07:14 +0100 Subject: [PATCH 3/3] Move subscription docs Signed-off-by: Usha Mandya --- _data/toc.yaml | 12 ++++++------ docker-hub/release-notes.md | 6 +++--- {docker-hub/billing => subscription}/add-seats.md | 2 ++ {docker-hub/billing => subscription}/downgrade.md | 1 + {docker-hub/billing => subscription}/faq.md | 2 ++ .../images/billing-personal-account.png | Bin {docker-hub/billing => subscription}/index.md | 4 +++- .../billing => subscription}/remove-seats.md | 2 ++ {docker-hub/billing => subscription}/upgrade.md | 1 + 9 files changed, 20 insertions(+), 10 deletions(-) rename {docker-hub/billing => subscription}/add-seats.md (97%) rename {docker-hub/billing => subscription}/downgrade.md (99%) rename {docker-hub/billing => subscription}/faq.md (99%) rename {docker-hub/billing => subscription}/images/billing-personal-account.png (100%) rename {docker-hub/billing => subscription}/index.md (99%) rename {docker-hub/billing => subscription}/remove-seats.md (96%) rename {docker-hub/billing => subscription}/upgrade.md (99%) diff --git a/_data/toc.yaml b/_data/toc.yaml index 609ee1ba45..bc80072f32 100644 --- a/_data/toc.yaml +++ b/_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: diff --git a/docker-hub/release-notes.md b/docker-hub/release-notes.md index 4b7a06a828..fa2d5dc881 100644 --- a/docker-hub/release-notes.md +++ b/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 diff --git a/docker-hub/billing/add-seats.md b/subscription/add-seats.md similarity index 97% rename from docker-hub/billing/add-seats.md rename to subscription/add-seats.md index 7b2eaba7aa..fb33dac2b6 100644 --- a/docker-hub/billing/add-seats.md +++ b/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. diff --git a/docker-hub/billing/downgrade.md b/subscription/downgrade.md similarity index 99% rename from docker-hub/billing/downgrade.md rename to subscription/downgrade.md index 4a392bb428..b57a7e8490 100644 --- a/docker-hub/billing/downgrade.md +++ b/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. diff --git a/docker-hub/billing/faq.md b/subscription/faq.md similarity index 99% rename from docker-hub/billing/faq.md rename to subscription/faq.md index 3d58baeed0..6c878364fc 100644 --- a/docker-hub/billing/faq.md +++ b/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 diff --git a/docker-hub/billing/images/billing-personal-account.png b/subscription/images/billing-personal-account.png similarity index 100% rename from docker-hub/billing/images/billing-personal-account.png rename to subscription/images/billing-personal-account.png diff --git a/docker-hub/billing/index.md b/subscription/index.md similarity index 99% rename from docker-hub/billing/index.md rename to subscription/index.md index 2af22238f2..466fc06e58 100644 --- a/docker-hub/billing/index.md +++ b/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 diff --git a/docker-hub/billing/remove-seats.md b/subscription/remove-seats.md similarity index 96% rename from docker-hub/billing/remove-seats.md rename to subscription/remove-seats.md index 3b591f981c..83f5968b4f 100644 --- a/docker-hub/billing/remove-seats.md +++ b/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. diff --git a/docker-hub/billing/upgrade.md b/subscription/upgrade.md similarity index 99% rename from docker-hub/billing/upgrade.md rename to subscription/upgrade.md index ab4edd86d7..8f22268c40 100644 --- a/docker-hub/billing/upgrade.md +++ b/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="_"}.