Merge branch 'main' into main

Author: Gabriel-Xu

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:20260603-101723-g62a660e20@sha256:216e9ea02bb1f000a3e9ed1beeb9127b33a7661ae61f041879e61fffd52e1bd2 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260611-183630-g2a7c4449e@sha256:1ed595f8af068c9d8aa3afc113db1576a02e9492e513198c271c7bb3cd87c944 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/admin/monitoring-and-managing-your-instance/additional-nodes/configuring-additional-nodes.md

@@ -10,10 +10,6 @@ category:
   - Scale your instance
 ---
 
-> [!NOTE]
-> The ability to add additional compute nodes to HA is in {% data variables.release-phases.public_preview %} and subject to change. During the preview, please share any feedback with your customer success team.
-
-
 For {% data variables.product.prodname_ghe_server %} customers looking to scale horizontally, migrating to and operating a cluster is an option, but is resource-intensive and time-consuming. As an alternative, we recommend adding nodes to an HA configuration.
 
 The terms "additional node" and "stateless node" are used interchangeably throughout this article. Stateless nodes can only be added to HA deployments that contain at least one replica.
@@ -59,7 +55,7 @@ ghe-cluster-balance rebalance --yes
 
 The `ghe-config-apply` command is a requirement to add stateless nodes.
 
-For the public preview, we have not specifically tested for downtime, and it's not clear if a maintenance window is required.
+We recommend a maintenance window to add stateless nodes.
 
 ## Removing an additional node
 
@@ -71,7 +67,7 @@ ghe-config-apply
 
 The `ghe-config-apply` command is a requirement to remove stateless nodes.
 
-For the public preview, we have not specifically tested for downtime, and it's not clear if a maintenance window is required.
+We recommend a maintenance window to remove stateless nodes.
 
 ## Reprovisioning a node that previously hosted {% data variables.product.prodname_ghe_server %}
 

content/billing/reference/supported-payment-methods.md

