Merge pull request #36597 from github/repo-sync

Repo sync
github · Mar 3, 2025 · 82d9257 · 82d9257
2 parents 0d9ece4 + eabfb78
commit 82d9257
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/content/admin/overview/system-overview.md b/content/admin/overview/system-overview.md
@@ -85,7 +85,7 @@ For more information, see [AUTOTITLE](/admin/configuration/configuring-your-ente
 
 {% data variables.product.prodname_ghe_server %} is provided as an appliance, and many of the operating system packages are modified compared to the usual Ubuntu distribution. We do not support modifying the underlying operating system for this reason (including operating system upgrades), which is aligned with the [{% data variables.product.prodname_ghe_server %} license and support agreement](https://enterprise.github.com/license), under section 11.3 Exclusions.
 
-Currently, the base operating system for {% data variables.product.prodname_ghe_server %} is Ubuntu 20 (Focal Fossa).
+Currently, the base operating system for {% data variables.product.prodname_ghe_server %} is Ubuntu 20 (Focal Fossa). Although Ubuntu 20 (Focal Fossa) will reach the end of standard support by May 2025, we will be able to use extended security maintenance and get security support beyond 2025.
 
 Regular patch updates are released on the {% data variables.product.prodname_ghe_server %} [releases](https://enterprise.github.com/releases) page, and the [release notes](/admin/release-notes) page provides more information. These patches typically contain upstream vendor and project security patches after they've been tested and quality approved by our engineering team. There can be a slight time delay from when the upstream update is released to when it's tested and bundled in an upcoming {% data variables.product.prodname_ghe_server %} patch release.
 

diff --git a/...ilot-in-your-organization/managing-policies-for-copilot-in-your-organization.md b/...ilot-in-your-organization/managing-policies-for-copilot-in-your-organization.md
@@ -28,7 +28,11 @@ Organization owners can set policies to govern how {% data variables.product.pro
 
 * {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_dotcom_the_website %}
 * {% data variables.product.prodname_copilot_chat_short %} in the IDE
-* Editor preview features
+* Editor preview features, such as:
+  * Vision (available to {% data variables.product.prodname_vscode_shortname %} Insiders)
+  * {% data variables.copilot.next_edit_suggestions_caps %} (available in {% data variables.product.prodname_vscode_shortname %})
+  * GPT-4o {% data variables.product.prodname_copilot_short %} code completion (available in {% data variables.product.prodname_vscode_shortname %})
+  * {% data variables.product.prodname_copilot_short %} Edits agent mode (available in {% data variables.product.prodname_vscode_shortname %})
 * {% data variables.product.prodname_copilot_mobile_short %}
 * {% data variables.product.prodname_copilot_cli_short %} and {% data variables.product.prodname_windows_terminal %}
 * Suggestions matching public code