Merge branch 'main' into main

Author: Stanley Mba

Diff for: .github/workflows/review-comment.yml

@@ -81,7 +81,7 @@ jobs:
 
             * [Spin up a codespace][codespace]
             * [Set up a local development environment][local]
-            ${{ github.repository == 'github/docs' && '' || '* Message `#docs-engineering` on Slack for a staging server.' }}
+            ${{ github.repository == 'github/docs-internal' && '* Message `#docs-engineering` on Slack for a staging server.' || '' }}
 
             [codespace]: ${{ github.repository == 'github/docs' && 'https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/working-on-github-docs-in-a-codespace' || 'https://github.com/github/docs-team/blob/main/contributing-to-docs/use-a-codespace-to-review.md' }}
             [local]: https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/creating-a-local-environment#setting-up-your-local-environment

Diff for: .github/workflows/reviewers-content-systems.yml

@@ -29,13 +29,7 @@ jobs:
       GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
 
     steps:
-      - name: Check out repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
       - name: Add content systems as a reviewer
         run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} --json labels --jq '.labels[].name')
-          if ! echo "$labels" | grep -q 'reviewers-content-systems'; then
-            gh pr edit $PR --add-reviewer github/docs-content-systems
-            gh pr edit $PR --add-label reviewers-content-systems
-          fi
+          gh pr edit $PR --add-reviewer github/docs-content-systems
+          gh pr edit $PR --add-label reviewers-content-systems

Diff for: .github/workflows/reviewers-dependabot.yml

@@ -30,13 +30,7 @@ jobs:
       PR: ${{ github.event.pull_request.html_url }}
 
     steps:
-      - name: Check out repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
       - name: Add Dependabot Core Maintainers as reviewers
         run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} --json labels --jq '.labels[].name')
-          if ! echo "$labels" | grep -q 'reviewers-dependabot'; then
-            gh pr edit $PR --add-reviewer github/dependabot-updates-reviewers
-            gh pr edit $PR --add-label reviewers-dependabot
-          fi
+          gh pr edit $PR --add-reviewer github/dependabot-updates-reviewers
+          gh pr edit $PR --add-label reviewers-dependabot

Diff for: .github/workflows/reviewers-docs-engineering.yml

@@ -47,13 +47,7 @@ jobs:
       GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
 
     steps:
-      - name: Check out repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
       - name: Add docs engineering as a reviewer
         run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} --json labels --jq '.labels[].name')
-          if ! echo "$labels" | grep -q 'reviewers-docs-engineering'; then
-            gh pr edit $PR --add-reviewer github/docs-engineering
-            gh pr edit $PR --add-label reviewers-docs-engineering
-          fi
+          gh pr edit $PR --add-reviewer github/docs-engineering
+          gh pr edit $PR --add-label reviewers-docs-engineering

Diff for: .github/workflows/reviewers-legal.yml

@@ -66,8 +66,5 @@ jobs:
           GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
           PR: ${{ github.event.pull_request.html_url }}
         run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} --json labels --jq '.labels[].name')
-          if ! echo "$labels" | grep -q 'reviewers-legal'; then
-            gh pr edit $PR --add-reviewer github/legal-product
-            gh pr edit $PR --add-label reviewers-legal
-          fi
+          gh pr edit $PR --add-reviewer github/legal-product
+          gh pr edit $PR --add-label reviewers-legal

Diff for: .vscode/extensions.json

@@ -0,0 +1,13 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+		"ms-vscode-remote.remote-containers"
+	]
+}

Diff for: config/moda/deployment.yaml

@@ -7,6 +7,17 @@ environments:
       profile: general
       region: iad
 
+  # 12 staging environments, evergreens only
+  # they should all contain the same configs
+  - name: staging-boxwood
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
   - name: staging-cedar
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
@@ -16,6 +27,60 @@ environments:
       profile: general
       region: iad
 
+  - name: staging-cypress
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-fir
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-hemlock
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-holly
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-juniper
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-laurel
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
   - name: staging-pine
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
@@ -25,6 +90,24 @@ environments:
       profile: general
       region: iad
 
+  - name: staging-redwood
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
+  - name: staging-sequoia
+    require_pipeline: false
+    notify_still_locked: true # Notify last person to lock this after an hour
+    secret_environment: production
+    required_review_tasks: []
+    cluster_selector:
+      profile: general
+      region: iad
+
   - name: staging-spruce
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour

