Skip to content

Commit 91f2c24

Browse files
authored
Merge branch 'main' into patch-1
2 parents 3b81e43 + 8729270 commit 91f2c24

195 files changed

Lines changed: 1269 additions & 567 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ready-for-doc-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
owner: github
3030
# Scope must include every repo that calls this reusable workflow, because
3131
# the script resolves the PR node (ITEM_NODE_ID) in the calling repo.
32-
repositories: docs-internal,docs-content,docs-strategy,docs-early-access,github
32+
repositories: docs-internal,docs-content,docs-strategy,docs-early-access,docs-team,github
3333

3434
- name: Check out repo content
3535
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# ---------------------------------------------------------------
1111
# To update the sha:
1212
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
13-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20260708-113537-g661fe65de@sha256:894162a6b21fc03da8ba889760592e6e223ba76f3067723f93bd1e49aff1c46b AS base
13+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20260713-090615-gb0d388add@sha256:8708e26b53b2304cf8d933be5e8fbca4fa4d07b3ba6e4be238372a5d3029e443 AS base
1414

1515
# Install curl for Node install and determining the early access branch
1616
# Install git for cloning docs-early-access & translations repos
115 KB
Loading

content/account-and-profile/concepts/username-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If the new owner of your old username creates a repository with the same name as
4343

4444
## Links to your previous profile page
4545

46-
After changing your username, links to your previous profile page, such as `https://{% data variables.product.product_url %}/previoususername`, will return a 404 error. We recommend updating any links to your profile from elsewhere{% ifversion fpt or ghec %}, such as your LinkedIn or Twitter profile{% endif %}.
46+
After changing your username, links to your previous profile page, such as `https://{% data variables.product.product_url %}/previoususername`, will return a 404 error. We recommend updating any links to your profile from elsewhere{% ifversion fpt or ghec %}, such as your LinkedIn or X (formerly Twitter) profile{% endif %}.
4747

4848
## Accounts logged in on {% data variables.product.prodname_mobile %}
4949

content/account-and-profile/tutorials/personalize-your-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Add pronouns to your public user profile to share information about yourself wit
9090
You can add up to four links to social accounts on your profile.
9191

9292
{% data reusables.user-settings.access_settings %}
93-
1. Under "Social accounts", in a blank "Link to social profile" field, type the full URL of the social account. For example, for the `@GitHub` Twitter account, type `https://twitter.com/github`.
93+
1. Under "Social accounts", in a blank "Link to social profile" field, type the full URL of the social account. For example, for the `@GitHub` X (formerly Twitter) account, type `https://x.com/github`.
9494
{% data reusables.profile.update-profile %}
9595

9696
{% endif %}

content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,8 @@ To show the full hook payload, result, and any exceptions for the delivery:
679679
ghe-webhook-logs -g DELIVERY_GUID
680680
```
681681

682+
{% ifversion ghes > 3.21 %}
683+
682684
## Backup and restore
683685

684686
### ghe-backup-prune-snapshots
@@ -689,8 +691,6 @@ This utility prunes old or invalid backup snapshot directories.
689691
ghe-backup-prune-snapshots
690692
```
691693

692-
{% ifversion ghes > 3.21 %}
693-
694694
### ghe-backup-healthcheck
695695

696696
This utility quickly confirms that GHES backups are being written, are recent, and that the backup disk is not in a risky state. For example, if usage is 90% or higher, it reports an error because the backup disk may be close to full. Setting `-no-color` gives plain text output, for example in logs or monitoring systems.

