Merge pull request #27117 from github/repo-sync

Repo sync
github · Jul 27, 2023 · dc728b3 · dc728b3
2 parents 4fc3fc5 + 4b589b1
commit dc728b3
Show file tree

Hide file tree

Showing 79 changed files with 200 additions and 115 deletions.
diff --git a/...accessing-the-administrative-shell-ssh.md → ...accessing-the-administrative-shell-ssh.md b/...accessing-the-administrative-shell-ssh.md → ...accessing-the-administrative-shell-ssh.md
@@ -11,6 +11,7 @@ redirect_from:
   - /enterprise/admin/installation/accessing-the-administrative-shell-ssh
   - /enterprise/admin/configuration/accessing-the-administrative-shell-ssh
   - /admin/configuration/accessing-the-administrative-shell-ssh
+  - /admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh
 intro: '{% data reusables.enterprise_site_admin_settings.about-ssh-access %}'
 versions:
   ghes: '*'

diff --git a/...your-enterprise/command-line-utilities.md → ...g-your-instance/command-line-utilities.md b/...your-enterprise/command-line-utilities.md → ...g-your-instance/command-line-utilities.md
@@ -7,6 +7,7 @@ redirect_from:
   - /enterprise/admin/installation/command-line-utilities
   - /enterprise/admin/configuration/command-line-utilities
   - /admin/configuration/command-line-utilities
+  - /admin/configuration/configuring-your-enterprise/command-line-utilities
 versions:
   ghes: '*'
 type: reference

diff --git a/...abling-and-scheduling-maintenance-mode.md → ...abling-and-scheduling-maintenance-mode.md b/...abling-and-scheduling-maintenance-mode.md → ...abling-and-scheduling-maintenance-mode.md
@@ -11,6 +11,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-and-scheduling-maintenance-mode
   - /enterprise/admin/configuration/enabling-and-scheduling-maintenance-mode
   - /admin/configuration/enabling-and-scheduling-maintenance-mode
+  - /admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode
 versions:
   ghes: '*'
 type: how_to

diff --git a/content/admin/administering-your-instance/index.md b/content/admin/administering-your-instance/index.md
@@ -0,0 +1,16 @@
+---
+title: Administering your instance
+shortTitle: Administer your instance
+intro: 'You can administer your instance using SSH and command-line utilities.'
+versions:
+  ghes: '*'
+  ghae: '*'
+type: how_to
+topics:
+  - Enterprise
+children:
+  - /accessing-the-administrative-shell-ssh
+  - /enabling-and-scheduling-maintenance-mode
+  - /site-admin-dashboard
+  - /command-line-utilities
+---
diff --git a/...g-your-enterprise/site-admin-dashboard.md → ...ing-your-instance/site-admin-dashboard.md b/...g-your-enterprise/site-admin-dashboard.md → ...ing-your-instance/site-admin-dashboard.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/site-admin-dashboard
   - /enterprise/admin/configuration/site-admin-dashboard
   - /admin/configuration/site-admin-dashboard
+  - /admin/configuration/configuring-your-enterprise/site-admin-dashboard
 versions:
   ghes: '*'
   ghae: '*'
@@ -16,7 +17,7 @@ topics:
 ---
 To access the dashboard, in the upper-right corner of any page, click {% octicon "rocket" aria-hidden="true" %}.
 
-{% ifversion ghes or ghae %}
+{% ifversion ghes %}
 
 ## Search
 
