Merge branch 'main' into ENGDOCS-2405a

Author: aevesdocker

assets/css/kapa.css

@@ -8,7 +8,6 @@
 @import "tailwindcss/components";
 @import "/assets/css/code";
 @import "/assets/css/toc";
-@import "/assets/css/kapa";
 
 @import "tailwindcss/utilities";
 @import "/assets/css/syntax-light";

assets/css/styles.css

@@ -6,18 +6,25 @@ toc_max: 3
 
 We support these broad categories of callouts:
 
-- Alerts (Note, Tip, Important, Warning, Caution)
-- Version callouts
-- Experimental, which use the `{{%/* experimental */%}}` shortcode
-- Restricted, which use the `{{%/* restricted */%}}` shortcode
+- Alerts: Note, Tip, Important, Warning, Caution
 
-The experimental and restricted shortcodes take a title as an argument. The
-title is optional, defaults to "Experimental" or "Restricted" respectively, and
-is displayed in the callout.
+We also support summary bars, which represent a feature's required subscription, version, or Adminstrator role.
+To add a summary bar:
+
+Add the feature name to the `/data/summary.yaml` file. Use the following attributes:
+
+| Attribute      | Description                                            | Possible values                                         |
+|----------------|--------------------------------------------------------|---------------------------------------------------------|
+| `subscription` | Notes the subscription required to use the feature     | All, Personal, Pro, Team, Business                      |
+| `availability` | Notes what product development stage the feature is in | Experimental, Beta, Early access, GA, Retired           |
+| `requires`     | Notes what minimum version is required for the feature | No specific value, use a string to describe the version and link to relevant release notes |
+| `for`          | Notes if the feature is intended for IT Administrators | Administrators                                          |
+
+Then, add the `summary-bar` shortcode on the page you want to add the summary bar to. Note, the feature name is case sensitive. The icons that appear in the summary bar are automatically rendered.
 
 ## Examples
 
-{{< introduced buildx 0.16.0 >}}
+{{< summary-bar feature_name="PKG installer" >}}
 
 > [!NOTE]
 >
@@ -54,18 +61,10 @@ is displayed in the callout.
 
 For both of the following callouts, consult [the Docker release lifecycle](/release-lifecycle) for more information on when to use them.
 
-{{% experimental title="Beta feature" %}}
-The Builds view is currently in Beta. This feature may change or be removed from future releases.
-{{% /experimental %}}
-
-{{% restricted %}}
-Docker Scout is an [early access](/release-lifecycle/#early-access-ea) product.
-{{% /restricted %}}
-
-## Formatting 
+## Formatting
 
 ```go
-{{</* introduced buildx 0.10.4 "../../release-notes.md#0104" */>}}
+> {{< summary-bar feature_name="PKG installer" >}}
 ```
 
 ```html
@@ -101,14 +100,4 @@ Docker Scout is an [early access](/release-lifecycle/#early-access-ea) product.
 > [!CAUTION]
 >
 > Here be dragons.
-```
-
-```go
-{{%/* experimental title="Beta feature" */%}}
-The Builds view is currently in Beta. This feature may change or be removed from future releases.
-{{%/* /experimental */%}}
-
-{{%/* restricted */%}}
-Docker Scout is an [early access](/release-lifecycle/#early-access-ea) product.
-{{%/* /restricted */%}}
-```
+```

content/contribute/components/call-outs.md

@@ -13,7 +13,7 @@ params:
   time: 10 minutes
 ---
 
-{{< include "swarm-mode.md" >}}
+{{% include "swarm-mode.md" %}}
 
 ## Prerequisites
 
@@ -35,7 +35,7 @@ Swarm never creates individual containers like you did in the previous step of t
 
 Now you can write a simple stack file to run and manage your Todo app, the container `getting-started` image created in [Part 2](02_our_app.md) of the tutorial. Place the following in a file called `bb-stack.yaml`:
 
-{{< include "swarm-compose-compat.md" >}}
+{{% include "swarm-compose-compat.md" %}}
 
 ```yaml
 version: "3.7"

content/guides/swarm-deploy.md

@@ -84,13 +84,13 @@ like this:
 
 ```dockerfile
 FROM debian:bookworm
-COPY zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
+COPY zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
 RUN apt-get update && \
     apt-get install -y ca-certificates && \
     update-ca-certificates
 ```
 
-Here, `zscaler-cert.pem` is the root certificate, located at the root of the
+Here, `zscaler-root-ca.crt` is the root certificate, located at the root of the
 build context (often within the application's Git repository).
 
 If you use an artifact repository, you can fetch the certificate directly using
@@ -100,7 +100,7 @@ the content digest of the certificate is correct.
 ```dockerfile
 FROM debian:bookworm
 ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d \
-    https://artifacts.example/certs/zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
+    https://artifacts.example/certs/zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
 RUN apt-get update && \
     apt-get install -y ca-certificates && \
     update-ca-certificates
@@ -123,7 +123,7 @@ RUN --mount=target=. cmake -B output/
 
 FROM debian:bookworm-slim AS final
 ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d \
-    https://artifacts.example/certs/zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
+    https://artifacts.example/certs/zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
 RUN apt-get update && \
     apt-get install -y ca-certificates && \
     update-ca-certificates

content/guides/zscaler/index.md

@@ -44,7 +44,7 @@ aliases:
 
 {{< summary-bar feature_name="Company" >}}
 
-{{< include "admin-company-overview.md" >}}
+{{% include "admin-company-overview.md" %}}
 
 Learn how to administer a company in the following sections.
 

content/manuals/admin/company/_index.md

@@ -12,7 +12,7 @@ You can create a new company in the Docker Admin Console. Before you begin, you
 - Be the owner of the organization you want to add to your company
 - Have a Docker Business subscription
 
-{{< include "admin-early-access.md" >}}
+{{% include "admin-early-access.md" %}}
 
 ## Create a company
 

content/manuals/admin/company/new-company.md

@@ -8,7 +8,7 @@ title: Manage company organizations
 
 You can manage the organizations in a company in the Docker Admin Console.
 
-{{< include "admin-early-access.md" >}}
+{{% include "admin-early-access.md" %}}
 
 ## View all organizations
 

content/manuals/admin/company/organizations.md

@@ -15,7 +15,7 @@ owners for all associated organizations. Unlike organization owners, company
 owners don't need to be member of an organization. When company owners aren't a
 member in an organization, they don't occupy a seat.
 
-{{< include "admin-early-access.md" >}}
+{{% include "admin-early-access.md" %}}
 
 ## Add a company owner
 

content/manuals/admin/company/owners.md

@@ -10,7 +10,7 @@ You can manage users at the company-level in the Docker Admin Console.
 
 {{% admin-users product="admin" layer="company" %}}
 
-{{< include "admin-early-access.md" >}}
+{{% include "admin-early-access.md" %}}
 
 ## Manage members on a team