Merge branch 'main' into docs/merge-group-branches-filters

Author: hiromieguchi802-lab

config/moda/configuration/default/env.yaml

@@ -9,3 +9,7 @@ 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'

config/moda/configuration/production/env.yaml

@@ -12,3 +12,7 @@ data:
   # Identifies the service deployment environment as production
   # 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.
+  # 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'

config/moda/secrets/production/secrets.yml

@@ -64,3 +64,8 @@ secrets:
     type: hydro_api_key
     owner: '@github/docs-engineering'
     externally_usable: true
+  OTEL_EXPORTER_OTLP_TRACES_HEADERS:
+    kind: latest_at_deployment_start
+    type: salt
+    owner: '@github/docs-engineering'
+    externally_usable: true

content/billing/reference/billing-roles.md

@@ -17,6 +17,10 @@ The following roles have access to the billing platform:
 
 * **Enterprise owners and enterprise billing managers**: Can manage billing for an enterprise account.
 * **Organization owners and organization billing managers**: Can manage billing for an organization on {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}.
+
+  > [!NOTE]
+  > If your organization is owned by an enterprise account, you cannot add billing managers at the organization level. Billing for enterprise-owned organizations is managed at the enterprise level.
+
 * **Personal accounts (non-managed)**: Can access the billing platform for their personal usage.
 
 To add a billing manager, see:
@@ -38,9 +42,7 @@ You have full administrative access to your organization. You can:
 
 You can:
 
-* View all metered usage for your organization its repositories.
-* View organization-level budgets.
-* Download CSV usage reports.
+{% data reusables.billing.org-billing-manager-permissions %}
 
 ## Enterprise owners and enterprise billing managers
 
@@ -51,6 +53,8 @@ You can:
 * Download CSV usage reports for products your enterprise is using.
 * Set budgets for your enterprise.
 * Create cost centers for all organizations within your enterprise.
+* View and manage user licenses.
+* Manage other billing settings, such as payment methods and billing contacts.
 
 ## Further reading
 

content/code-security/concepts/about-code-quality.md

@@ -11,6 +11,8 @@ redirect_from:
   - /code-security/code-quality/concepts/about-code-quality
   - /code-security/code-quality/concepts
   - /code-security/code-quality
+category:
+  - Improve code quality
 ---
 
 {% data reusables.code-quality.code-quality-preview-note %}

content/code-security/concepts/code-scanning/about-code-scanning-alerts.md

@@ -12,6 +12,8 @@ redirect_from:
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts
   - /code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts
 contentType: concepts
+category:
+  - Find and fix code vulnerabilities
 ---
 
 {% data reusables.code-scanning.enterprise-enable-code-scanning %}

content/code-security/concepts/code-scanning/about-code-scanning.md

@@ -16,6 +16,8 @@ versions:
   ghes: '*'
   ghec: '*'
 contentType: concepts
+category:
+  - Find and fix code vulnerabilities
 ---
 
 {% data reusables.code-scanning.enterprise-enable-code-scanning %}

content/code-security/concepts/code-scanning/about-integration-with-code-scanning.md

@@ -14,6 +14,8 @@ versions:
   ghes: '*'
   ghec: '*'
 contentType: concepts
+category:
+  - Find and fix code vulnerabilities
 ---
 
 ## About integration with code scanning

content/code-security/concepts/code-scanning/codeql/about-code-scanning-with-codeql.md

@@ -12,6 +12,8 @@ versions:
   ghes: '*'
   ghec: '*'
 contentType: concepts
+category:
+  - Find and fix code vulnerabilities
 ---
 
 {% data reusables.code-scanning.enterprise-enable-code-scanning %}

content/code-security/concepts/code-scanning/codeql/about-codeql-code-scanning-for-compiled-languages.md

@@ -9,6 +9,8 @@ versions:
   ghes: '*'
   ghec: '*'
 contentType: concepts
+category:
+  - Find and fix code vulnerabilities
 ---
 
 ## About the {% data variables.code-scanning.codeql_workflow %} and compiled languages