Merge branch 'main' into add-llmstxt-template

Author: theletterf

.github/updatecli/updatecli.d/versions.yml

@@ -303,7 +303,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_android.current
+      key: versioning_systems.edot-android.current
 
   update-docs-docset-collector:
     name: 'Update config/versions.yml edot-collector {{ source "latest-edot-collector-version" }}'
@@ -312,7 +312,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: $.versioning_systems.edot_collector.current
+      key: $.versioning_systems.edot-collector.current
 
   update-docs-docset-dotnet:
     name: 'Update config/versions.yml edot-dotnet {{ source "latest-edot-dotnet-version" }}'
@@ -321,7 +321,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_dotnet.current
+      key: versioning_systems.edot-dotnet.current
 
   update-docs-docset-ios:
     name: 'Update config/versions.yml edot-ios {{ source "latest-edot-ios-version" }}'
@@ -330,7 +330,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_ios.current
+      key: versioning_systems.edot-ios.current
 
   update-docs-docset-java:
     name: 'Update config/versions.yml edot-java {{ source "latest-edot-java-version" }}'
@@ -339,7 +339,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_java.current
+      key: versioning_systems.edot-java.current
 
   update-docs-docset-node:
     name: 'Update config/versions.yml edot-node {{ source "latest-edot-node-version" }}'
@@ -348,7 +348,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_node.current
+      key: versioning_systems.edot-node.current
 
   update-docs-docset-php:
     name: 'Update config/versions.yml edot-php {{ source "latest-edot-php-version" }}'
@@ -357,7 +357,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_php.current
+      key: versioning_systems.edot-php.current
 
   update-docs-docset-python:
     name: 'Update config/versions.yml edot-python {{ source "latest-edot-python-version" }}'
@@ -366,7 +366,7 @@ targets:
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.edot_python.current
+      key: versioning_systems.edot-python.current
 
   update-docs-docset-eck:
     name: 'Update config/versions.yml eck {{ source "latest-eck-version" }}'
@@ -396,73 +396,73 @@ targets:
       key: versioning_systems.curator.current
 
   update-docs-docset-apm-agent-dotnet:
-    name: 'Update config/versions.yml apm_agent_dotnet {{ source "latest-apm-agent-dotnet-version" }}'
+    name: 'Update config/versions.yml apm-agent-dotnet {{ source "latest-apm-agent-dotnet-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-dotnet-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_dotnet.current
+      key: versioning_systems.apm-agent-dotnet.current
 
   update-docs-docset-apm-agent-go:
-    name: 'Update config/versions.yml apm_agent_go {{ source "latest-apm-agent-go-version" }}'
+    name: 'Update config/versions.yml apm-agent-go {{ source "latest-apm-agent-go-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-go-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_go.current
+      key: versioning_systems.apm-agent-go.current
 
   update-docs-docset-apm-agent-java:
-    name: 'Update config/versions.yml apm_agent_java {{ source "latest-apm-agent-java-version" }}'
+    name: 'Update config/versions.yml apm-agent-java {{ source "latest-apm-agent-java-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-java-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_java.current
+      key: versioning_systems.apm-agent-java.current
 
   update-docs-docset-apm-agent-node:
-    name: 'Update config/versions.yml apm_agent_node {{ source "latest-apm-agent-node-version" }}'
+    name: 'Update config/versions.yml apm-agent-node {{ source "latest-apm-agent-node-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-node-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_node.current
+      key: versioning_systems.apm-agent-node.current
 
   update-docs-docset-apm-agent-php:
-    name: 'Update config/versions.yml apm_agent_php {{ source "latest-apm-agent-php-version" }}'
+    name: 'Update config/versions.yml apm-agent-php {{ source "latest-apm-agent-php-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-php-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_php.current
+      key: versioning_systems.apm-agent-php.current
 
   update-docs-docset-apm-agent-python:
-    name: 'Update config/versions.yml apm_agent_python {{ source "latest-apm-agent-python-version" }}'
+    name: 'Update config/versions.yml apm-agent-python {{ source "latest-apm-agent-python-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-python-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_python.current
+      key: versioning_systems.apm-agent-python.current
 
   update-docs-docset-apm-agent-ruby:
