Merge branch 'main' into style-fix

Author: rosieyohannan

docs/guides/modules/optimize/pages/use-the-circleci-cli-to-split-tests.adoc

@@ -317,7 +317,7 @@ jobs:
       - run:
           name: Run tests
           command: |
-            circleci tests glob 'lib/**/*_test.exs'
+            circleci tests glob 'test/**/*_test.exs'
             | circleci tests run --command='xargs -n1 echo > test_file_paths.txt'
 
             mix ecto.setup --quiet

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.
 |===
 --
 

docs/guides/modules/test/pages/rerun-failed-tests.adoc

@@ -242,7 +242,7 @@ Ensure you are using `xargs` in your `circleci tests run` command to pass the li
 - run:
     name: Run tests
     command: |
-      circleci tests glob 'lib/**/*_test.exs'
+      circleci tests glob 'test/**/*_test.exs'
       | circleci tests run --command='xargs -n1 echo > test_file_paths.txt'
 
       mix ecto.setup --quiet

docs/server-admin-4.8/modules/installation/pages/installation-reference.adoc

@@ -893,7 +893,10 @@ performed on the resource.
 Dockerhub is assumed to be the image registry unless otherwise specified
 eg: registry.example.com/organization/repository
 
-|nomad.clients |object |`+{}+` |
+|nomad.clients.mTLS
+|object
+|`{"CACertificate":"","certificate":""}`
+|Configure Nomad client mTLS when using external Nomad servers. Required when `nomad.server.internal: false`. Both `CACertificate` (base64 encoded CA cert to verify server) and `certificate` (base64 encoded client cert for authentication) must be provided.
 
 |nomad.server.gossip.encryption.enabled |bool |`+true+` |