Merge branch 'docs-repo-merge-redux-3-misc' into 'master'

Docs: Realigning scattered EE docs into CE

See merge request gitlab-org/gitlab-ce!28102

4 files changed, 29 insertions, 13 deletions

diff --git a/doc/user/admin_area/geo_nodes.md b/doc/user/admin_area/geo_nodes.md
index d6d6d9b2517..776ab139c64 100644
--- a/doc/user/admin_area/geo_nodes.md
+++ b/doc/user/admin_area/geo_nodes.md
@@ -11,37 +11,38 @@ All Geo nodes have the following settings:
 
 | Setting | Description |
 | --------| ----------- |
-| Primary | This marks a Geo Node as primary. There can be only one primary, make sure that you first add the primary node and then all the others. |
-| URL     | The instance's full URL, in the same way it is configured in  `/etc/gitlab/gitlab.rb` (Omnibus GitLab installations) or `gitlab.yml` (source based installations). |
+| Primary | This marks a Geo Node as **primary** node. There can be only one **primary** node; make sure that you first add the **primary** node and then all the others. |
+| Name    | The unique identifier for the Geo node. Must match the setting `gitlab_rails[geo_node_name]` in `/etc/gitlab/gitlab.rb`. The setting defaults to `external_url` with a trailing slash. |
+| URL     | The instance's user-facing URL. |
 
 The node you're reading from is indicated with a green `Current node` label, and
-the primary is given a blue `Primary` label. Remember that you can only make
-changes on the primary!
+the **primary** node is given a blue `Primary` label. Remember that you can only make
+changes on the **primary** node!
 
-## Secondary node settings
+## **Secondary** node settings
 
-Secondaries have a number of additional settings available:
+**Secondary** nodes have a number of additional settings available:
 
 | Setting                   | Description |
 |---------------------------|-------------|
- Selective synchronization | Enable Geo [selective sync](https://docs.gitlab.com/ee/administration/geo/replication/configuration.html#selective-synchronization) for this **secondary** node. |
+| Selective synchronization | Enable Geo [selective sync](https://docs.gitlab.com/ee/administration/geo/replication/configuration.html#selective-synchronization) for this **secondary** node. |
 | Repository sync capacity  | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling repositories. |
 | File sync capacity        | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling files. |
 
 ## Geo backfill
 
-Secondaries are notified of changes to repositories and files by the primary,
+**Secondary** nodes are notified of changes to repositories and files by the **primary** node,
 and will always attempt to synchronize those changes as quickly as possible.
 
-Backfill is the act of populating the secondary with repositories and files that
-existed *before* the secondary was added to the database. Since there may be
+Backfill is the act of populating the **secondary** node with repositories and files that
+existed *before* the **secondary** node was added to the database. Since there may be
 extremely large numbers of repositories and files, it's infeasible to attempt to
 download them all at once, so GitLab places an upper limit on the concurrency of
 these operations.
 
 How long the backfill takes is a function of the maximum concurrency, but higher
-values place more strain on the primary node. From [GitLab 10.2](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3107),
-the limits are configurable - if your primary node has lots of surplus capacity,
+values place more strain on the **primary** node. From [GitLab 10.2](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3107),
+the limits are configurable. If your **primary** node has lots of surplus capacity,
 you can increase the values to complete backfill in a shorter time. If it's
 under heavy load and backfill is reducing its availability for normal requests,
 you can decrease them.
@@ -55,3 +56,15 @@ which is used by users. Internal URL does not need to be a private address.
 
 Internal URL defaults to External URL, but you can customize it under
 **Admin area > Geo Nodes**.
+
+## Multiple secondary nodes behind a load balancer
+
+In GitLab 11.11, **secondary** nodes can use identical external URLs as long as
+a unique `name` is set for each Geo node. The `gitlab.rb` setting
+`gitlab_rails[geo_node_name]` must:
+
+- Be set for each GitLab instance that runs `unicorn`, `sidekiq`, or `geo_logcursor`.
+- Match a Geo node name.
+
+The load balancer must use sticky sessions in order to avoid authentication
+failures and cross site request errors.
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 29db6fc8958..2d0c2be4233 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -201,6 +201,7 @@ dependency_scanning:
       --env DS_ANALYZER_IMAGE_PREFIX \
       --env DS_ANALYZER_IMAGE_TAG \
       --env DS_DEFAULT_ANALYZERS \
+      --env DS_EXCLUDED_PATHS \
       --env DEP_SCAN_DISABLE_REMOTE_CHECKS \
       --env DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
       --env DS_PULL_ANALYZER_IMAGE_TIMEOUT \
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 377d218321a..02c115b7f22 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -171,6 +171,8 @@ sast:
         --env SAST_ANALYZER_IMAGE_PREFIX \
         --env SAST_ANALYZER_IMAGE_TAG \
         --env SAST_DEFAULT_ANALYZERS \
+        --env SAST_EXCLUDED_PATHS \
+        --env SAST_BANDIT_EXCLUDED_PATHS \
         --env SAST_BRAKEMAN_LEVEL \
         --env SAST_GOSEC_LEVEL \
         --env SAST_FLAWFINDER_LEVEL \
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index bfc3e3a7de0..9003018a521 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -24,7 +24,7 @@ in the label’s title, using the format `key::value`. For example:
 
 ![A sample scoped label](img/key_value_labels.png)
 
-Two scoped labels with the same key but a different value cannot simultaneeously
+Two scoped labels with the same key but a different value cannot simultaneously
 apply to an issue, epic, or merge request. For example, if an issue already has `priority::3`
 and you apply `priority::2` to it, `priority::3` is automatically removed from the issue.