Merge branch 'main' into antedeguemon-fix-elixir-paths

Author: rosieyohannan

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

@@ -64,10 +64,7 @@ a| `m4pro.medium` +
 | `16.1.0`
 | Xcode 16.1 (16B40)
 | 14.6.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`
@@ -77,10 +74,7 @@ a| `m4pro.medium` +
 | `16.0.0`
 | Xcode 16.0 (16A242d)
 | 14.6.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`
@@ -102,10 +96,7 @@ a| `m4pro.medium` +
 | `15.3.0`
 | Xcode 15.3 (15E204a)
 | 14.3.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`
@@ -115,10 +106,7 @@ a| `m4pro.medium` +
 | `15.2.0`
 | Xcode 15.2 (15C500b)
 | 14.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`
@@ -128,10 +116,7 @@ a| `m4pro.medium` +
 | `15.1.0`
 | Xcode 15.1 (15C65)
 | 14.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`
@@ -193,10 +178,7 @@ a| `m2pro.medium` +
 | `13.4.1`
 | Xcode 13.4.1 (13F100)
 | 12.6.1
-a| `m4pro.medium` +
-   `m4pro.large` +
-   _(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
-   `m2pro.medium` +
+a| `m2pro.medium` +
    `m2pro.large` +
    `macos.m1.medium.gen1` +
    `macos.m1.large.gen1`

docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc

@@ -76,26 +76,29 @@ The OpenID Connect ID tokens also contain some https://openid.net/specs/openid-c
 | Additional claims
 | Metadata
 
-| `oidc.circleci.com/project-id`
-| The ID of the project in which the job is running. Its value is a string containing a UUID identifying the CircleCI project.
+| `oidc.circleci.com/context-ids`
+| An array of strings containing UUIDs that identify the context(s) used in the job.
+
+| `oidc.circleci.com/org-id`
+| The unique identifier for the organization. Its value is a string containing a UUID identifying the CircleCI organization.
+
+| `oidc.circleci.com/pipeline-definition-id`
+| The unique identifier for the pipeline definition that created the pipeline running the workflow. The value is a string containing a UUID identifying the CircleCI pipeline definition. Pipeline definitions are found in your project settings under Project Setup.
 
 | `oidc.circleci.com/pipeline-id`
 | The unique identifier for the pipeline that triggered this job. Its value is a string containing a UUID identifying the CircleCI pipeline.
 
-| `oidc.circleci.com/org-id`
-| The unique identifier for the organization. Its value is a string containing a UUID identifying the CircleCI organization.
+| `oidc.circleci.com/project-id`
+| The ID of the project in which the job is running. Its value is a string containing a UUID identifying the CircleCI project.
+
+| `oidc.circleci.com/ssh-rerun`
+| A boolean indicating if the CI job is started using the SSH rerun feature.
 
 | `oidc.circleci.com/vcs-origin`
 | The URL of the repository that triggered the pipeline. Its value is a string similar to `github.com/organization-123/repo-1`. This is not present for pipelines triggered by custom webhooks.
 
 | `oidc.circleci.com/vcs-ref`
 | The reference to the change that triggered the pipeline. Its value is a string similar to `refs/heads/main`. This is not present for pipelines triggered by custom webhooks.
-
-| `oidc.circleci.com/context-ids`
-| An array of strings containing UUIDs that identify the context(s) used in the job.
-
-| `oidc.circleci.com/ssh-rerun`
-| A boolean indicating if the CI job is started using the SSH rerun feature.
 |===
 --