Merge pull request #16426 from github/repo-sync

repo sync

Author: Octomerger

content/admin/enterprise-management/configuring-high-availability/initiating-a-failover-to-your-replica-appliance.md

@@ -18,25 +18,32 @@ The time required to failover depends on how long it takes to manually promote t
 
 {% data reusables.enterprise_installation.promoting-a-replica %}
 
-1. To allow replication to finish before you switch appliances, put the primary appliance into maintenance mode:
-    - To use the management console, see "[Enabling and scheduling maintenance mode](/enterprise/admin/guides/installation/enabling-and-scheduling-maintenance-mode/)"
-    - You can also use the `ghe-maintenance -s` command.
-      ```shell
-      $ ghe-maintenance -s
-      ```
-2.  When the number of active Git operations, MySQL queries, and Resque jobs reaches zero, wait 30 seconds. 
+1. If the primary appliance is available, to allow replication to finish before you switch appliances, on the primary appliance, put the primary appliance into maintenance mode.
+
+    - Put the appliance into maintenance mode.
+
+       - To use the management console, see "[Enabling and scheduling maintenance mode](/enterprise/admin/guides/installation/enabling-and-scheduling-maintenance-mode/)"
+
+       - You can also use the `ghe-maintenance -s` command.
+         ```shell
+         $ ghe-maintenance -s
+         ```
+
+   - When the number of active Git operations, MySQL queries, and Resque jobs reaches zero, wait 30 seconds. 
 
-    {% note %}
+      {% note %}
 
-    **Note:** Nomad will always have jobs running, even in maintenance mode, so you can safely ignore these jobs.
+      **Note:** Nomad will always have jobs running, even in maintenance mode, so you can safely ignore these jobs.
 
-    {% endnote %}
+      {% endnote %}
 
-3. To verify all replication channels report `OK`, use the `ghe-repl-status -vv` command.
-  ```shell
-  $ ghe-repl-status -vv
-  ```
-4. To stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. This will also automatically put the primary node in maintenance node if it’s reachable.
+   - To verify all replication channels report `OK`, use the `ghe-repl-status -vv` command.
+
+      ```shell
+      $ ghe-repl-status -vv
+      ```
+
+4. On the replica appliance, to stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. This will also automatically put the primary node in maintenance node if it’s reachable.
   ```shell
   $ ghe-repl-promote
   ```

content/admin/user-management/migrating-data-to-and-from-your-enterprise/about-migrations.md

@@ -24,7 +24,7 @@ There are three types of migrations you can perform:
 
 In a migration, everything revolves around a repository. Most data associated with a repository can be migrated. For example, a repository within an organization will migrate the repository *and* the organization, as well as any users, teams, issues, and pull requests associated with the repository.
 
-The items in the table below can be migrated with a repository. Any items not shown in the list of migrated data can not be migrated.
+The items in the table below can be migrated with a repository. Any items not shown in the list of migrated data can not be migrated, including {% data variables.large_files.product_name_short %} assets.
 
 {% data reusables.enterprise_migrations.fork-persistence %}
 

content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md

@@ -25,7 +25,7 @@ shortTitle: Check for existing SSH key
   # Lists the files in your .ssh directory, if they exist
   ```
 
-3. Check the directory listing to see if you already have a public SSH key. By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% elsif fpt or ghes %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following.
+3. Check the directory listing to see if you already have a public SSH key. By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% else %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following.
     - *id_rsa.pub*
     - *id_ecdsa.pub*
     - *id_ed25519.pub*{% endif %}