Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 16 insertions, 9 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 7216f750624..e2c77073983 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -147,8 +147,7 @@ ldd $(command -v git) | grep pcre2
 
 The output should contain `libpcre2-8.so.0`.
 
-Is the system packaged Git too old, or not compiled with pcre2?
-Remove it:
+If the system packaged Git is too old or not compiled with `pcre2`, remove it:
 
 ```shell
 sudo apt-get remove git-core
@@ -312,13 +311,20 @@ sudo adduser --disabled-login --gecos 'GitLab' git
 ## 6. Database
 
 NOTE: **Note:**
-Starting from GitLab 12.1, only PostgreSQL is supported. Since GitLab 13.0, we require PostgreSQL 11+.
+Starting from GitLab 12.1, only PostgreSQL is supported. Since GitLab 13.0, we [require PostgreSQL 11+](requirements.md#postgresql-requirements).
 
 1. Install the database packages:
 
    ```shell
    sudo apt-get install -y postgresql postgresql-client libpq-dev postgresql-contrib
    ```
+   
+1. Verify the PostgreSQL version you have is supported by the version of GitLab you're
+   installing:
+
+   ```shell
+   psql --version
+   ```
 
 1. Start the PostgreSQL service and confirm that the service is running:
 
@@ -401,10 +407,11 @@ Starting from GitLab 12.1, only PostgreSQL is supported. Since GitLab 13.0, we r
 
 ## 7. Redis
 
-GitLab requires at least Redis 5.0.
+NOTE: **Note:**
+See the [requirements page](requirements.md#redis-versions) for the minimum
+Redis requirements.
 
-If you are using Debian 10 or Ubuntu 20.04 and up, you can install
-Redis 5.0 with:
+Install Redis with:
 
 ```shell
 sudo apt-get install redis-server
@@ -686,7 +693,7 @@ Next, make sure that Gitaly is configured:
 sudo chmod 0700 /home/git/gitlab/tmp/sockets/private
 sudo chown git /home/git/gitlab/tmp/sockets/private
 
-# If you are using non-default settings you need to update config.toml
+# If you are using non-default settings, you need to update config.toml
 cd /home/git/gitaly
 sudo -u git -H editor config.toml
 ```
@@ -740,7 +747,7 @@ Download the init script (is `/etc/init.d/gitlab`):
 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 ```
 
-And if you are installing with a non-default folder or user copy and edit the defaults file:
+And if you are installing with a non-default folder or user, copy and edit the defaults file:
 
 ```shell
 sudo cp lib/support/init.d/gitlab.default.example /etc/default/gitlab
@@ -937,7 +944,7 @@ See the [OmniAuth integration documentation](../integration/omniauth.md).
 
 ### Build your projects
 
-GitLab can build your projects. To enable that feature, you need GitLab Runners to do that for you.
+GitLab can build your projects. To enable that feature, you need runners to do that for you.
 See the [GitLab Runner section](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/#gitlab-runner) to install it.
 
 ### Adding your Trusted Proxies