diff --git a/content/actions/guides.md b/content/actions/guides.md index 6347f7bd09..4f28868a7f 100644 --- a/content/actions/guides.md +++ b/content/actions/guides.md @@ -10,7 +10,7 @@ versions: learningTracks: - getting_started - adopting_github_actions_for_your_enterprise_ghec - - adopting_github_actions_for_your_enterprise_ghes_and_ghae + - adopting_github_actions_for_your_enterprise_ghes - hosting_your_own_runners - create_actions includeGuides: diff --git a/content/admin/guides.md b/content/admin/guides.md index a4ddab6098..a9c9ef0c04 100644 --- a/content/admin/guides.md +++ b/content/admin/guides.md @@ -12,7 +12,7 @@ learningTracks: - '{% ifversion ghes %}deploy_an_instance{% endif %}' - '{% ifversion ghes %}upgrade_your_instance{% endif %}' - adopting_github_actions_for_your_enterprise_ghec - - adopting_github_actions_for_your_enterprise_ghes_and_ghae + - adopting_github_actions_for_your_enterprise_ghes - '{% ifversion ghes %}increase_fault_tolerance{% endif %}' - '{% ifversion ghes %}improve_security_of_your_instance{% endif %}' - '{% ifversion ghes %}configure_github_actions{% endif %}' @@ -139,4 +139,3 @@ includeGuides: - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/accessing-the-management-console - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console --- - diff --git a/data/features/codeql-cpp-autoinstall-dependencies.yml b/data/features/codeql-cpp-autoinstall-dependencies.yml index 24afe6f2b2..78b47c700c 100644 --- a/data/features/codeql-cpp-autoinstall-dependencies.yml +++ b/data/features/codeql-cpp-autoinstall-dependencies.yml @@ -2,4 +2,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.10' - ghae: '>3.10' diff --git a/data/features/enterprise-namespace-repo-setting.yml b/data/features/enterprise-namespace-repo-setting.yml index b99994fe55..27f131c4fc 100644 --- a/data/features/enterprise-namespace-repo-setting.yml +++ b/data/features/enterprise-namespace-repo-setting.yml @@ -1,5 +1,5 @@ # Reference: #7757 -# Setting to disable personal namespace repo creation for EMUs, GHES 3.7+ and GHAE 3.7+ users +# Setting to disable personal namespace repo creation for EMUs, GHES 3.7+ versions: ghec: '*' ghes: '>=3.7' diff --git a/data/learning-tracks/actions.yml b/data/learning-tracks/actions.yml index 3d393acb53..25efdc5c11 100644 --- a/data/learning-tracks/actions.yml +++ b/data/learning-tracks/actions.yml @@ -30,14 +30,13 @@ adopting_github_actions_for_your_enterprise_ghec: - /actions/security-guides/security-hardening-for-github-actions - >- /billing/managing-billing-for-github-actions/about-billing-for-github-actions -adopting_github_actions_for_your_enterprise_ghes_and_ghae: +adopting_github_actions_for_your_enterprise_ghes: title: Adopt GitHub Actions for your enterprise description: >- Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise. versions: ghes: '*' - ghae: '*' guides: - >- /admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises diff --git a/data/learning-tracks/admin.yml b/data/learning-tracks/admin.yml index 1e252e8781..acec99fe6f 100644 --- a/data/learning-tracks/admin.yml +++ b/data/learning-tracks/admin.yml @@ -1,19 +1,3 @@ -get_started_with_github_ae: - title: Get started with {% data variables.product.prodname_ghe_managed %} - description: >- - Learn about {% data variables.product.prodname_ghe_managed %} and complete - the initial configuration of a new enterprise. - versions: - ghae: '*' - guides: - - /admin/overview/about-github-ae - - /admin/overview/about-data-residency - - /admin/overview/deploying-github-ae - - /admin/overview/initializing-github-ae - - >- - /admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list - - >- - /admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae deploy_an_instance: title: Deploy an instance description: >- @@ -71,14 +55,13 @@ adopting_github_actions_for_your_enterprise_ghec: - /actions/security-guides/security-hardening-for-github-actions - >- /billing/managing-billing-for-github-actions/about-billing-for-github-actions -adopting_github_actions_for_your_enterprise_ghes_and_ghae: +adopting_github_actions_for_your_enterprise_ghes: title: Adopt GitHub Actions for your enterprise description: >- Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise. versions: ghes: '*' - ghae: '*' guides: - >- /admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises diff --git a/data/variables/contact.yml b/data/variables/contact.yml index 56e8b4bca4..7da8766da9 100644 --- a/data/variables/contact.yml +++ b/data/variables/contact.yml @@ -1,6 +1,6 @@ contact_ent_support: '[GitHub Enterprise Support](https://support.github.com)' -# GitHub Support (with versioning for GHES, GHAE) - when users need to open a ticket through the support portal +# GitHub Support (with versioning for GHES) - when users need to open a ticket through the support portal contact_support: >- {% ifversion fpt or ghec %}us through the [GitHub Support portal](https://support.github.com){% elsif ghes %}your site administrator{% endif %} diff --git a/data/variables/enterprise.yml b/data/variables/enterprise.yml index 4973a74dc2..4605b1d94b 100644 --- a/data/variables/enterprise.yml +++ b/data/variables/enterprise.yml @@ -16,4 +16,3 @@ prodname_unified_search: 'unified search' # Entra ID (previously known as Azure AD) ghes_azure_ad_app_link: '[GitHub Enterprise Server application](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/aad.githubenterpriseserver)' -ae_azure_ad_app_link: '[GitHub AE application](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/aad.ghae)'