From 7006169ff93697eb9499c5479a66e6a71f6c000c Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 14 Feb 2025 15:14:49 -0500 Subject: [PATCH 1/3] Clarify pre-paid storage expiration and image pull adjustments --- content/manuals/billing/docker-hub-pricing.md | 5 ++++- content/manuals/subscription/scale.md | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/content/manuals/billing/docker-hub-pricing.md b/content/manuals/billing/docker-hub-pricing.md index 3c8aa40f023e..812b8b8eb91a 100644 --- a/content/manuals/billing/docker-hub-pricing.md +++ b/content/manuals/billing/docker-hub-pricing.md @@ -49,7 +49,10 @@ There are two billing models for paying for additional Docker Hub storage: > [!NOTE] > - > Pre-purchased storage expires at the end of your subscription period. + > Pre-purchased storage expires at the end of your subscription period. Subscriptions + > periods are either monthly or annually. For example, if you are on a monthly plan, + > unused storage from each month does not roll over into the next. If you are on an + > annual plan, unused storage from each year does not roll over into the next. - Post-pay: Receive an overage invoice for storage usage that exceeds your subscription plan's included amount at the end of your billing cycle. diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index 2cd1e6a828f6..7246e649b3fb 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -66,8 +66,15 @@ charges, pre-purchase additional minutes. {{% include "hub-limits.md" %}} -You can pre-purchase images pulls and storage by [contacting -sales](https://www.docker.com/pricing/contact-sales/). +You can pre-purchase image pulls and storage by [contacting +sales](https://www.docker.com/pricing/contact-sales/). For more information on Docker +Hub storage pricing, see [Docker Hub storage pricing](/manuals/billing/docker-hub-pricing.md). + +> [!WARNING] +> +> Once purchased, you can't adjust your pre-paid image pulls, only remove them. To change +> the amount of pre-paid image pulls you must remove them, wait for the billing cycle to +> end, and then purchase a new amount. In addition to pre-purchase, you are able to use as much resources as you need on-demand. On-demand usage is billed at a higher rate than pre-purchased From ccfc55e39eed89f17a5bc791fcc2e554bf4cba4e Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 18 Feb 2025 10:26:14 -0500 Subject: [PATCH 2/3] Remove image pull wording, replace with pulls --- content/manuals/subscription/scale.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index 7246e649b3fb..873a950adec0 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -32,7 +32,7 @@ You can scale consumption for the following: - Docker Build Cloud build minutes - Docker Testcontainers Cloud runtime minutes -- Docker Hub storage and image pulls +- Docker Hub storage and pulls To better understand your needs, you can view your consumption at any time. For more details, see [View Docker product @@ -62,21 +62,20 @@ usage will be billed at the end of each monthly billing cycle. On-demand usage is billed at a higher rate than pre-purchased capacity. To avoid on-demand charges, pre-purchase additional minutes. -## Add Docker Hub storage or image pulls +## Add Docker Hub storage or pulls {{% include "hub-limits.md" %}} -You can pre-purchase image pulls and storage by [contacting +You can pre-purchase pulls and storage by [contacting sales](https://www.docker.com/pricing/contact-sales/). For more information on Docker Hub storage pricing, see [Docker Hub storage pricing](/manuals/billing/docker-hub-pricing.md). > [!WARNING] > -> Once purchased, you can't adjust your pre-paid image pulls, only remove them. To change -> the amount of pre-paid image pulls you must remove them, wait for the billing cycle to +> Once purchased, you can't adjust your pre-paid pulls, only remove them. To change +> the amount of pre-paid pulls you must remove them, wait for the billing cycle to > end, and then purchase a new amount. In addition to pre-purchase, you are able to use as much resources as you need on-demand. On-demand usage is billed at a higher rate than pre-purchased -capacity. To avoid on-demand charges, pre-purchase additional storage or image -pulls. \ No newline at end of file +capacity. To avoid on-demand charges, pre-purchase additional storage or pulls. \ No newline at end of file From c8fafb9f54c89b62d0b49dee82187aec5f5b14cf Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:41:28 +0000 Subject: [PATCH 3/3] ENGDOCS-2413b (#22048) ## Description Moves tags placement on pages ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- layouts/partials/aside.html | 7 +++++++ layouts/partials/content-default.html | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/layouts/partials/aside.html b/layouts/partials/aside.html index 16242441fd31..5a850e3d094b 100644 --- a/layouts/partials/aside.html +++ b/layouts/partials/aside.html @@ -5,4 +5,11 @@
{{ partialCached "pagemeta.html" . . }}
+ {{- if ne .Type "guides" }} + {{ with .GetTerms "tags" }} +
+ {{- partial "tags.html" . }} +
+ {{- end }} +{{- end }} diff --git a/layouts/partials/content-default.html b/layouts/partials/content-default.html index e5bb568595b6..4a142a9137ae 100644 --- a/layouts/partials/content-default.html +++ b/layouts/partials/content-default.html @@ -2,13 +2,7 @@
{{ partial "breadcrumbs.html" . }}

{{ .Title }}

- {{- if ne .Type "guides" }} - {{ with .GetTerms "tags" }} -
- {{- partial "tags.html" . }} -
- {{- end }} - {{- end }} +
{{ partialCached "pagemeta.html" . . }}