Merge branch 'main' into content-template-versions

components/product/SidebarProduct.tsx

@@ -39,7 +39,7 @@ export const SidebarProduct = () => {
                 const isStandaloneCategory = childPage.page.documentType === 'article'
 
                 const childTitle = childPage.renderedShortTitle || childPage.renderedFullTitle
-                const isActive = routePath.includes(routePath)
+                const isActive = routePath.includes(childPage.href)
                 const isCurrent = routePath === childPage.href
                 return (
                   <li

content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md

@@ -20,7 +20,7 @@ topics:
 
 Subdomain isolation mitigates cross-site scripting and other related vulnerabilities. For more information, see "[Cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting)" on Wikipedia. We highly recommend that you enable subdomain isolation on {% data variables.product.product_location %}.
 
-When subdomain isolation is enabled, {% data variables.product.prodname_ghe_server %} replaces several paths with subdomains.
+When subdomain isolation is enabled, {% data variables.product.prodname_ghe_server %} replaces several paths with subdomains. After enabling subdomain isolation, attempts to access the previous paths for some user-supplied content, such as `http(s)://HOSTNAME/raw/`, may return `404` errors.
 
 {% if currentVersion == "enterprise-server@2.22" %}
 To use Docker with {% data variables.product.prodname_registry %}, you must also enable subdomain isolation. For more information, see "[Working with the Docker registry](/enterprise/{{ currentVersion }}/user/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."

content/admin/index.md

@@ -22,7 +22,7 @@ featuredLinks:
     - '{% if currentVersion == "github-ae@latest" %}/admin/user-management/customizing-user-messages-for-your-enterprise{% endif %}'
     - '{% if currentVersion == "github-ae@latest" %}/admin/github-actions/getting-started-with-github-actions-for-github-ae{% endif %}'
   popular:
-    - '{% if currentVersion == "github-ae@latest" %}/admin/overview/github-ae-release-notes{% endif %}'
+    - '{% if currentVersion == "github-ae@latest" %}/admin/release-notes{% endif %}'
     - '{% if enterpriseServerVersions contains currentVersion %}/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server{% endif %}'
     - '{% if enterpriseServerVersions contains currentVersion %}/admin/installation{% endif %}'
     - '{% if currentVersion == "github-ae@latest" %}/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}'
@@ -50,14 +50,3 @@ children:
   - /release-notes
   - /all-releases
 ---
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->
-<!-- . -->

content/admin/overview/about-upgrades-to-new-releases.md

@@ -45,5 +45,5 @@ To upgrade your enterprise to a new release, see "[Release notes](/enterprise-se
 
 - [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the  `github/roadmap` repository
 {% if currentVersion == "github-ae@latest" %}
-- [ {% data variables.product.prodname_ghe_managed %} release notes](/admin/overview/github-ae-release-notes)
+- [ {% data variables.product.prodname_ghe_managed %} release notes](/admin/release-notes)
 {% endif %}

content/admin/overview/index.md

@@ -8,13 +8,13 @@ versions:
   github-ae: '*'
 children:
   - /about-github-ae
+  - /about-upgrades-to-new-releases
   - /about-data-residency
   - /about-enterprise-accounts
   - /managing-your-github-enterprise-license
   - /managing-billing-for-your-enterprise
   - /about-upgrades-to-new-releases
   - /system-overview
   - /about-the-github-enterprise-api
-  - /github-ae-release-notes
 ---
 For more information, or to purchase {% data variables.product.prodname_enterprise %}, see [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise).

content/admin/release-notes.md

@@ -1,11 +1,12 @@
 ---
 title: Release notes
-intro: 'The release notes for {{ allVersions[currentVersion].versionTitle }}.'
 layout: release-notes
 versions:
   enterprise-server: '*'
+  github-ae: '*'
 topics:
   - Enterprise
   - Upgrades
+redirect_from:
+  - /admin/overview/github-ae-release-notes
 ---
-

content/admin/user-management/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md

@@ -8,7 +8,7 @@ versions:
   enterprise-server: '*'
 type: how_to
 topics:
-  - 2fa
+  - 2FA
   - Enterprise
   - Organizations
   - Policies

content/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security.md

@@ -4,6 +4,7 @@ intro: 'If you want to use {% data variables.product.prodname_GH_advanced_securi
 product: '{% data reusables.gated-features.ghas %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
 versions:
   free-pro-team: '*'
 type: overview

content/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

@@ -4,6 +4,7 @@ intro: 'You can view usage of your {% data variables.product.prodname_GH_advance
 permissions: 'Enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for their organization or enterprise organizations.'
 product: '{% data reusables.gated-features.ghas %}'
 redirect_from: 
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
   - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage
 versions: