Skip to content

Commit 2372f8e

Browse files
authored
Merge pull request #45798 from github/repo-sync
Repo sync
2 parents a9e50ec + aa0ed84 commit 2372f8e

6 files changed

Lines changed: 278 additions & 4 deletions

File tree

‎content/admin/backing-up-and-restoring-your-instance/restoring-from-a-backup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Before restoring a backup:
3232

3333
1. **Enable maintenance mode** on the target instance. See [AUTOTITLE](/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode).
3434
1. **Verify access** to the backup storage containing the snapshot.
35-
1. **Pause interfering services** — if using High Availability (HA), make sure replication is stopped.
35+
1. **Tear down replication**. If using High Availability (HA), run `ghe-repl-teardown` on the target instance. Stopping replication with `ghe-repl-stop` is not sufficient, because the target remains configured as part of a replication pair and the restore fails. See [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-high-availability/removing-a-high-availability-replica).
3636
1. **Prepare for {% data variables.product.prodname_actions %}** — if enabled, ensure the target instance is configured with the correct external storage. See [AUTOTITLE](/admin/backing-up-and-restoring-your-instance/restoring-with-github-actions-enabled) for details.
3737

3838
## Starting the restore operation

‎content/code-security/tutorials/trialing-github-advanced-security/trial-advanced-security.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho
2727
1. You have not previously purchased {% data variables.product.prodname_GHAS %} (that is, you do not currently or in the past have a paid license for {% data variables.product.prodname_GHAS %}).
2828
1. You are not already using metered billing for {% data variables.product.prodname_GHAS %}.
2929
1. If you have had a previous {% data variables.product.prodname_GHAS %} trial, you are eligible only if you have had no more than one previous trial and it ended at least 180 days ago.
30+
1. Your enterprise has 300 or fewer seats.
3031

3132
> [!TIP]
3233
> * **No enterprise account?** Start a trial of {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud).

‎content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Restricts plugin installation to only the marketplaces explicitly defined by the
161161

162162
Sets your preferred model as the default for new conversations. This lets you choose the default model that best fits your enterprise's workflows. Users can still select a different model on a per-conversation basis.
163163
* Set `model` to `"auto"` to use {% data variables.copilot.copilot_auto_model_selection_short %} as the default, so new sessions choose a model automatically unless the user specifies a different model on a per-conversation basis. See [AUTOTITLE](/copilot/concepts/models/auto-model-selection).
164-
* Set `model` to a specific model and version to make that model the default for new conversations, for example `"kimi-k-3"`.
164+
* Set `model` to a specific model and version to make that model the default for new conversations, for example `"kimi-k3"`.
165165

166166
This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "auto" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"model": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team.
167167

‎data/release-notes/enterprise-server/3-22/0-rc1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
date: '2026-08-11'
22
release_candidate: true
3-
deprecated: false
3+
deprecated: true
44
intro: |
55
> [!NOTE] Release candidate (RC) builds are intended solely for use in a test environment. Do not install an RC in a production environment.
66
>

0 commit comments

Comments
 (0)