Repo sync

content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md

@@ -562,8 +562,6 @@ ghe-webhook-logs -g DELIVERY_GUID
 
 ## Clustering
 
-{% ifversion cluster-rebalancing %}
-
 ### ghe-cluster-balance
 
 This utility allows you to enforce an even distribution of allocations across your cluster nodes by checking the status of your cluster's allocations, then rebalancing problematic allocations. For more information, see [AUTOTITLE](/admin/enterprise-management/configuring-clustering/rebalancing-cluster-workloads).
@@ -608,8 +606,6 @@ To display a short description of the utility and any valid subcommands:
 ghe-cluster-balance help
 ```
 
-{% endif %}
-
 ### ghe-cluster-maintenance
 
 With the `ghe-cluster-maintenance` utility, you can set or unset maintenance mode for every node in a cluster.
@@ -674,7 +670,7 @@ ssh -p 122 admin@HOSTNAME -- 'ghe-cluster-support-bundle -o' > cluster-support-b
 To create a standard bundle including data from the last 2 days:
 
 ```shell
-ssh -p 122 admin@HOSTNAME -- "ghe-cluster-support-bundle -p {% ifversion bundle-cli-syntax-no-quotes %}2days {% endif %} -o" > support-bundle.tgz
+ssh -p 122 admin@HOSTNAME -- "ghe-cluster-support-bundle -p 2days -o" > support-bundle.tgz
 ```
 
 To create an extended bundle including data from the last 8 days:
@@ -1295,7 +1291,7 @@ ssh -p 122 admin@HOSTNAME -- 'ghe-support-bundle -o' > support-bundle.tgz
 To create a standard bundle including data from the last 2 days:
 
 ```shell
