Merge branch 'main' into DOCSS-1468-mermaid-diagrams

Author: rosieyohannan

.circleci/config.yml

@@ -8,7 +8,7 @@ orbs:
 executors:
   node_executor:
     docker:
-      - image: cimg/node:22.19.0
+      - image: cimg/node:22.20.0
     working_directory: ~/project
 
   go_executor:
@@ -18,7 +18,7 @@ executors:
 
   ruby_executor:
     docker:
-      - image: cimg/ruby:3.4.5
+      - image: cimg/ruby:3.4.7
     working_directory: ~/project
 
 commands:

.nvmrc

@@ -1 +1 @@
-22.19.0
+22.20.0

antora-playbook.yml

@@ -47,8 +47,8 @@ asciidoc:
     serverversion44: 4.4.7
     serverversion45: 4.5.5
     serverversion46: 4.6.6
-    serverversion47: 4.7.9
-    serverversion48: 4.8.2
+    serverversion47: 4.7.11
+    serverversion48: 4.8.4
     serverversion: 3.4.8
     terraformversion: 0.15.4
     kubectlversion: 1.19

archive/server 4.1/server-admin/modules/operator/pages/upgrade-mongo.adoc

@@ -56,12 +56,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/guides/modules/ROOT/images/deploy/deploys-timeline-fail-banner.png

@@ -7,13 +7,21 @@
 | VM Software Manifest
 | Release Notes
 
-| `26.0.0`
-| Xcode 26.0 GA (17A324)
+| `26.1.0`
+| Xcode 26.1 Beta 2 (17B5035f)
 | 15.6
 a| `m4pro.medium` +
    `m4pro.large`
-| link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15723/manifest.txt[Installed software]
-| link:https://circleci.com/changelog/xcode-26-ga-available/[Release Notes]
+| link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15768/manifest.txt[Installed software]
+| link:https://circleci.com/changelog/xcode-26-1-beta-2-available/[Release Notes]
+
+| `26.0.1`
+| Xcode 26.0.1 (17A400)
+| 15.6
+a| `m4pro.medium` +
+   `m4pro.large`
+| link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15738/manifest.txt[Installed software]
+| link:https://circleci.com/changelog/xcode-26-0-1-released/[Release Notes]
 
 | `16.4.0`
 | Xcode 16.4 GA (16F6)

docs/guides/modules/ROOT/images/email-notifications.png

@@ -1,7 +1,7 @@
 [#pipeline-parameters-api]
 === I thought pipeline parameters could only be used with the API?
 
-Previously, this was true. With the dynamic configuration feature, you can now set pipeline parameters dynamically, before the pipeline is executed (triggered from either the API or a webhook—a push event to your VCS).
+Previously, this was true but you can now set pipeline parameters dynamically, before the pipeline is executed. The pipeline parameters for the continuation configuration can be set by using the link:https://circleci.com/developer/orbs/orb/circleci/continuation[continuation orb] in the setup configuration. The pipeline associated with the setup configuration can be triggered via either the API or an event in your VCS.
 
 [#can-i-use-a-custom-executor]
 === Can I use a custom executor?
@@ -11,8 +11,8 @@ Custom executors can be used, but require certain dependencies to be installed f
 [#what-is-the-continuation-orb]
 === What is the continuation orb?
 
-The `continuation` orb assists you in managing the pipeline continuation process. The
-`continuation` orb wraps an API call to link:https://circleci.com/docs/api/v2/#operation/continuePipeline[`continuePipeline`]. Refer to the link:https://circleci.com/developer/orbs/orb/circleci/continuation[`continuation`] orb documentation for more information.
+The continuation orb assists you in managing the pipeline continuation process. The
+continuation orb wraps an API call to the link:https://circleci.com/docs/api/v2/#operation/continuePipeline[Continue a pipeline API endpoint]. Refer to the link:https://circleci.com/developer/orbs/orb/circleci/continuation[continuation orb] documentation for more information.
 
 [#possible-to-not-use-continuation-orb]
 === Is it possible to not use the continuation orb?

docs/guides/modules/ROOT/partials/execution-resources/xcode-silicon-vm.adoc

@@ -7,7 +7,7 @@ This tutorial shows how to add a deploy marker step to your workflow config. Dep
 
 == Introduction
 
-Deploy markers provide a lightweight way to log your deployments without requiring a you to install the CircleCI release agent. If you install deploy markers, as described in this guide, you will also be able to use the xref:set-up-rollbacks.adoc[CircleCI rollback feature].
+Deploy markers provide a lightweight way to log your deployments. If you install deploy markers, as described in this guide, you will also be able to use the xref:set-up-rollbacks.adoc[CircleCI rollback feature].
 
 For a full guide to CircleCI's deploys features and functionality, refer to the xref:deployment-overview.adoc[Deployment and deploy management] guide.
 
@@ -16,6 +16,14 @@ You can configure deploy markers as follows:
 * To display updated statuses depending of the outcome of your deployments. Steps for this are provided in the <<deploy-markers-with-status-updates>> section.
 * Or, you can choose to configure deploy markers to log deployments without status updates. Steps for this are provided in the <<deploy-logs-without-status-updates>> section.
 
+Once you have deploy markers configured, you will see a timeline of deployments in the Deploys UI. From the timeline you can choose to rollback (image:guides:ROOT:icons/rebuild.svg[rollback icon, role="no-border"]) to a version, and you get notifications for failed deployments.
+
+.Deploys timeline with failed deployment
+image::guides:ROOT:deploy/deploys-timeline-fail-banner.png[Deploy timeline with failed deployment]
+
+.Deploys timeline with no deployments requiring troubleshooting
+image::guides:ROOT:releases/dashboard.png[Deploys timeline with no deployments requiring troubleshooting]
+
 == Prerequisites
 
 * A CircleCI account connected to your code. You can link:https://circleci.com/signup/[sign up for free].
@@ -116,7 +124,7 @@ jobs:
 ----
 
 === 1.3. Update the deploy status to success or failure
-You can use the `when` attribute to add `on_success` and `on_failure` steps at the end of your deployment job, to handle the final status update of the deploy.
+You can use the `when` attribute to add `on_success` and `on_fail` steps at the end of your deployment job, to handle the final status update of the deploy.
 
 .Config file example showing deploy status update to success or failure
 [,yml]
@@ -276,6 +284,9 @@ jobs:
 ----
 
 This command supports the same optional parameters as the `release plan` command, but does not require a `deploy-name`.
+
+WARNING: If you are deploying to multiple environments from a single workflow, you need to specify the target environment using the `--environment-name` flag. If you are deploying multiple components from a single workflow, you need to specify the component name using the `--component-name` flag.
+
 You can see the command with all optional parameters in the following example:
 
 [,yml]

docs/guides/modules/ROOT/partials/faq/dynamic-configuration-faq-snip.adoc

@@ -37,6 +37,8 @@ include::ROOT:partial$deploy/supported-versions.adoc[]
 
 The following table shows a complete list of labels and annotations either required or available for configuring your environment integration. You will be guided to set these up in the in-app setup process. These are not strictly a prerequisite but will be required for the release agent to work correctly.
 
+[.table-scroll]
+--
 [cols=4*, options="header"]
 |===
 |
@@ -104,6 +106,7 @@ The following table shows a complete list of labels and annotations either requi
 |`false`
 |No. Only set if you want to disable the cancel deployment feature for your component.
 |===
+--
 
 
 == Set up the CircleCI release agent