Merge branch 'nhxnguyen-update-disable-geo-doc-terms' into 'master'

Update terminology in disable Geo docs

See merge request gitlab-org/gitlab!56978

doc/administration/geo/replication/disable_geo.md

@@ -12,26 +12,26 @@ situation and you want to disable Geo momentarily, you can use these instruction
 Geo setup.
 
 There should be no functional difference between disabling Geo and having an active Geo setup with
-no secondary Geo nodes if you remove them correctly.
+no secondary Geo sites if you remove them correctly.
 
 To disable Geo, follow these steps:
 
-1. [Remove all secondary Geo nodes](#remove-all-secondary-geo-nodes).
-1. [Remove the primary node from the UI](#remove-the-primary-node-from-the-ui).
+1. [Remove all secondary Geo sites](#remove-all-secondary-geo-sites).
+1. [Remove the primary site from the UI](#remove-the-primary-site-from-the-ui).
 1. [Remove secondary replication slots](#remove-secondary-replication-slots).
 1. [Remove Geo-related configuration](#remove-geo-related-configuration).
 1. [(Optional) Revert PostgreSQL settings to use a password and listen on an IP](#optional-revert-postgresql-settings-to-use-a-password-and-listen-on-an-ip).
 
-## Remove all secondary Geo nodes
+## Remove all secondary Geo sites
 
-To disable Geo, you need to first remove all your secondary Geo nodes, which means replication will not happen
-anymore on these nodes. You can follow our docs to [remove your secondary Geo nodes](remove_geo_node.md).
+To disable Geo, you need to first remove all your secondary Geo sites, which means replication will not happen
+anymore on these sites. You can follow our docs to [remove your secondary Geo sites](remove_geo_site.md).
 
-If the current node that you want to keep using is a secondary node, you need to first promote it to primary.
-You can use our steps on [how to promote a secondary node](../disaster_recovery/#step-3-promoting-a-secondary-node)
+If the current site that you want to keep using is a secondary site, you need to first promote it to primary.
+You can use our steps on [how to promote a secondary site](../disaster_recovery/#step-3-promoting-a-secondary-node)
 to do that.
 
-## Remove the primary node from the UI
+## Remove the primary site from the UI
 
 1. Go to **Admin Area > Geo** (`/admin/geo/nodes`).
 1. Click the **Remove** button for the **primary** node.
@@ -59,7 +59,7 @@ Geo node in a PostgreSQL console (`sudo gitlab-psql`):
 
 ## Remove Geo-related configuration
 
-1. SSH into your primary Geo node and log in as root:
+1. For each node on your primary Geo site, SSH into the node and log in as root:
 
    ```shell
    sudo -i

doc/administration/geo/replication/remove_geo_node.md

 ---
-stage: Enablement
-group: Geo
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
-type: howto
+redirect_to: '../../geo/replication/remove_geo_site.md'
 ---
 
-# Removing secondary Geo nodes **(PREMIUM SELF)**
+This document was moved to [another location](../../geo/replication/remove_geo_site.md).
 
-**Secondary** nodes can be removed from the Geo cluster using the Geo administration page of the **primary** node. To remove a **secondary** node:
-
-1. Go to **Admin Area > Geo** (`/admin/geo/nodes`).
-1. Click the **Remove** button for the **secondary** node you want to remove.
-1. Confirm by clicking **Remove** when the prompt appears.
-
-Once removed from the Geo administration page, you must stop and uninstall the **secondary** node:
-
-1. On the **secondary** node, stop GitLab:
-
-   ```shell
-   sudo gitlab-ctl stop
-   ```
-
-1. On the **secondary** node, uninstall GitLab:
-
-   ```shell
-   # Stop gitlab and remove its supervision process
-   sudo gitlab-ctl uninstall
-
-   # Debian/Ubuntu
-   sudo dpkg --remove gitlab-ee
-
-   # Redhat/Centos
-   sudo rpm --erase gitlab-ee
-   ```
-
-Once GitLab has been uninstalled from the **secondary** node, the replication slot must be dropped from the **primary** node's database as follows:
-
-1. On the **primary** node, start a PostgreSQL console session:
-
-   ```shell
-   sudo gitlab-psql
-   ```
-
-   NOTE:
-   Using `gitlab-rails dbconsole` will not work, because managing replication slots requires superuser permissions.
-
-1. Find the name of the relevant replication slot. This is the slot that is specified with `--slot-name` when running the replicate command: `gitlab-ctl replicate-geo-database`.
-
-   ```sql
-   SELECT * FROM pg_replication_slots;
-   ```
-
-1. Remove the replication slot for the **secondary** node:
-
-   ```sql
-   SELECT pg_drop_replication_slot('<name_of_slot>');
-   ```
+<!-- This redirect file can be deleted after 2022-04-01 -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/geo/replication/remove_geo_site.md

+---
+stage: Enablement
+group: Geo
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+type: howto
+---
+
+# Removing secondary Geo sites **(PREMIUM SELF)**
+
+**Secondary** sites can be removed from the Geo cluster using the Geo administration page of the **primary** site. To remove a **secondary** site:
+
+1. Go to **Admin Area > Geo** (`/admin/geo/nodes`).
+1. Select the **Remove** button for the **secondary** site you want to remove.
+1. Confirm by selecting **Remove** when the prompt appears.
+
+Once removed from the Geo administration page, you must stop and uninstall the **secondary** site. For each node on your secondary Geo site:
+
+1. Stop GitLab:
+
+   ```shell
+   sudo gitlab-ctl stop
+   ```
+
+1. Uninstall GitLab:
+
+   ```shell
+   # Stop gitlab and remove its supervision process
+   sudo gitlab-ctl uninstall
+
+   # Debian/Ubuntu
+   sudo dpkg --remove gitlab-ee
+
+   # Redhat/Centos
+   sudo rpm --erase gitlab-ee
+   ```
+
+Once GitLab has been uninstalled from each node on the **secondary** site, the replication slot must be dropped from the **primary** site's database as follows:
+
+1. On the **primary** site's database node, start a PostgreSQL console session:
+
+   ```shell
+   sudo gitlab-psql
+   ```
+
+   NOTE:
+   Using `gitlab-rails dbconsole` will not work, because managing replication slots requires superuser permissions.
+
+1. Find the name of the relevant replication slot. This is the slot that is specified with `--slot-name` when running the replicate command: `gitlab-ctl replicate-geo-database`.
+
+   ```sql
+   SELECT * FROM pg_replication_slots;
+   ```
+
+1. Remove the replication slot for the **secondary** site:
+
+   ```sql
+   SELECT pg_drop_replication_slot('<name_of_slot>');
+   ```