@@ -29,12 +30,10 @@ Refer to this section of the site admin dashboard to search for users and reposi
 Refer to this section of the site admin dashboard to check your current {% data variables.product.prodname_enterprise %} license; to search for users and repositories; and to query the [audit log](#audit-log).
 
 {% endif %}
-{% ifversion ghes %}
 
 ## {% data variables.enterprise.management_console %}
 
 Here you can launch the {% data variables.enterprise.management_console %} to manage virtual appliance settings such as the domain, authentication, and SSL.
-{% endif %}
 
 ## Explore
 
@@ -129,8 +128,6 @@ Key             | Description
 `fork?`         | Whether the repository is a fork
 `deleted?`      | Whether the repository has been deleted
 
-{% ifversion ghes %}
-
 ## Indexing
 
 GitHub's search features are powered by Elasticsearch. This section of the site admin dashboard shows you the current status of your Elasticsearch cluster and provides you with several tools to control search and index behavior.
@@ -176,8 +173,6 @@ Repair jobs use a "repair offset" for parallelization. This is an offset into th
 
 This allows you to enable or disable both search and index operations on source code.
 
-{% endif %}
-
 ## Reserved logins
 
 Certain words are reserved for internal use in {% data variables.location.product_location %}, which means that these words cannot be used as usernames.
@@ -222,12 +217,9 @@ Here you can see all of the administrators on {% data variables.location.product
 
 ## Dormant users
 
-{% ifversion ghes %}
-Here you can see and [suspend](/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users) all of the inactive users on {% data variables.location.product_location %}. A user account is considered to be inactive ("dormant") when it:
-{% endif %}
-{% ifversion ghae %}
-Here you can see and suspend all of the inactive users on {% data variables.location.product_location %}. A user account is considered to be inactive ("dormant") when it:
-{% endif %}
+Here you can see and suspend inactive users on {% data variables.location.product_location %}. {% ifversion not ghae %}For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users)".{% endif %}
+
+A user account is considered to be inactive ("dormant") when it:
 
 - Has existed for longer than the dormancy threshold that's set for {% data variables.location.product_location %}.
 - Has not generated any activity within that time period.

diff --git a/...e/configuring-backups-on-your-instance.md → ...e/configuring-backups-on-your-instance.md b/...e/configuring-backups-on-your-instance.md → ...e/configuring-backups-on-your-instance.md
@@ -15,6 +15,7 @@ redirect_from:
   - /enterprise/admin/configuration/configuring-backups-on-your-appliance
   - /admin/configuration/configuring-backups-on-your-appliance
   - /admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance
+  - /admin/configuration/configuring-your-enterprise/configuring-backups-on-your-instance
 intro: 'As part of a disaster recovery plan, you can protect production data on {% data variables.location.product_location %} by configuring automated backups.'
 versions:
   ghes: '*'
@@ -270,7 +271,7 @@ $ ghe-restore -c 169.154.1.1
 Optionally, to validate the restore, configure an IP exception list to allow access to a specified list of IP addresses. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode#validating-changes-in-maintenance-mode-using-the-ip-exception-list)."
 {% endif %}
 
-On an instance in a high-availability configuration, after you restore to new disks on an existing or empty instance, `ghe-repl-status` may report that Git or Alambic replication is out of sync due to stale server UUIDs. These stale UUIDs can be the result of a retired node in a high-availability configuration still being present in the application database, but not in the restored replication configuration. 
+On an instance in a high-availability configuration, after you restore to new disks on an existing or empty instance, `ghe-repl-status` may report that Git or Alambic replication is out of sync due to stale server UUIDs. These stale UUIDs can be the result of a retired node in a high-availability configuration still being present in the application database, but not in the restored replication configuration.
 
 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, contact {% data variables.contact.contact_ent_support %}.
 

diff --git a/content/admin/backing-up-and-restoring-your-instance/index.md b/content/admin/backing-up-and-restoring-your-instance/index.md
@@ -0,0 +1,13 @@
+---
+title: Backing up and restoring your instance
+shortTitle: Back up and restore
+intro: 'You can configure backups for your instance and troubleshoot common backup problems.'
+versions:
+  ghes: '*'
+topics:
+  - Enterprise
+children:
+  - /configuring-backups-on-your-instance
+  - /known-issues-with-backups-for-your-instance
+---
+
diff --git a/...-issues-with-backups-for-your-instance.md → ...-issues-with-backups-for-your-instance.md b/...-issues-with-backups-for-your-instance.md → ...-issues-with-backups-for-your-instance.md
@@ -9,6 +9,8 @@ topics:
   - Troubleshooting
   - Backups
 shortTitle: Known issues with backups
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/known-issues-with-backups-for-your-instance
 ---
 
 ## About known issues with {% data variables.product.prodname_ghe_server %} backups

diff --git a/...prise/configuring-time-synchronization.md → ...tings/configuring-time-synchronization.md b/...prise/configuring-time-synchronization.md → ...tings/configuring-time-synchronization.md
@@ -9,6 +9,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-time-synchronization
   - /enterprise/admin/configuration/configuring-time-synchronization
   - /admin/configuration/configuring-time-synchronization
+  - /admin/configuration/configuring-your-enterprise/configuring-time-synchronization
 versions:
   ghes: '*'
 type: how_to

diff --git a/content/admin/configuration/configuring-network-settings/index.md b/content/admin/configuration/configuring-network-settings/index.md
@@ -17,12 +17,11 @@ children:
   - /configuring-dns-nameservers
   - /configuring-a-hostname
   - /validating-your-domain-settings
-  - /configuring-tls
-  - /enabling-subdomain-isolation
   - /configuring-an-outbound-web-proxy-server
   - /configuring-built-in-firewall-rules
   - /network-ports
   - /using-github-enterprise-server-with-a-load-balancer
+  - /configuring-time-synchronization
 shortTitle: Configure network settings
 ---
 
diff --git a/...ur-enterprise/configuring-applications.md → ...ur-enterprise/configuring-applications.md b/...ur-enterprise/configuring-applications.md → ...ur-enterprise/configuring-applications.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-applications
   - /enterprise/admin/configuration/configuring-applications
   - /admin/configuration/configuring-applications
+  - /admin/configuration/configuring-your-enterprise/configuring-applications
 versions:
   ghes: '*'
 type: how_to

diff --git a/...se/configuring-email-for-notifications.md → ...se/configuring-email-for-notifications.md b/...se/configuring-email-for-notifications.md → ...se/configuring-email-for-notifications.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/articles/email-configuration-and-troubleshooting
   - /enterprise/admin/user-management/configuring-email-for-notifications
   - /admin/configuration/configuring-email-for-notifications
+  - /admin/configuration/configuring-your-enterprise/configuring-email-for-notifications
 permissions: '{% ifversion ghes %}Site administrators{% elsif ghae %}Enterprise owners{% endif %} can configure email for notifications.'
 versions:
   ghes: '*'

diff --git a/...uring-github-pages-for-your-enterprise.md → ...uring-github-pages-for-your-enterprise.md b/...uring-github-pages-for-your-enterprise.md → ...uring-github-pages-for-your-enterprise.md
@@ -9,6 +9,7 @@ redirect_from:
   - /admin/configuration/configuring-github-pages-on-your-appliance
   - /enterprise/admin/guides/installation/configuring-github-pages-for-your-enterprise
   - /admin/configuration/configuring-github-pages-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise
 versions:
   ghes: '*'
   ghae: '*'

diff --git a/...our-enterprise/configuring-rate-limits.md → ...our-enterprise/configuring-rate-limits.md b/...our-enterprise/configuring-rate-limits.md → ...our-enterprise/configuring-rate-limits.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-rate-limits
   - /enterprise/admin/configuration/configuring-rate-limits
   - /admin/configuration/configuring-rate-limits
+  - /admin/configuration/configuring-your-enterprise/configuring-rate-limits
 versions:
   ghes: '*'
 type: how_to

diff --git a/...erprise/configuring-web-commit-signing.md → ...erprise/configuring-web-commit-signing.md b/...erprise/configuring-web-commit-signing.md → ...erprise/configuring-web-commit-signing.md
@@ -12,6 +12,8 @@ topics:
   - Identity
   - Security
 permissions: 'Site administrators can configure web commit signing for {% data variables.location.product_location %}.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-web-commit-signing
 ---
 
 ## About web commit signing

diff --git a/.../admin/configuration/configuring-user-applications-for-your-enterprise/index.md b/.../admin/configuration/configuring-user-applications-for-your-enterprise/index.md
@@ -0,0 +1,21 @@
+---
+title: Configuring user applications for your enterprise
+shortTitle: Configure user applications
+intro: 'You can configure applications for users in your enterprise.'
+versions:
+  ghec: '*'
+  ghes: '*'
+  ghae: '*'
+topics:
+  - Enterprise
+children:
+  - /configuring-applications
+  - /configuring-email-for-notifications
+  - /configuring-github-pages-for-your-enterprise
+  - /configuring-rate-limits
+  - /configuring-web-commit-signing
+  - /managing-github-mobile-for-your-enterprise
+  - /verifying-or-approving-a-domain-for-your-enterprise
+
+---
+
diff --git a/...ging-github-mobile-for-your-enterprise.md → ...ging-github-mobile-for-your-enterprise.md b/...ging-github-mobile-for-your-enterprise.md → ...ging-github-mobile-for-your-enterprise.md
@@ -11,6 +11,7 @@ topics:
 redirect_from:
   - /admin/configuration/configuring-your-enterprise/managing-github-for-mobile-for-your-enterprise
   - /admin/configuration/managing-github-for-mobile-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise
 shortTitle: Manage GitHub Mobile
 ---
 

diff --git a/...approving-a-domain-for-your-enterprise.md → ...approving-a-domain-for-your-enterprise.md b/...approving-a-domain-for-your-enterprise.md → ...approving-a-domain-for-your-enterprise.md
@@ -22,6 +22,7 @@ redirect_from:
   - /early-access/github/articles/verifying-your-enterprise-accounts-domain
   - /github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
   - /admin/policies/verifying-or-approving-a-domain-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise
 ---
 
 ## About verification of domains

diff --git a/...min/configuration/configuring-your-enterprise/about-enterprise-configuration.md b/...min/configuration/configuring-your-enterprise/about-enterprise-configuration.md
diff --git a/content/admin/configuration/configuring-your-enterprise/index.md b/content/admin/configuration/configuring-your-enterprise/index.md
diff --git a/...onfiguring-host-keys-for-your-instance.md → ...onfiguring-host-keys-for-your-instance.md b/...onfiguring-host-keys-for-your-instance.md → ...onfiguring-host-keys-for-your-instance.md
@@ -3,6 +3,8 @@ title: Configuring host keys for your instance
 shortTitle: Configure host keys
 intro: 'You can increase the security of {% data variables.location.product_location %} by configuring the algorithms that your instance uses to generate and advertise host keys for incoming SSH connections.'
 permissions: 'Site administrators can configure the host keys for a {% data variables.product.product_name %} instance.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance
 versions:
   ghes: '>= 3.6'
 type: how_to

diff --git a/...uring-ssh-connections-to-your-instance.md → ...uring-ssh-connections-to-your-instance.md b/...uring-ssh-connections-to-your-instance.md → ...uring-ssh-connections-to-your-instance.md
@@ -3,6 +3,8 @@ title: Configuring SSH connections to your instance
 shortTitle: Configure SSH connections
 intro: 'You can increase the security of {% data variables.location.product_location %} by configuring the SSH algorithms that clients can use to establish a connection.'
 permissions: 'Site administrators can configure SSH connections to a {% data variables.product.product_name %} instance.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance
 versions:
   ghes: '>= 3.6'
 type: how_to

diff --git a/...he-referrer-policy-for-your-enterprise.md → ...he-referrer-policy-for-your-enterprise.md b/...he-referrer-policy-for-your-enterprise.md → ...he-referrer-policy-for-your-enterprise.md
@@ -2,6 +2,8 @@
 title: Configuring the referrer policy for your enterprise
 shortTitle: Configure referrer policy
 intro: 'You can increase the privacy of {% data variables.location.product_location %} by configuring the policy for cross-origin requests.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise
 versions:
   ghes: '*'
 type: how_to

diff --git a/...uring-network-settings/configuring-tls.md → ...ty-for-your-enterprise/configuring-tls.md b/...uring-network-settings/configuring-tls.md → ...ty-for-your-enterprise/configuring-tls.md
@@ -7,6 +7,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-tls
   - /enterprise/admin/configuration/configuring-tls
   - /admin/configuration/configuring-tls
+  - /admin/configuration/configuring-network-settings/configuring-tls
 versions:
   ghes: '*'
 type: how_to

diff --git a/...-your-enterprise/enabling-private-mode.md → ...-your-enterprise/enabling-private-mode.md b/...-your-enterprise/enabling-private-mode.md → ...-your-enterprise/enabling-private-mode.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-private-mode
   - /enterprise/admin/configuration/enabling-private-mode
   - /admin/configuration/enabling-private-mode
+  - /admin/configuration/configuring-your-enterprise/enabling-private-mode
 versions:
   ghes: '*'
 type: how_to

diff --git a/...-settings/enabling-subdomain-isolation.md → ...nterprise/enabling-subdomain-isolation.md b/...-settings/enabling-subdomain-isolation.md → ...nterprise/enabling-subdomain-isolation.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-subdomain-isolation
   - /enterprise/admin/configuration/enabling-subdomain-isolation
   - /admin/configuration/enabling-subdomain-isolation
+  - /admin/configuration/configuring-network-settings/enabling-subdomain-isolation
 versions:
   ghes: '*'
 type: how_to