-ssh -p 122 admin@HOSTNAME -- "ghe-support-bundle -p {% ifversion bundle-cli-syntax-no-quotes %}2days {% endif %} -o" > support-bundle.tgz
+ssh -p 122 admin@HOSTNAME -- "ghe-support-bundle -p 2days -o" > support-bundle.tgz
 ```
 
 To create an extended bundle including data from the last 8 days:

content/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md

@@ -188,8 +188,6 @@ On an instance in a high-availability configuration, after you restore to new di
 
 To remediate after the restoration completes and before starting replication, you can tear down stale UUIDs using `ghe-repl-teardown`. If you need further assistance, visit {% data variables.contact.contact_ent_support %}.
 
-{% ifversion backup-utilities-progress %}
-
 ## Monitoring backup or restoration progress
 
 During a backup or restoration operation, you can use the `ghe-backup-progress` utility on your backup host to monitor the operation's progress. The utility prints the progress of each job sequentially.
@@ -207,5 +205,3 @@ Optionally, you can run the following command to print the current progress, the
 ```shell copy
 bin/ghe-backup-progress --once
 ```
-
-{% endif %}

content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-applications.md

@@ -36,12 +36,10 @@ You can enable a retention policy for checks, actions, and associated data by se
 1. Under "Delete threshold (days)", type the number of days for the deletion threshold. An archived check exists in an archived state for the number of days specified here. After this threshold, the check will be permanently deleted.
 {% data reusables.enterprise_management_console.save-settings %}
 
-{% ifversion azure-maps %}
 {% ifversion ghes < 3.13 %}
 
 ## Enabling interactive maps
 
 You can enable the display of interactive maps in the web interface for users of {% data variables.location.product_location %}. For more information, see [AUTOTITLE](/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-interactive-maps).
 
 {% endif %}
-{% endif %}

content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md

@@ -4,7 +4,7 @@ intro: 'You can enable the display of interactive maps in the web interface for
 shortTitle: Configure interactive maps
 permissions: 'People with access to the {% data variables.enterprise.management_console %} can configure interactive maps.'
 versions:
-  feature: azure-maps
+  ghes: '*'
 type: how_to
 topics:
   - Enterprise
@@ -18,33 +18,27 @@ You can allow users of {% data variables.location.product_location %} to create
 
 To enable interactive maps, you must provide authentication credentials for Azure Maps.
 
-{% ifversion azure-maps-auth-2023 %}
 {% ifversion ghes < 3.13 %}
 
 > [!WARNING]
 > Authentication with Azure Maps using an API token is {% data variables.release-phases.retired %} in {% data variables.product.product_name %} {{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}4{% elsif ghes = 3.11 %}1{% endif %} and later. If you upgrade to the latest release of {% data variables.product.product_name %} on an instance already configured to authenticate with an API token, interactive maps will be disabled. You must reconfigure authentication using role-based access control (RBAC) for an application on a Microsoft Entra ID (previously known as Azure AD) tenant. {% data reusables.enterprise.azure-maps-auth-deprecation-link %}
 
-{% endif %}
 {% endif %}
 
 ## Prerequisites
 
-{% ifversion azure-maps-auth-2023 %}
-
 {% ifversion ghes < 3.12 %}
 
 The following prerequisites apply if your instance runs {% data variables.product.product_name %} {{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}4{% elsif ghes = 3.11 %}1{% endif %} or later.
 
 {% endif %}
 
-* To configure interactive maps for your instance, you must have {% ifversion azure-maps-auth-2023 %}administrative access to a tenant in Microsoft Entra ID. For more information, contact the administrator for Microsoft resources at your company, or see [Quickstart: Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/entra/fundamentals/create-new-tenant) on Microsoft Learn{% else %}an API token for Azure Maps{% endif %}.
+* To configure interactive maps for your instance, you must have administrative access to a tenant in Microsoft Entra ID. For more information, contact the administrator for Microsoft resources at your company, or see [Quickstart: Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/entra/fundamentals/create-new-tenant) on Microsoft Learn.
 
 * You must know the tenant ID for your tenant in Entra ID. For more information, see [Get subscription and tenant IDs in the Azure portal](https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id#find-your-microsoft-entra-tenant) on Microsoft Learn.
 
 * Your instance must be able to access https://login.microsoftonline.com.
 
-{% endif %}
-
 {% ifversion ghes < 3.12 %}
 
 If your instance runs {% ifversion ghes < 3.11 %}a release of {% data variables.product.product_name %} in the {{ allVersions[currentVersion].currentRelease }} series earlier than {% else %}{% data variables.product.product_name %} {% endif %}{{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}3{% elsif ghes = 3.11 %}0{% endif %}, you must provide an API token for Azure Maps instead.
@@ -53,8 +47,6 @@ If your instance runs {% ifversion ghes < 3.11 %}a release of {% data variables.
 
 {% endif %}
 
-{% ifversion azure-maps-auth-2023 %}
-
 ## Generating credentials for Azure Maps
 
 {% ifversion ghes < 3.12 %}
@@ -83,16 +75,10 @@ To generate credentials for Azure Maps, you must create an application for your
 
    * On your Entra ID tenant, from **Access control (IAM)**, you must assign the role of "Azure Maps Data Reader" to "User, group, or service principal", select the application you created earlier in these instructions, and complete the form.
 
-{% endif %}
-
 ## Enabling interactive maps
 
-{% ifversion azure-maps-auth-2023 %}
-
 After you create an application on your Entra ID tenant and generate a secret for the use of Azure Maps, you can configure interactive maps on {% data variables.location.product_location %}.
 
-{% endif %}
-
 {% data reusables.enterprise_site_admin_settings.access-settings %}
 {% data reusables.enterprise_site_admin_settings.management-console %}
 {% data reusables.enterprise_management_console.privacy %}
@@ -104,16 +90,15 @@ After you create an application on your Entra ID tenant and generate a secret fo
    ```
 
    Store the string in a secure location that you can reference in the next step.