-    name: 'Update config/versions.yml apm_agent_ruby {{ source "latest-apm-agent-ruby-version" }}'
+    name: 'Update config/versions.yml apm-agent-ruby {{ source "latest-apm-agent-ruby-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-ruby-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_ruby.current
+      key: versioning_systems.apm-agent-ruby.current
 
   update-docs-docset-apm-agent-rum:
-    name: 'Update config/versions.yml apm_agent_rum {{ source "latest-apm-agent-rum-version" }}'
+    name: 'Update config/versions.yml apm-agent-rum {{ source "latest-apm-agent-rum-version" }}'
     scmid: githubConfig
     sourceid: latest-apm-agent-rum-version
     kind: yaml
     spec:
       file: config/versions.yml
-      key: versioning_systems.apm_agent_rum.current
+      key: versioning_systems.apm-agent-rum-js.current

.github/workflows/ci.yml

@@ -87,6 +87,12 @@ jobs:
          - windows-latest
     steps:          
       - uses: actions/checkout@v5
+      - name: 'Windows only, set TEMP to the same drive'
+        if: ${{ matrix.os == 'windows-latest' }}
+        #  temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
+        run: |
+          mkdir "D:\\Temp"
+          echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
 
       - name: Bootstrap Action Workspace
         id: bootstrap

.github/workflows/release.yml

@@ -147,6 +147,12 @@ jobs:
       - uses: actions/checkout@v5
         with:
           ref: ${{ needs.release-drafter.outputs.tag_name }}
+      - name: 'Windows only, set TEMP to the same drive'
+        if: ${{ matrix.os == 'windows-latest' }}
+        #  temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
+        run: |
+          mkdir "D:\\Temp"
+          echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
 
       - name: Bootstrap Action Workspace
         id: bootstrap

docs/contribute/cumulative-docs/example-scenarios.md

@@ -557,7 +557,7 @@ _Work in progress._
 
 ## Functionality is added to multiple patch versions [multiple-patch]
 
-Sometimes, features and enhancements slip through into patch versions. In that case, the same functionality might be added for the first time to multiple patch versions at the same time.
+Sometimes, features and enhancements slip through into patch versions, and the same functionality might be added for the first time to multiple patch versions at the same time. In that case, use two `applies_to` badges so that users can see clearly the versions in which the functionality is introduced. Order the `applies_to` badges starting with the latest version, and ending with the earliest version. (Automatic ordering for multiple badges is not currently supported.)
 
 For example, on the [HTTP JSON input](https://www.elastic.co/docs/reference/beats/filebeat/filebeat-input-httpjson) page, the `terminate` helper function was added to a 9.0.x and 9.1.x patch version at the same time.
 
@@ -572,7 +572,7 @@ For example, on the [HTTP JSON input](https://www.elastic.co/docs/reference/beat
 ```markdown
 * `terminate`: exits the template without falling back to the default value
   and without causing an error. It takes a single string argument that is
-  logged in debug logging. {applies_to}`stack: ga 9.1.2, ga 9.0.6`
+  logged in debug logging. {applies_to}`stack: ga 9.1.2` {applies_to}`stack: ga 9.0.6`
 ```
 ::::
 :::::

docs/contribute/cumulative-docs/images/example-multiple-patch.png

@@ -71,3 +71,21 @@ This example shows how to use directly a key from the second level of the `appli
 :::::
 ::::::
 
+::::::{dropdown} The functionality is available in the same lifecycle in multiple versions
+
+:::::{tab-set}
+
+::::{tab-item} Output
+
+- {applies_to}`stack: ga 9.1.2` {applies_to}`stack: ga 9.0.6`
+
+::::
+
+::::{tab-item} Markdown
+```markdown
+- {applies_to}`stack: ga 9.1.2` {applies_to}`stack: ga 9.0.6`
+```
+::::
+
+:::::
+::::::