@@ -43,7 +43,8 @@ The following Azure subscription types cannot be used as a payment method for {%
 | `AzureForStudents_2018-01-01` | MS-AZR-0170P |
 | `DreamSpark_2015-02-01` | MS-AZR-0144P |
 | `AzurePass_2014-09-01` | MS-AZR-0120P, MS-AZR-0122P–MS-AZR-0125P, MS-AZR-0128P–MS-AZR-0130P |
-| `PayAsYouGo_2014-09-01` | MS-AZR-0017G |
+| `PayAsYouGo_2014-09-01` | MS-AZR-0001P, MS-AZR-0002P, MS-AZR-0003P, MS-AZR-0006P, MS-AZR-0008P, MS-AZR-0010P, MS-AZR-0011P, MS-AZR-0018P, MS-AZR-0019P, MS-AZR-0030P, MS-AZR-0044P, MS-AZR-0046P, MS-AZR-0048P, MS-AZR-0050P |
+| `MSDN_2014-09-01` | MS-AZR-0029P, MS-AZR-0059P, MS-AZR-0062P, MS-AZR-0063P |
 
 {% ifversion fpt or ghec %}
 

content/code-security/how-tos/find-and-fix-code-vulnerabilities/configure-code-scanning/configure-code-scanning.md

@@ -77,7 +77,7 @@ Your repository is eligible for default setup for {% data variables.product.prod
 1. Optionally, to view your default setup configuration after enablement, select {% octicon "kebab-horizontal" aria-label="Menu" %}, then click **{% octicon "gear" aria-hidden="true" aria-label="gear" %} View {% data variables.product.prodname_codeql %} configuration**.
 
 > [!NOTE]
-> If no pushes and pull requests have occurred in a repository with default setup enabled for 6 months, the weekly schedule will be disabled to save your {% data variables.product.prodname_actions %} minutes.
+> If no pushes and pull requests have occurred in a repository with default setup enabled for 6 months, the weekly schedule will be disabled to save your {% data variables.product.prodname_actions %} minutes.{% ifversion code-scanning-inactive-repos %} Organization owners can enable monthly scans of inactive repositories. For more information, see [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization#continuing-scans-on-inactive-repositories).{% endif %}
 
 {% ifversion fpt or ghec %}
 

content/code-security/how-tos/find-and-fix-code-vulnerabilities/manage-your-configuration/edit-default-setup.md

@@ -83,6 +83,19 @@ For more information about {% data variables.product.prodname_codeql %} model pa
 
 1. The model packs will be automatically detected and used when {% data variables.product.prodname_code_scanning %} runs on any repository in the organization with default setup enabled.
 
+{% ifversion code-scanning-inactive-repos %}
+
+## Continuing scans on inactive repositories
+
+{% data reusables.code-scanning.inactive-repos-scan %} You can override this behavior in an organization, though the scan period is not configurable.
+
+{% data reusables.profile.access_org %}
+{% data reusables.organizations.org_settings %}
+{% data reusables.security-configurations.display-global-settings %}
+1. In the "{% data variables.product.prodname_code_scanning_caps %}" section, enable the **Keep scheduled scans running every 30 days for inactive repositories** setting.
+
+{% endif %}
+
 ## Further customization
 
 If you need to change any other aspects of your {% data variables.product.prodname_code_scanning %} configuration, consider configuring advanced setup. See [AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning).

content/code-security/how-tos/secure-at-scale/configure-organization-security/configure-specific-tools/code-scanning-at-scale.md

@@ -33,9 +33,9 @@ A repository must meet all the following criteria to be eligible for default set
 
 You can enable default setup for all eligible repositories in your organization. For more information, see [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale).
 
-### Extending {% data variables.product.prodname_codeql %} coverage in default setup
+### Configuring default setup features
 
-Through your organization's security settings page, you can extend coverage in default setup using model packs for all eligible repositories in your organization. For more information, see [AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup#extending-coverage-for-all-repositories-in-an-organization).
+Through your organization's security settings page, you can customize default setup for all eligible repositories, such as extending coverage using model packs. See [AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup).
 
 ## Configuring default setup for a subset of repositories in an organization
 

content/code-security/how-tos/secure-at-scale/configure-organization-security/establish-complete-coverage/configure-global-settings.md

@@ -105,6 +105,9 @@ You can customize several {% data variables.product.prodname_global_settings %}
 {% ifversion code-scanning-autofix %}* [Enabling {% data variables.copilot.copilot_autofix_short %} for {% data variables.product.prodname_codeql %}](#enabling-copilot-autofix-for-codeql){% endif %}
 * [Recommending the extended query suite for default setup](#recommending-the-extended-query-suite-for-default-setup)
 * [Expanding {% data variables.product.prodname_codeql %} analysis](#expanding-codeql-analysis)
+{%- ifversion code-scanning-inactive-repos %}
+* [Continuing scans on inactive repositories](#continuing-scans-on-inactive-repositories)
+{%- endif %}
 
 {% endif %}
 
@@ -124,6 +127,14 @@ You can select **{% data variables.copilot.copilot_autofix_short %}** to enable
 
 You can expand {% data variables.product.prodname_codeql %} analysis coverage for all repositories in your organization that use default setup by configuring {% data variables.product.prodname_codeql %} model packs. Model packs extend the {% data variables.product.prodname_codeql %} analysis to recognize additional frameworks and libraries that are not included in the standard {% data variables.product.prodname_codeql %} libraries. This global configuration applies to repositories using default setup and allows you to specify model packs published via the container registry. For more information, see [AUTOTITLE](/code-security/how-tos/scan-code-for-vulnerabilities/manage-your-configuration/editing-your-configuration-of-default-setup#extending-coverage-for-all-repositories-in-an-organization).
 
+{% ifversion code-scanning-inactive-repos %}
+
+### Continuing scans on inactive repositories
+
+{% data reusables.code-scanning.inactive-repos-scan %} You can select **Keep scheduled scans running every 30 days for inactive repositories** to override this behavior in an organization. The scan period is not configurable.
+
+{% endif %}
+
 ## Configuring global {% data variables.product.prodname_secret_scanning %} settings
 
 {% data reusables.security-configurations.secret-scanning-security-configs-summary %}

content/copilot/how-tos/administer-copilot/manage-for-organization/prepare-for-custom-agents.md

@@ -22,12 +22,19 @@ You should understand what {% data variables.copilot.copilot_custom_agents %} ar
 
 ## Preparing your organization for {% data variables.copilot.custom_agents_short %}
 
+Organization-level {% data variables.copilot.custom_agents_short %} are stored in the `/agents` directory of your organization's `.github` or `.github-private` repository. Both work the same way and make the {% data variables.copilot.custom_agents_short %} available to all members of the organization, regardless of whether they have access to the repository itself.
+
+For more information on `.github` and `.github-private` repositories, see [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile).
+
+If you don't already have a suitable repository, follow the steps below to create one. These steps describe creating a `.github-private` repository, but you can also create a `.github` repository by naming it `.github` instead.
+
 1. Create your {% data variables.copilot.copilot_custom_agent_short %} repository using [{% data variables.product.github %}'s template repository](https://github.com/docs/custom-agents-template?ref_product=copilot&ref_type=engagement&ref_style=text). The template includes a README and the file structure you need.
 1. In the **Choose an owner** {% octicon "triangle-down" aria-hidden="true" aria-label="triangle-down" %} dropdown menu, choose your organization.
 1. Name the repository `.github-private` and write a brief description.
-1. In the visibility dropdown menu, choose one of the following options:
-     * Click {% octicon "organization" aria-hidden="true" aria-label="organization" %} **Internal** to grant read access to all members of your organization or enterprise.
-     * Click {% octicon "lock" aria-hidden="true" aria-label="lock" %} **Private** to manually grant access after creation or if internal visibility is not an option.
+1. In the visibility dropdown menu, click {% octicon "lock" aria-hidden="true" aria-label="lock" %} **Private**.
+     * Organization members will still be able to use {% data variables.copilot.custom_agents_short %} stored in this repository, regardless of whether they have direct access to the repository itself. Keeping the repository private also avoids conflicts with other features that require `.github-private` to be private, such as the organization member-only profile README.
+    * If you want organization members to view and collaborate on the {% data variables.copilot.agent_profiles %} directly, consider using a `.github` repository with {% octicon "organization" aria-hidden="true" aria-label="organization" %} **Internal** visibility. If you are an open source organization and want to share the {% data variables.copilot.custom_agents_short %} publicly, select {% octicon "globe" aria-hidden="true" aria-label="globe" %} **Public** visibility.
+
 {% data reusables.repositories.create-repo %}
 1. Update the template README. Include any creation guidelines for {% data variables.copilot.custom_agents_short %} or compliance considerations specific to your organization.
 

content/copilot/how-tos/copilot-cli/use-copilot-cli/invoke-custom-agents.md

@@ -51,15 +51,16 @@ The AI model being used by the CLI can choose to delegate a task to a subsidiary
 
 You can define your own {% data variables.copilot.custom_agents_short %} using Markdown files, called {% data variables.copilot.agent_profiles %}, that specify what expertise the agent should have, what tools it can use, and any specific instructions for how it should respond.
 
-You can define {% data variables.copilot.custom_agents_short %} at the user, repository, or organization/enterprise level:
+You can define {% data variables.copilot.custom_agents_short %} at the user, repository, organization, or enterprise level:
 
 | Type | Location | Scope |
 | --- | --- | --- |
 | User-level {% data variables.copilot.copilot_custom_agent_short %} | local `~/.copilot/agents` directory | All projects |
 | Repository-level {% data variables.copilot.copilot_custom_agent_short %} | `.github/agents` directory in your local and remote repositories | Current project |
-| Organization and Enterprise-level {% data variables.copilot.copilot_custom_agent_short %} | `/agents` directory in the `.github-private` repository in an organization or enterprise | All projects under your organization and enterprise account |
+| Organization-level {% data variables.copilot.copilot_custom_agent_short %} | `/agents` directory in the organization's `.github` or `.github-private` repository | All projects within the organization |
+| Enterprise-level {% data variables.copilot.copilot_custom_agent_short %} | `/agents` directory in the `.github-private` repository of an organization designated in enterprise settings. For more information, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/prepare-for-custom-agents#enabling-and-protecting-custom-agents-in-your-enterprise). | All projects under the enterprise account |
 
-In the case of naming conflicts, a system-level agent overrides a repository-level agent, and the repository-level agent would override an organization-level agent.
+In the case of naming conflicts (where agents share the same filename), a user-level agent overrides a repository-level agent, a repository-level agent overrides an organization-level agent, and an organization-level agent overrides an enterprise-level agent.
 
 {% data variables.copilot.custom_agents_caps_short %} can be used in three ways:
 

content/copilot/how-tos/copilot-cli/use-copilot-cli/overview.md

@@ -283,6 +283,18 @@ You can run {% data variables.copilot.copilot_cli_short %} sessions inside a san
 
 Press <kbd>Ctrl</kbd>+<kbd>T</kbd> to show or hide the model's reasoning process while it generates a response. This setting persists across sessions, allowing you to observe how {% data variables.product.prodname_copilot_short %} works through complex problems.
 
+### Configure settings
+
+You can view and change {% data variables.copilot.copilot_cli_short %} settings using the `/settings` slash command.
+
+* Run `/settings` to open an interactive settings dialog, where you can search for a setting by name and edit it.
+* Run `/settings KEY VALUE` to set a setting inline, where KEY is the name of the setting and VALUE is the value you want to set. This also works in scripts and in programmatic sessions started with `-p`.
+* Run `/settings reset KEY` to restore a setting to its default value.
+
+Some settings, such as the color mode, take effect immediately when you save them.
+
+For the full list of available settings, see [AUTOTITLE](/copilot/reference/copilot-cli-reference/cli-config-dir-reference#configuration-file-settings).
+
 ## Find out more
 
 For a complete list of the command line options and slash commands that you can use with {% data variables.copilot.copilot_cli_short %}, do one of the following: