Merge branch 'main' into patch-2

Author: Sharra-writes

.github/workflows/reviewers-docs-engineering.yml

@@ -40,6 +40,7 @@ jobs:
       ${{ github.repository == 'github/docs-internal' &&
           !github.event.pull_request.draft &&
           !contains(github.event.pull_request.labels.*.name, 'reviewers-docs-engineering') &&
+          !contains(github.event.pull_request.labels.*.name, 'lockfile-churn-only') &&
           github.event.pull_request.head.ref != 'repo-sync' }}
     runs-on: ubuntu-latest
     env:
@@ -50,7 +51,45 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6.0.1
 
+      # Detect PRs that only changed package-lock.json (no engineering source files).
+      # These are usually cross-platform `npm install` churn from contributors
+      # editing content. We comment with reset instructions instead of pulling in
+      # docs-engineering for review.
+      - name: Detect lockfile-only churn
+        id: detect
+        run: |
+          changed=$(gh pr diff "$PR" --name-only)
+          echo "Changed files:"
+          echo "$changed"
+          lockfile=$(echo "$changed" | grep -c '^package-lock\.json$' || true)
+          other_eng=$(echo "$changed" | grep -cE '(\.tsx?$|\.scss$|^src/|^package\.json$|^\.github/|^config/|^\.devcontainer/|Dockerfile)' || true)
+          if [ "$lockfile" -gt 0 ] && [ "$other_eng" -eq 0 ]; then
+            echo "lockfile_only=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "lockfile_only=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Comment and label lockfile-only PRs
+        if: steps.detect.outputs.lockfile_only == 'true'
+        run: |
+          cat > /tmp/lockfile-churn-body.md <<'EOF'
+          _Posted by Copilot on behalf of docs-engineering._
+
+          This PR includes `package-lock.json` changes but no engineering files. Please reset the lockfile:
+
+          ```
+          git checkout origin/main -- package-lock.json
+          git commit -m "Reset package-lock.json"
+          git push
+          ```
+
+          If the lockfile change is intentional, remove the `lockfile-churn-only` label and request docs-engineering review.
+          EOF
+          gh pr comment "$PR" --body-file /tmp/lockfile-churn-body.md
+          gh pr edit "$PR" --add-label lockfile-churn-only
+
       - name: Add docs engineering as a reviewer
+        if: steps.detect.outputs.lockfile_only != 'true'
         uses: ./.github/actions/retry-command
         with:
           command: gh pr edit $PR --add-reviewer github/docs-engineering --add-label reviewers-docs-engineering

.github/workflows/test.yml

@@ -42,7 +42,6 @@ jobs:
           - audit-logs
           - automated-pipelines
           # - bookmarklets
-          - changelogs
           # - code-scanning
           # - codeql-cli
           - color-schemes

.gitignore

@@ -109,3 +109,4 @@ translations/
 
 # Shared local volume (bufo)
 .local
+docs-ghes-3.14/

Dockerfile

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260326-105710-g59112a0a7@sha256:ba809251141daf76a02c7c064ae2c3b27a904f2f62b16582f62fe4328267f38f AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260501-222137-g8063ecb13@sha256:9c650d5e53cbf6c95951373d197ede7955329ef695f5fc6fb8a1c56a8e3b817f AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

config/moda/configuration/default/env.yaml

@@ -9,7 +9,11 @@ data:
   RATE_LIMIT_MAX: '21'
   # Moda uses a non-default port for sending datadog metrics
   DD_DOGSTATSD_PORT: '28125'
-  # OTel distributed tracing — sends spans to OTel Collector via OTLP/HTTP (proto).
-  # Uses stamp address (not mesh) since docs-internal is not on the service mesh.
-  # See https://thehub.github.com/epd/engineering/dev-practicals/observability/distributed-tracing/instrumentation/
-  OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'https://otelcol.service.%stamp%.github.net/v1/traces'
+  # NodeSDK auto-enables OTLP metrics and logs exporters when these env vars
+  # are unset. We only want traces, so explicitly disable the others to avoid
+  # spamming export errors. See https://opentelemetry.io/docs/specs/otel/protocol/exporter/
+  OTEL_METRICS_EXPORTER: 'none'
+  OTEL_LOGS_EXPORTER: 'none'
+  # OTel traces endpoint is set per-environment (see production/env.yaml).
+  # Stagings don't have OTEL_EXPORTER_OTLP_TRACES_HEADERS, so they don't
+  # export traces — tracing.ts gates SDK startup on the endpoint env var.

config/moda/configuration/production/env.yaml

@@ -13,6 +13,9 @@ data:
   # Equivalent to HEAVEN_DEPLOYED_ENV === 'production'
   MODA_PROD_SERVICE_ENV: 'true'
   # OTel distributed tracing — sends spans to OTel Collector via OTLP/HTTP (proto).
-  # Uses stamp address (not mesh) since docs-internal is not on the service mesh.
+  # Uses %site% template (not %stamp%) since docs-internal is not on the service
+  # mesh and not on a Proxima stamp (region: iad, profile: general). %site%
+  # interpolates to the cluster's site (e.g. iad), giving a hostname like
+  # otelcol.service.iad.github.net that resolves from production pods.
   # See https://thehub.github.com/epd/engineering/dev-practicals/observability/distributed-tracing/instrumentation/
-  OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'https://otelcol.service.%stamp%.github.net/v1/traces'
+  OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'https://otelcol.service.%site%.github.net/v1/traces'

content/README.md

@@ -149,8 +149,7 @@ shortTitle: Contributing to projects
 ### `layout`
 
 - Purpose: Render the proper page layout.
-- Type: `String` that matches the name of the layout.
-For a layout named `components/landing`, the value would be `product-landing`.
+- Type: `String` that matches the name of a supported layout. See `layoutNames` in `src/frame/lib/frontmatter.ts` for the authoritative list (for example, `discovery-landing`, `journey-landing`, `bespoke-landing`, `category-landing`, `toc-landing`, `inline`).
 - Optional. If omitted, `DefaultLayout` is used.
 
 ### `children`

content/account-and-profile/index.md

@@ -6,11 +6,6 @@ introLinks:
   quickstart: /account-and-profile/get-started/account
   overview: /account-and-profile/get-started/profile
 layout: discovery-landing
-changelog:
-  label: profiles, github-themes
-  versions:
-    fpt: '*'
-    ghec: '*'
 versions:
   fpt: '*'
   ghes: '*'

content/actions/index.md

@@ -5,8 +5,6 @@ intro: 'Automate, customize, and execute your software development workflows rig
 introLinks:
   overview: /actions/get-started/understand-github-actions
   quickstart: /actions/get-started/quickstart
-changelog:
-  label: actions
 redirect_from:
   - /articles/automating-your-workflow-with-github-actions
   - /articles/customizing-your-project-with-github-actions

content/actions/reference/workflows-and-actions/events-that-trigger-workflows.md

@@ -830,7 +830,7 @@ jobs:
 
 > [!NOTE]
 > * The webhook payload available to GitHub Actions does not include the `added`, `removed`, and `modified` attributes in the `commit` object. You can retrieve the full commit object using the API. For information, see [AUTOTITLE](/graphql/reference/objects#commit) in the GraphQL API documentation or [AUTOTITLE](/rest/commits#get-a-commit).
-> * {% ifversion fpt or ghec or ghes > 3.14 %}Events will not be created if more than 5,000 branches are pushed at once. {% endif %}Events will not be created for tags when more than three tags are pushed at once.
+> * Events will not be created if more than 5,000 branches are pushed at once. Events will not be created for tags when more than three tags are pushed at once.
 
 Runs your workflow when you push a commit or tag, or when you create a repository from a template.