Automatic merge of gitlab-org/gitlab-ce master

doc/administration/high_availability/load_balancer.md

@@ -60,11 +60,21 @@ for details on managing SSL certificates and configuring Nginx.
 
 ### Basic ports
 
-| LB Port | Backend Port | Protocol        |
-| ------- | ------------ | --------------- |
-| 80      | 80           | HTTP  [^1]      |
-| 443     | 443          | TCP or HTTPS [^1] [^2] |
-| 22      | 22           | TCP             |
+| LB Port | Backend Port | Protocol                 |
+| ------- | ------------ | ------------------------ |
+| 80      | 80           | HTTP (*1*)               |
+| 443     | 443          | TCP or HTTPS (*1*) (*2*) |
+| 22      | 22           | TCP                      |
+
+- (*1*): [Web terminal](../../ci/environments.md#web-terminals) support requires
+  your load balancer to correctly handle WebSocket connections. When using
+  HTTP or HTTPS proxying, this means your load balancer must be configured
+  to pass through the `Connection` and `Upgrade` hop-by-hop headers. See the
+  [web terminal](../integration/terminal.md) integration guide for
+  more details.
+- (*2*): When using HTTPS protocol for port 443, you will need to add an SSL
+  certificate to the load balancers. If you wish to terminate SSL at the
+  GitLab application server instead, use TCP protocol.
 
 ### GitLab Pages Ports
 
@@ -72,12 +82,19 @@ If you're using GitLab Pages with custom domain support you will need some
 additional port configurations.
 GitLab Pages requires a separate virtual IP address. Configure DNS to point the
 `pages_external_url` from `/etc/gitlab/gitlab.rb` at the new virtual IP address. See the
-[GitLab Pages documentation][gitlab-pages] for more information.
+[GitLab Pages documentation](../pages/index.md) for more information.
 
-| LB Port | Backend Port | Protocol |
-| ------- | ------------ | -------- |
-| 80      | Varies [^3]  | HTTP     |
-| 443     | Varies [^3]  | TCP [^4] |
+| LB Port | Backend Port  | Protocol  |
+| ------- | ------------- | --------- |
+| 80      | Varies (*1*)  | HTTP      |
+| 443     | Varies (*1*)  | TCP (*2*) |
+
+- (*1*): The backend port for GitLab Pages depends on the
+  `gitlab_pages['external_http']` and `gitlab_pages['external_https']`
+  setting. See [GitLab Pages documentation](../pages/index.md) for more details.
+- (*2*): Port 443 for GitLab Pages should always use the TCP protocol. Users can
+  configure custom domains with custom SSL, which would not be possible
+  if SSL was terminated at the load balancer.
 
 ### Alternate SSH Port
 
@@ -86,7 +103,7 @@ it may be helpful to configure an alternate SSH hostname that allows users
 to use SSH on port 443. An alternate SSH hostname will require a new virtual IP address
 compared to the other GitLab HTTP configuration above.
 
-Configure DNS for an alternate SSH hostname such as altssh.gitlab.example.com.
+Configure DNS for an alternate SSH hostname such as `altssh.gitlab.example.com`.
 
 | LB Port | Backend Port | Protocol |
 | ------- | ------------ | -------- |
@@ -101,24 +118,6 @@ Read more on high-availability configuration:
 1. [Configure NFS](nfs.md)
 1. [Configure the GitLab application servers](gitlab.md)
 
-[^1]: [Web terminal](../../ci/environments.md#web-terminals) support requires
-      your load balancer to correctly handle WebSocket connections. When using
-      HTTP or HTTPS proxying, this means your load balancer must be configured
-      to pass through the `Connection` and `Upgrade` hop-by-hop headers. See the
-      [web terminal](../integration/terminal.md) integration guide for
-      more details.
-[^2]: When using HTTPS protocol for port 443, you will need to add an SSL
-      certificate to the load balancers. If you wish to terminate SSL at the
-      GitLab application server instead, use TCP protocol.
-[^3]: The backend port for GitLab Pages depends on the
-      `gitlab_pages['external_http']` and `gitlab_pages['external_https']`
-      setting. See [GitLab Pages documentation][gitlab-pages] for more details.
-[^4]: Port 443 for GitLab Pages should always use the TCP protocol. Users can
-      configure custom domains with custom SSL, which would not be possible
-      if SSL was terminated at the load balancer.
-
-[gitlab-pages]: ../pages/index.md
-
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues

doc/administration/monitoring/gitlab_instance_administration_project/index.md

@@ -27,7 +27,7 @@ If that's not the case or if you have an external Prometheus instance or an HA s
 you should
 [configure it manually](../../../user/project/integrations/prometheus.md#manual-configuration-of-prometheus).
 
-## Taking action on Prometheus alerts **[ULTIMATE]**
+## Taking action on Prometheus alerts **(ULTIMATE)**
 
 You can [add a webhook](../../../user/project/integrations/prometheus.md#external-prometheus-instances)
 to the Prometheus config in order for GitLab to receive notifications of any alerts.

doc/administration/monitoring/performance/request_profiling.md

@@ -5,7 +5,7 @@
 1. Grab the profiling token from **Monitoring > Requests Profiles** admin page
   (highlighted in a blue in the image below).
   ![Profile token](img/request_profiling_token.png)
-1. Pass the header `X-Profile-Token: <token>` and `X-Profile-Mode: <mode>`(where <mode> can be `execution` or `memory`) to the request you want to profile. You can use:
+1. Pass the header `X-Profile-Token: <token>` and `X-Profile-Mode: <mode>`(where `<mode>` can be `execution` or `memory`) to the request you want to profile. You can use:
     - Browser extensions. For example, [ModHeader](https://chrome.google.com/webstore/detail/modheader/idgpnmonknjnojddfkpgkljpfnnfcklj) Chrome extension.
     - `curl`. For example, `curl --header 'X-Profile-Token: <token>' --header 'X-Profile-Mode: <mode>' https://gitlab.example.com/group/project`.
 1. Once request is finished (which will take a little longer than usual), you can

doc/install/azure/index.md

@@ -407,7 +407,7 @@ on any cloud service you choose.
 
 ## Where to next?
 
-Check out our other [Technical Articles](../../articles/index.md) or browse the [GitLab Documentation][GitLab-Docs](../../README.md) to learn more about GitLab.
+Check out our other [Technical Articles](../../articles/index.md) or browse the [GitLab Documentation](../../README.md) to learn more about GitLab.
 
 ### Useful links