Automatic merge of gitlab-org/gitlab master

GITALY_SERVER_VERSION

-3fbc0ff9c0c9fa486b753aa23ceac9513a2cde7b
+fb9de5f27b55e28a5d4737e0aa639a50ccc3dd75

doc/administration/geo/replication/configuration.md

@@ -190,6 +190,9 @@ keys must be manually replicated to the **secondary** site.
    gitlab_rails['geo_node_name'] = '<site_name_here>'
    ```
 
+   We recommend mentioning specific names for the `geo_node_name` such as `gitlab-usa` instead of generic names, such as `geo`.
+   This makes the failover process easier because the physical location does not change, but the Geo site role can.
+   
 1. Reconfigure **each Rails and Sidekiq node on your secondary** site for the change to take effect:
 
    ```shell

doc/development/documentation/styleguide/index.md

@@ -1441,11 +1441,12 @@ application:
 Use these verbs for specific uses with user interface
 elements:
 
-| Recommended         | Used for                              | Replaces                   |
-|:--------------------|:--------------------------------------|:---------------------------|
-| _select_            | buttons, links, menu items, dropdowns | "click, "press," "hit"     |
-| _select_ or _clear_ | checkboxes                            | "enable", "click", "press" |
-| _expand_            | expandable sections                   | "open"                     |
+| Recommended             | Used for                              | Replaces                    |
+|:------------------------|:--------------------------------------|:----------------------------|
+| _select_                | buttons, links, menu items, dropdowns | "click, "press," "hit"      |
+| _select_ or _clear_     | checkboxes                            | "enable", "click", "press"  |
+| _expand_                | expandable sections                   | "open"                      |
+| _turn on_ or _turn off_ | toggles                               | "flip", "enable", "disable" |
 
 ### Other Verbs