content/admin/backing-up-and-restoring-your-instance/backup-service-settings-reference.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ You can configure the following options in the "Backup Service" section of the {
1717

1818
* **Number of snapshots**: Sets how many backup snapshots to retain (default: `10`). Older snapshots are automatically pruned after each successful backup.
1919

20+
{% ifversion ghes > 3.21 %}
2021
> [!NOTE]
2122
> You can run the `ghe-backup-prune-snapshots` utility to prune old and invalid snapshots manually.
23+
{% endif %}
2224

2325
## Restore options
2426

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,20 @@ Across all of your enterprise's organizations, you can allow or disallow people
120120
> This policy controls the use of {% data variables.copilot.copilot_autofix_short %} on results found by {% data variables.product.prodname_code_scanning %} security queries only. {% data variables.copilot.copilot_autofix_short %} is an integral part of {% data variables.product.prodname_code_quality %} and cannot be disabled for that feature.
121121
122122
{% endif %}
123+
124+
{% ifversion ai-powered-security-detections %}
125+
126+
## Enforcing a policy to manage the use of AI-powered security detections in your enterprise's repositories
127+
128+
As an enterprise owner, you can control whether organization and repository administrators can enable AI-powered security detections for their organizations and repositories. This policy is set to "Not allowed" by default.
129+
130+
Allowing AI-powered security detections at the enterprise level does not enable the feature. Organization administrators must still explicitly enable AI-powered security detections. Repository administrators can opt-out of the feature.
131+
132+
This policy only takes effect if {% data variables.product.prodname_codeql %} default setup is enabled.
133+
134+
{% data reusables.enterprise-accounts.access-enterprise %}
135+
{% data reusables.enterprise-accounts.policies-tab %}
136+
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
137+
1. Under "AI Findings", select the dropdown menu and click a policy.
138+
139+
{% endif %}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ category:
1010
- Scale your instance
1111
---
1212

13+
{% ifversion ghes < 3.21 %}
14+
> [!NOTE]
15+
> Support for additional nodes in a high availability configuration is currently in {% data variables.release-phases.public_preview %} and subject to change.
16+
{% endif %}
17+
1318
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.
1419

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

content/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Like {% data variables.product.prodname_oauth_apps %}, {% data variables.product
3434
{% data variables.product.prodname_github_apps %} can be installed directly on {% ifversion enterprise-installed-apps %}enterprises, {% endif %}organizations and personal accounts and granted access to specific repositories. They come with built-in webhooks and narrow, specific permissions.
3535

3636
{% ifversion enterprise-apps-public-beta %}
37-
You can also create an enterprise-owned {% data variables.product.prodname_github_app %} that can only be installed on{% ifversion enterprise-installed-apps %} the enterprise itself or{% endif %} organizations within your enterprise, and can only be authorized by members of your enterprise. For more information, see [AUTOTITLE](/admin/managing-your-enterprise-account/creating-github-apps-for-your-enterprise).
37+
You can also create an enterprise-owned {% data variables.product.prodname_github_app %} that can only be installed on{% ifversion enterprise-installed-apps %} the enterprise itself or{% endif %} organizations within your enterprise, and can only be authorized by members of your enterprise. For more information, see [AUTOTITLE](/admin/managing-github-apps-for-your-enterprise/creating-github-apps-for-your-enterprise).
3838
{% endif %}
3939

4040
{% data reusables.apps.app_manager_role %}
@@ -78,7 +78,7 @@ Some examples of automations you could create with a {% data variables.product.p
7878

7979
### {% data variables.product.prodname_github_apps %} that respond to webhooks
8080

81-
If you want your app to respond to events on {% data variables.product.prodname_dotcom %}, your app should subscribe to webhooks. For example, you may want your app to leave a comment when a pull request is opened. For more information, see [AUTOTITLE](/apps/creating-github-apps/setting-up-a-github-app/using-webhooks-with-github-apps).
81+
If you want your app to respond to events on {% data variables.product.prodname_dotcom %}, your app should subscribe to webhooks. For example, you may want your app to leave a comment when a pull request is opened. For more information, see [AUTOTITLE](/apps/creating-github-apps/registering-a-github-app/using-webhooks-with-github-apps).
8282

8383
{% ifversion enterprise-installed-apps %}
8484
Apps installed on enterprises do not currently support webhooks, and must be installed on an organization to receive them.

0 commit comments

Comments
 (0)