Diff for: content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-accessibility-settings.md

@@ -18,6 +18,8 @@ To create an experience on {% data variables.product.github %} that fits your ne
 
 You can decide whether you want to use some or all keyboard shortcuts, and control the display of animated images and how links are displayed.
 
+This article will help you customize your experience on the {% data variables.product.github %} website as a whole. For information on using specific {% data variables.product.github %} products with screen readers and other assistive technologies, see the [{% data variables.product.github %} Accessibility Documentation](https://accessibility.github.com/documentation).
+
 ## Managing the appearance of links
 
 You can control whether links in text blocks are underlined and therefore more distinguishable.

Diff for: content/actions/use-cases-and-examples/building-and-testing/building-and-testing-net.md

@@ -171,9 +171,9 @@ steps:
 - name: Install dependencies
   run: dotnet restore
 - name: Build
-  run: dotnet build
+  run: dotnet build --no-restore
 - name: Test with the dotnet CLI
-  run: dotnet test
+  run: dotnet test --no-build
 ```
 
 ## Packaging workflow data as artifacts
@@ -204,7 +204,7 @@ jobs:
         - name: Install dependencies
           run: dotnet restore
         - name: Test with dotnet
-          run: dotnet test --logger trx --results-directory {% raw %}"TestResults-${{ matrix.dotnet-version }}"{% endraw %}
+          run: dotnet test --no-restore --logger trx --results-directory {% raw %}"TestResults-${{ matrix.dotnet-version }}"{% endraw %}
         - name: Upload dotnet test results
           uses: {% data reusables.actions.action-upload-artifact %}
           with:

Diff for: content/admin/all-releases.md

@@ -46,7 +46,7 @@ We hosted developer documentation for {% data variables.product.prodname_ghe_ser
 
 ## Recommended {% data variables.product.prodname_codeql_cli %} versions for code scanning
 
-For instances with a {% data variables.product.prodname_GH_advanced_security %} license and {% data variables.product.prodname_code_scanning %} enabled, the {% data variables.product.prodname_codeql %} action for {% data variables.product.prodname_code_scanning %} analysis uses a minimum recommended version of the {% data variables.product.prodname_codeql_cli %} by default.
+For instances with a {% data variables.product.prodname_GHAS_or_code_security %} license and {% data variables.product.prodname_code_scanning %} enabled, the {% data variables.product.prodname_codeql %} action for {% data variables.product.prodname_code_scanning %} analysis uses a minimum recommended version of the {% data variables.product.prodname_codeql_cli %} by default.
 
 If you run analysis in an external CI system, we recommend using the same version of the {% data variables.product.prodname_codeql_cli %}. See [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance).
 

Diff for: content/admin/configuring-settings/configuring-github-connect/about-github-connect.md

@@ -74,7 +74,7 @@ Additional data is transmitted if you enable individual features of {% data vari
 
 | Feature | Data | Which way does the data flow? | Where is the data used? |
 | ------- | ---- | --------- | ------ |
-| Automatic user license sync | Each {% data variables.product.prodname_ghe_server %} user's user ID and email addresses{% ifversion ghas-in-license-sync %}, and whether the user consumes a license for {% data variables.product.prodname_GH_advanced_security %}{% endif %} | From {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} |
+| Automatic user license sync | Each {% data variables.product.prodname_ghe_server %} user's user ID and email addresses{% ifversion ghas-in-license-sync %}, and whether the user consumes a license for {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %}, {% data variables.product.prodname_GH_code_security %}, or {% data variables.product.prodname_GH_secret_protection %}{% endif %}.{% endif %} | From {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} |
 | {% data variables.product.prodname_dependabot_alerts %} | Vulnerability alerts | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.prodname_ghe_server %} | {% data variables.product.prodname_ghe_server %} |
 | {% data variables.product.prodname_dependabot_updates %} | Dependencies and the metadata for each dependency's repository<br><br>If a dependency is stored in a private repository on {% data variables.product.prodname_dotcom_the_website %}, data will only be transmitted if {% data variables.product.prodname_dependabot %} is configured and authorized to access that repository. | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.prodname_ghe_server %} | {% data variables.product.prodname_ghe_server %} |
 | {% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.prodname_ghe_server %}<br><br>From {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.prodname_ghe_server %} |

Diff for: content/admin/data-residency/about-github-enterprise-cloud-with-data-residency.md

@@ -47,7 +47,7 @@ To pay for user licenses and services, you can:
 
 You will be on our latest billing platform, which allows you to estimate spending, create cost centers to manage expenses, and pay flexibly for the services you use.
 
-You can also sign up for usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses, meaning you won't need to purchase a pre-defined number of licenses in advance.
+You can also sign up for usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}{% ifversion ghas-products-cloud %} products{% endif %}, meaning you won't need to purchase a pre-defined number of licenses in advance.
 
 ## Developer experience
 

Diff for: content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md

@@ -1,7 +1,7 @@
 ---
 title: Enforcing policies for code security and analysis for your enterprise
 intro: 'You can enforce policies to manage the use of code security and analysis features within your enterprise''s organizations.'
-permissions: 'Enterprise owners can enforce code security and analysis policies for {% data variables.product.prodname_GH_advanced_security %} in an enterprise.'
+permissions: 'Enterprise owners can define and enforce policies to control use of code security and analysis features in an enterprise.'
 product: '{% data reusables.gated-features.ghas %}'
 versions:
   ghec: '*'
@@ -33,7 +33,7 @@ shortTitle: Code security & analysis
 
 You can enforce policies to manage the use of code security and analysis features within organizations owned by your enterprise. You can allow or disallow people with admin access to a repository to enable or disable the security and analysis features.
 
-Additionally, you can enforce policies for the use of {% data variables.product.prodname_GH_advanced_security %} in your enterprise's organizations and repositories.
+Additionally, you can enforce policies for the use of {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %} in your enterprise's organizations and repositories.
 
 {% ifversion ghec %}
 

Diff for: content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md

@@ -38,7 +38,7 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {%
 
 ## Prerequisites for {% data variables.product.prodname_code_scanning %}
 
-* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)){% endif %}
+* A license for {% ifversion ghas-products %}{% data variables.product.prodname_GH_code_security %} or {% endif %}{% data variables.product.prodname_GHAS %}, (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security))
 
 * {% data variables.product.prodname_code_scanning_caps %} enabled in the management console (see [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise))
 

Diff for: content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md

@@ -27,7 +27,7 @@ Some additional features, such as license checks, blocking of pull requests, and
 
 ## Prerequisites for dependency review
 
-* A license for {% data variables.product.prodname_GH_advanced_security %} (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)).
+* A license for {% ifversion ghas-products %}{% data variables.product.prodname_GH_code_security %} or {% endif %}{% data variables.product.prodname_GHAS %} (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)).
 
 * The dependency graph enabled for the instance. Site administrators can enable the dependency graph via the management console or the administrative shell (see [AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)).
 
@@ -43,7 +43,7 @@ For more information, see [AUTOTITLE](/admin/code-security/managing-supply-chain
 
 {% data reusables.dependency-review.dependency-review-action-beta-note %}
 
-The dependency review action is included in your installation of {% data variables.product.prodname_ghe_server %}. It is available for all repositories that have {% data variables.product.prodname_GH_advanced_security %} and dependency graph enabled.
+The dependency review action is included in your installation of {% data variables.product.prodname_ghe_server %}. It is available for all repositories that have {% ifversion ghas-products %}{% data variables.product.prodname_GH_code_security %} or {% endif %}{% data variables.product.prodname_GHAS %} and dependency graph enabled.
 
 {% data reusables.dependency-review.dependency-review-action-overview %}
 

Diff for: content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md

@@ -29,7 +29,7 @@ If someone checks a secret with a known pattern into a repository, {% data varia
 
 * The SSSE3 (Supplemental Streaming SIMD Extensions 3) CPU flag needs to be enabled on the VM/KVM that runs {% data variables.product.prodname_ghe_server %}. For more information about SSSE3, see [Intel 64 and IA-32 Architectures Optimization Reference Manual](https://cdrdv2-public.intel.com/671488/248966-Software-Optimization-Manual-R047.pdf) in the Intel documentation.
 
-* A license for {% data variables.product.prodname_GH_advanced_security %} (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security))
+* A license for {% ifversion ghas-products %}{% data variables.product.prodname_GH_secret_protection %} or {% endif %}{% data variables.product.prodname_GHAS %} (see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security))
 
 * {% data variables.product.prodname_secret_scanning_caps %} enabled in the management console (see [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise))