Merge pull request #22051 from docker/published-update

publish updates from main

Author: sarahsanders-docker

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.

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,14 +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 images pulls and storage by [contacting
-sales](https://www.docker.com/pricing/contact-sales/).
+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 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.
+capacity. To avoid on-demand charges, pre-purchase additional storage or pulls.

layouts/partials/aside.html

@@ -5,4 +5,11 @@
   <div id="TableOfContents">
     {{ partialCached "pagemeta.html" . . }}
   </div>
+  {{- if ne .Type "guides" }}
+  {{ with .GetTerms "tags" }}
+    <div class="not-prose mt-8 px-4">
+      {{- partial "tags.html" . }}
+    </div>
+  {{- end }}
+{{- end }}
 </aside>

layouts/partials/content-default.html

@@ -2,13 +2,7 @@
   <article class="prose min-w-0 flex-[2_2_0%] max-w-4xl dark:prose-invert">
     {{ partial "breadcrumbs.html" . }}
     <h1 data-pagefind-weight="10" class="scroll-mt-36">{{ .Title }}</h1>
-    {{- if ne .Type "guides" }}
-      {{ with .GetTerms "tags" }}
-        <div class="not-prose">
-          {{- partial "tags.html" . }}
-        </div>
-      {{- end }}
-    {{- end }}
+
     <div class="block lg:hidden">
       {{ partialCached "pagemeta.html" . . }}
       <hr />