-{%- ifversion azure-maps-auth-2023 %}
 1. {% ifversion ghes > 3.11 %}Below the headings, type or paste{% else %}Enter{% endif %} your authentication details for Azure Maps.
 
    {%- ifversion ghes < 3.11 %}
    * If your instance runs {% ifversion ghes < 3.11 %}a release of {% data variables.product.product_name %} in the {{ allVersions[currentVersion].currentRelease }} series earlier than {% else %}{% data variables.product.product_name %} {% endif %}{{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}3{% elsif ghes = 3.11 %}0{% endif %}, below "Azure Maps API Token", type or paste your token.
 
      {% data reusables.enterprise.azure-maps-auth-warning %}
    * If your instance runs {% data variables.product.product_name %} {{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}4{% elsif ghes = 3.11 %}1{% endif %} or later, below the headings, type or paste the following information.
+   {%- endif %}
 
-     {%- endif %}
      * Optionally, to change the style of rendered maps, under "Basemap ID", type the ID for the style you'd like to use.
      * Under the headings, type or paste your authentication details.
 
@@ -124,9 +109,6 @@ After you create an application on your Entra ID tenant and generate a secret fo
        | Azure Tenant ID | ID for your tenant on Entra ID | [Prerequisites](#prerequisites) |
        | Azure App Client Secret | Client secret that you generated for the application on your Entra ID tenant | [Generating credentials for Azure Maps](#generating-credentials-for-azure-maps)
        | CSRF Secret | 32-character string to prevent CSRF attacks | See previous step. |
-{%- else %}
-1. To configure authentication, under "Azure Maps API Token", paste your token.
-{%- endif %}
 {% data reusables.enterprise_management_console.save-settings %}
 
 ## Disabling interactive maps

content/admin/data-residency/network-details-for-ghecom.md

@@ -30,9 +30,13 @@ To access your enterprise on {% data variables.enterprise.data_residency_site %}
 
 ## {% data variables.product.github %}'s IP addresses
 
-These are {% data variables.product.company_short %}'s IP address ranges for enterprises on {% data variables.enterprise.data_residency_site %}.
+{% data variables.product.company_short %}'s IP address ranges for enterprises on {% data variables.enterprise.data_residency_site %} depend on your chosen region.
 
-### Ranges for egress traffic
+### The EU
+
+These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in the EU.
+
+#### Ranges for egress traffic
 
 * 108.143.221.96/28
 * 20.61.46.32/28
@@ -41,7 +45,7 @@ These are {% data variables.product.company_short %}'s IP address ranges for ent
 * 74.241.131.48/28
 * 20.240.211.176/28
 
-### Ranges for ingress traffic
+#### Ranges for ingress traffic
 
 * 108.143.197.176/28
 * 20.123.213.96/28
@@ -50,12 +54,83 @@ These are {% data variables.product.company_short %}'s IP address ranges for ent
 * 20.240.220.192/28
 * 20.240.211.208/28
 
+### Australia
+
+These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in Australia.
+
+#### Ranges for egress traffic
+
+* 20.5.34.240/28
+* 20.5.146.128/28
+* 68.218.155.16/28
+
+#### Ranges for ingress traffic
+
+* 4.237.73.192/28
+* 20.5.226.112/28
+* 20.248.163.176/28
+
 ## Supported regions for Azure private networking
 
 If you use Azure private networking for {% data variables.product.company_short %}-hosted runners, the supported Azure regions on {% data variables.enterprise.data_residency_site %} differ from those on {% data variables.product.prodname_dotcom_the_website %}.
 
-The following regions are available:
+### Supported regions in the EU
+
+| Runner type | Supported regions |
+| ----------- | ----------------- |
+| x64 | `francecentral`, `swedencentral` |
+| arm64 | `francecentral`, `northeurope` |
+| GPU | `italynorth`, `swedencentral` |
+
+### Supported regions in Australia
+
+| Runner type | Supported regions |
+| ----------- | ----------------- |
+| x64 | `australiaeast`, `australiacentral` |
+| arm64 | `australiaeast`, `australiacentral` |
+| GPU | N/A |
+
+## IP ranges for {% data variables.product.prodname_importer_proper_name %}
+
+If you're running a migration to your enterprise with {% data variables.product.prodname_importer_proper_name %}, you may need to add certain ranges to an IP allow list. See [AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#configuring-ip-allow-lists-for-migrations).
+
+You must allow:
+
+* Ranges required for everyone
+* Additional ranges that depend on your data residency region
+
+### Required for everyone
+
+* 192.30.252.0/22
+* 185.199.108.0/22
+* 140.82.112.0/20
+* 143.55.64.0/20
+* 2a0a:a440::/29
+* 2606:50c0::/32
+
+### Required in the EU
+
+* 4.231.155.80/29
+* 4.225.9.96/29
+* 51.12.152.184/29
+* 20.199.6.80/29
+* 51.12.144.32/29
+* 20.199.1.232/29
+* 51.12.152.240/29
+* 20.19.101.136/29
+* 74.241.131.48/28
+* 51.12.252.16/28
+* 20.240.211.176/28
+* 108.143.221.96/28
+* 20.61.46.32/28
+* 20.224.62.160/28
+
+### Required in Australia
 
-* x64: `francecentral`, `swedencentral`
-* arm64: `francecentral`, `northeurope`
-* GPU: `italynorth`, `swedencentral`
+* 20.213.236.72/29
+* 20.53.178.216/29
+* 20.213.241.72/29
+* 20.11.90.48/29
+* 20.5.34.240/28
+* 20.5.146.128/28
+* 68.218.155.16/28

content/admin/monitoring-and-managing-your-instance/configuring-clustering/rebalancing-cluster-workloads.md

@@ -5,7 +5,7 @@ intro: 'You can force your {% data variables.product.product_name %} cluster to
 product: '{% data reusables.gated-features.cluster %}'
 permissions: 'People with administrative SSH access to a {% data variables.product.product_name %} instance can rebalance cluster workloads on the instance.'
 versions:
-  feature: cluster-rebalancing
+  ghes: '*'
 type: how_to
 topics:
   - Clustering

content/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node.md

@@ -21,9 +21,7 @@ topics:
 
 You can replace a functional node in a {% data variables.product.product_name %} cluster, or you can replace a node that has failed unexpectedly.
 
-{% ifversion cluster-rebalancing %}
 After you replace a node, {% data variables.location.product_location %} does not automatically distribute jobs to the new node. You can force your instance to balance jobs across nodes. For more information, see [AUTOTITLE](/admin/enterprise-management/configuring-clustering/rebalancing-cluster-workloads).
-{% endif %}
 
 > [!WARNING]
 > To avoid conflicts, do not reuse a hostname that was previously assigned to a node in the cluster.

content/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning.md

@@ -50,7 +50,7 @@ If you need more granular control over your {% data variables.product.prodname_c
 Your repository is eligible for default setup for {% data variables.product.prodname_code_scanning %} if:{% ifversion default-setup-pre-enablement %}
 <!-- No restrictions on languages. Can be set up before CodeQL supported languages are added. -->
 {% else %}
-* It includes at least one {% data variables.product.prodname_codeql %}-supported language{% ifversion codeql-swift-advanced-setup %} aside from Swift{% endif %}.{% endif %}
+* It includes at least one {% data variables.product.prodname_codeql %}-supported language{% ifversion ghes = 3.10 %} aside from Swift{% endif %}.{% endif %}
 * {% data variables.product.prodname_actions %} are enabled.{% ifversion fpt %}
 * It is publicly visible.{%- elsif ghec %}
 * It is publicly visible, or {% data variables.product.prodname_GH_advanced_security %} is enabled.{%- elsif ghes %}
@@ -62,7 +62,7 @@ Your repository is eligible for default setup for {% data variables.product.prod
 If your repository includes at least one {% data variables.product.prodname_codeql %}-supported language, you can use default setup even if your repository also includes languages that aren't supported by {% data variables.product.prodname_codeql %}, such as R. Unsupported languages will not be scanned by default setup. For more information on {% data variables.product.prodname_codeql %}-supported languages, see [AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning-with-codeql#about-codeql).
 {% endif %}
 
-You can use default setup for all {% data variables.product.prodname_codeql %}-supported languages{% ifversion codeql-swift-advanced-setup %} except Swift{% endif %} for self-hosted runners or {% data variables.product.prodname_dotcom %}-hosted runners. See [Assigning labels to runners](#assigning-labels-to-runners), later in this article.
+You can use default setup for all {% data variables.product.prodname_codeql %}-supported languages{% ifversion ghes = 3.10 %} except Swift{% endif %} for self-hosted runners or {% data variables.product.prodname_dotcom %}-hosted runners. See [Assigning labels to runners](#assigning-labels-to-runners), later in this article.
 
 {% ifversion codeql-no-build %}Default setup uses the `none` build mode for {% data variables.code-scanning.no_build_support %} and uses the `autobuild` build mode for other compiled languages. You should configure your self-hosted runners to make sure they can run all the necessary commands for C/C++, C#, and Swift analysis. Analysis of JavaScript/TypeScript, Go, Ruby, Python, and Kotlin code does not currently require special configuration.{% else %}Default setup runs the `autobuild` action, so you should configure your self-hosted runners to make sure they can run all the necessary commands for {% data variables.code-scanning.compiled_languages %} analysis. Analysis of JavaScript/TypeScript, Go, Ruby, Python, and Kotlin code does not currently require special configuration.{% endif %}
 
@@ -78,7 +78,7 @@ We recommend that you start using {% data variables.product.prodname_code_scanni
 If the code in a repository changes to include Go, JavaScript/TypeScript, Python, or Ruby, {% data variables.product.prodname_dotcom %} will automatically update the {% data variables.product.prodname_code_scanning %} configuration to include the new language. If {% data variables.product.prodname_code_scanning %} fails with the new configuration, {% data variables.product.prodname_dotcom %} will resume the previous configuration automatically so the repository does not lose {% data variables.product.prodname_code_scanning %} coverage.
 {% endif %}
 
-Compiled languages are not automatically included in default setup configuration because they often require more advanced configuration, but you can manually select any {% data variables.product.prodname_codeql %}-supported compiled language{% ifversion codeql-swift-advanced-setup %} other than Swift{% endif %} for analysis.
+Compiled languages are not automatically included in default setup configuration because they often require more advanced configuration, but you can manually select any {% data variables.product.prodname_codeql %}-supported compiled language{% ifversion ghes = 3.10 %} other than Swift{% endif %} for analysis.
 
 {% endif %}
 

content/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository.md

@@ -72,7 +72,7 @@ If you want to use Git hooks for your codespace, then you should set up hooks us
 {% data reusables.repositories.navigate-to-repo %}
 1. Under the repository name, select the branch dropdown menu, which is labeled with the name of the current branch, then click the branch you want to create a codespace for.
 
-   ![Screenshot of the expanded branch dropdown menu, listing various branches. The dropdown menu, labeled with a branch icon and "trunk," is highlighted with a dark orange outline.](/assets/images/help/codespaces/branch-drop-down.png)
+   ![Screenshot of the expanded branch dropdown menu, listing various branches. The "trunk" dropdown menu, shown with a branch icon, is outlined in orange.](/assets/images/help/codespaces/branch-drop-down.png)
 
 1. Click the **{% octicon "code" aria-hidden="true" %} Code** button, then click the **Codespaces** tab.
 

content/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template.md

@@ -52,7 +52,7 @@ Templates maintained by {% data variables.product.company_short %}, including th
 {% data reusables.codespaces.view-all-templates-step %}
 1. Optionally, to view the template repository containing the files for a template, click the name of the template.
 
-   ![Screenshot of the "Explore quick start templates" section of the codespaces page. Three templates are listed, and the names of the templates are highlighted with orange outlines.](/assets/images/help/codespaces/react-template-name.png)
+   ![Screenshot of the "Explore quick start templates" section. Three templates are listed. The templates names are outlined in orange.](/assets/images/help/codespaces/react-template-name.png)
 
 1. Under the name of the template you want to launch, click **Use this template**.