From 5a70562ac3cc87d39b5e958214887b76b4377a57 Mon Sep 17 00:00:00 2001
From: Felicity Chapman <felicitymay@github.com>
Date: Tue, 15 Oct 2024 11:10:36 +0100
Subject: [PATCH 1/4] Swap to simpler permissions statement for articles in
 "Securing your organization" (#52676)

---
 ...recommended-security-configuration-in-your-organization.md | 2 +-
 ...figuring-global-security-settings-for-your-organization.md | 2 +-
 .../about-enabling-security-features-at-scale.md              | 1 -
 ...choosing-a-security-configuration-for-your-repositories.md | 2 +-
 .../deleting-a-custom-security-configuration.md               | 2 +-
 ...taching-repositories-from-their-security-configurations.md | 2 +-
 .../editing-a-custom-security-configuration.md                | 2 +-
 ...itories-in-your-organization-using-the-repository-table.md | 2 +-
 .../interpreting-security-findings.md                         | 2 +-
 .../managing-your-github-advanced-security-license-usage.md   | 2 +-
 .../applying-a-custom-security-configuration.md               | 2 +-
 .../creating-a-custom-security-configuration.md               | 2 +-
 .../a-repository-is-using-advanced-setup-for-code-scanning.md | 4 ++--
 .../not-enough-github-advanced-security-licenses.md           | 2 +-
 14 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization.md b/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization.md
index 215e73050694..ae6a8a442ae8 100644
--- a/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization.md
+++ b/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization.md
@@ -2,7 +2,7 @@
 title: Applying the GitHub-recommended security configuration in your organization
 shortTitle: Apply recommended configuration
 intro: 'Secure your code with the security enablement settings created, managed, and recommended by {% data variables.product.company_short %}.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization.md b/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization.md
index 75ce70c497db..3e35cee8b9d0 100644
--- a/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization.md
+++ b/content/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization.md
@@ -2,7 +2,7 @@
 title: Configuring global security settings for your organization
 shortTitle: Configure global settings
 intro: 'Customize {% data variables.product.prodname_GH_advanced_security %} features and create security managers to strengthen the security of your organization.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md
index 9da1f9e6b459..dbabbc699501 100644
--- a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md
+++ b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md
@@ -2,7 +2,6 @@
 title: About enabling security features at scale
 shortTitle: About organization security
 intro: 'You can quickly secure your organization at scale with {% data variables.product.prodname_security_configurations %} and {% data variables.product.prodname_global_settings %}.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories.md b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories.md
index 86a79ad9cad2..1d9ac67dd068 100644
--- a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories.md
+++ b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories.md
@@ -2,7 +2,7 @@
 title: Choosing a security configuration for your repositories
 shortTitle: Choose security configuration
 intro: 'Find out which type of {% data variables.product.prodname_security_configuration %} will meet the security needs of the repositories in your organization.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/deleting-a-custom-security-configuration.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/deleting-a-custom-security-configuration.md
index 1280588bf7a4..8a468f586cd0 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/deleting-a-custom-security-configuration.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/deleting-a-custom-security-configuration.md
@@ -2,7 +2,7 @@
 title: Deleting a custom security configuration
 shortTitle: Delete custom configuration
 intro: 'You can delete unnecessary {% data variables.product.prodname_custom_security_configurations %} in your organization.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/detaching-repositories-from-their-security-configurations.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/detaching-repositories-from-their-security-configurations.md
index 582921ea6582..738062f983f2 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/detaching-repositories-from-their-security-configurations.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/detaching-repositories-from-their-security-configurations.md
@@ -2,7 +2,7 @@
 title: Detaching repositories from their security configurations
 shortTitle: Detach security configuration
 intro: 'You can unlink repositories from their {% data variables.product.prodname_security_configurations %} and instead manage their security enablement settings at the repository level.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/editing-a-custom-security-configuration.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/editing-a-custom-security-configuration.md
index cce8600b4b5a..a8f4df27f244 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/editing-a-custom-security-configuration.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/editing-a-custom-security-configuration.md
@@ -2,7 +2,7 @@
 title: Editing a custom security configuration
 shortTitle: Edit custom configuration
 intro: 'Change the enablement settings in your {% data variables.product.prodname_custom_security_configuration %} to better meet the security needs of your repositories.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/filtering-repositories-in-your-organization-using-the-repository-table.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/filtering-repositories-in-your-organization-using-the-repository-table.md
index e5db6d3082f5..d1be8224b865 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/filtering-repositories-in-your-organization-using-the-repository-table.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/filtering-repositories-in-your-organization-using-the-repository-table.md
@@ -2,7 +2,7 @@
 title: Filtering repositories in your organization using the repository table
 shortTitle: Filter repositories
 intro: 'You can filter the repository table for your organization to better manage the security settings of specific repositories.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/interpreting-security-findings.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/interpreting-security-findings.md
index 8c221c3ffa3f..39b6e517dbfb 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/interpreting-security-findings.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/interpreting-security-findings.md
@@ -2,7 +2,7 @@
 title: Interpreting security findings
 shortTitle: Interpret security data
 intro: 'You can analyze security data on repositories in your organization to determine if you need to make changes to your security setup.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
index 1f3556aeb11c..69a65bfb4319 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
@@ -2,7 +2,7 @@
 title: Managing your GitHub Advanced Security license usage
 shortTitle: Manage GHAS licenses
 intro: 'You can understand and control {% data variables.product.prodname_GH_advanced_security %} license usage for repositories in your organization.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/applying-a-custom-security-configuration.md b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/applying-a-custom-security-configuration.md
index 1bb9e446fc24..5ecfc430e628 100644
--- a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/applying-a-custom-security-configuration.md
+++ b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/applying-a-custom-security-configuration.md
@@ -2,7 +2,7 @@
 title: Applying a custom security configuration
 shortTitle: Apply custom configuration
 intro: 'You can apply your {% data variables.product.prodname_custom_security_configuration %} to repositories in your organization to meet the specific security needs of those repositories.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
index c7621acfb92e..0764d3055e45 100644
--- a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
+++ b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
@@ -2,7 +2,7 @@
 title: Creating a custom security configuration
 shortTitle: Create custom configuration
 intro: 'Build a {% data variables.product.prodname_custom_security_configuration %} to meet the specific security needs of repositories in your organization.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:
diff --git a/content/code-security/securing-your-organization/troubleshooting-security-configurations/a-repository-is-using-advanced-setup-for-code-scanning.md b/content/code-security/securing-your-organization/troubleshooting-security-configurations/a-repository-is-using-advanced-setup-for-code-scanning.md
index 7b093449b3b9..7778017a9691 100644
--- a/content/code-security/securing-your-organization/troubleshooting-security-configurations/a-repository-is-using-advanced-setup-for-code-scanning.md
+++ b/content/code-security/securing-your-organization/troubleshooting-security-configurations/a-repository-is-using-advanced-setup-for-code-scanning.md
@@ -2,7 +2,7 @@
 title: A repository is using advanced setup for code scanning
 shortTitle: Active advanced setup
 intro: 'You cannot attach a {% data variables.product.prodname_security_configuration %} with code scanning enabled to repositories that are using advanced setup for code scanning.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 redirect_from:
@@ -31,7 +31,7 @@ For all repositories without an active advanced setup, the {% data variables.pro
 * The latest {% data variables.product.prodname_codeql %} analysis is more than 90 days old
 * All {% data variables.product.prodname_codeql %} configurations have been deleted
 * The workflow file has been deleted or disabled (exclusively for YAML-based advanced setup)
-  
+
 {% endnote %}
 
 ## Solving the problem
diff --git a/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md b/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
index 677acbc6f1ee..f8270a6366eb 100644
--- a/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
+++ b/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
@@ -2,7 +2,7 @@
 title: Not enough GitHub Advanced Security licenses
 shortTitle: Not enough GHAS licenses
 intro: 'You need available GHAS licenses to enable GHAS features on a private{% ifversion ghec or ghes %} or internal{% endif %} repository.'
-permissions: '{% data reusables.security-configurations.security-configurations-permissions %}'
+permissions: '{% data reusables.permissions.security-org-enable %}'
 versions:
   feature: security-configurations
 topics:

From 5b761de205bea62df5e259c93c569c9f0540b72c Mon Sep 17 00:00:00 2001
From: Sean Ferguson <obvioussean@github.com>
Date: Tue, 15 Oct 2024 03:14:03 -0700
Subject: [PATCH 2/4] Update CSV export for Security Overview for GHES to 3.16
 (#52680)

Co-authored-by: Felicity Chapman <felicitymay@github.com>
---
 data/features/security-overview-export-dashboard-data.yml | 1 +
 data/features/security-overview-export-data.yml           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/features/security-overview-export-dashboard-data.yml b/data/features/security-overview-export-dashboard-data.yml
index 01775162e26c..14bf4325ca8f 100644
--- a/data/features/security-overview-export-dashboard-data.yml
+++ b/data/features/security-overview-export-dashboard-data.yml
@@ -2,3 +2,4 @@
 # Documentation for the ability to download CSV files of data from the overview dashboard page of security overview.
 versions:
   ghec: '*'
+  ghes: '>=3.16'
diff --git a/data/features/security-overview-export-data.yml b/data/features/security-overview-export-data.yml
index 5349ec9940cb..ce9caca87f71 100644
--- a/data/features/security-overview-export-data.yml
+++ b/data/features/security-overview-export-data.yml
@@ -2,4 +2,4 @@
 # Documentation for the ability to download CSV files of data from the risk and coverage pages of security overview.
 versions:
   ghec: '*'
-  ghes: '>3.12'
+  ghes: '>=3.16'

From b9712068d06b88ed8b9bdc5ae7b8f57650af800c Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:15:07 +0200
Subject: [PATCH 3/4] [Improvement]: Copilot Quickstart guide's "Web browser"
 tab should be visible in the FPT docs (#52662)

---
 content/copilot/quickstart.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content/copilot/quickstart.md b/content/copilot/quickstart.md
index 4378b611bd10..e1764f1865d5 100644
--- a/content/copilot/quickstart.md
+++ b/content/copilot/quickstart.md
@@ -11,7 +11,6 @@ topics:
 
 ## Introduction
 
-{% ifversion ghec %}
 {% webui %}
 
 You can use {% data variables.product.prodname_copilot_chat_dotcom %} to get answers to coding-related questions, such as how best to code something, how to fix a bug, or how someone else's code works. For full details of what {% data variables.product.prodname_copilot_short %} can do, see "[AUTOTITLE](/copilot/about-github-copilot/what-is-github-copilot)."
@@ -62,7 +61,6 @@ For more information, see "[AUTOTITLE](/copilot/github-copilot-chat/copilot-chat
 * **Use {% data variables.product.prodname_copilot_short %} on the command line** - See "[AUTOTITLE](/copilot/github-copilot-in-the-cli/using-github-copilot-in-the-cli)."
 
 {% endwebui %}
-{% endif %}
 
 {% vscode %}
 

From b78d646cc3d07d4ba79e40fcc0e4d38cca6ce328 Mon Sep 17 00:00:00 2001
From: mc <42146119+mchammer01@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:35:41 +0100
Subject: [PATCH 4/4] Fix capitalization and use variables (#52687)

---
 ...or-the-configuration-of-private-registries-for-dependabot.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/code-security/dependabot/working-with-dependabot/guidance-for-the-configuration-of-private-registries-for-dependabot.md b/content/code-security/dependabot/working-with-dependabot/guidance-for-the-configuration-of-private-registries-for-dependabot.md
index 4e7cac04c96b..44d234e926ca 100644
--- a/content/code-security/dependabot/working-with-dependabot/guidance-for-the-configuration-of-private-registries-for-dependabot.md
+++ b/content/code-security/dependabot/working-with-dependabot/guidance-for-the-configuration-of-private-registries-for-dependabot.md
@@ -624,7 +624,7 @@ You can check whether the private registry is successfully accessed by looking a
 
 ### Cloudsmith
 
-For information about Cloudsmith and instructions on how to configure {% data variables.product.prodname_dependabot %} to work with Cloudsmith, see [Getting Started with Cloudsmith](https://help.cloudsmith.io/docs/welcome-to-cloudsmith-docs) and [Integrate Github Dependabot with Cloudsmith](https://help.cloudsmith.io/docs/dependabot) in the Cloudsmith documentation.
+For information about Cloudsmith and instructions on how to configure {% data variables.product.prodname_dependabot %} to work with Cloudsmith, see [Getting Started with Cloudsmith](https://help.cloudsmith.io/docs/welcome-to-cloudsmith-docs) and [Integrate {% data variables.product.company_short %} {% data variables.product.prodname_dependabot %} with Cloudsmith](https://help.cloudsmith.io/docs/dependabot) in the Cloudsmith documentation.
 
 ### {% data variables.product.prodname_registry %} registry