summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-02-08 21:23:24 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2016-02-08 21:23:24 +0000
commitcd47897180490b0d6d851b78f5c75525567d6684 (patch)
treec9bbc2cee48fa5b153ff3c0eeb906019f2b63462
parent555b1a621a9a73e8cdead9888375a43a8e59f639 (diff)
parent910e5fd21775d041b21919166adae947dc5dabdd (diff)
downloadgitlab-ce-cd47897180490b0d6d851b78f5c75525567d6684.tar.gz
Merge branch 'master' into 'master'
Fix grammar in installation requirements. Fixes #13274 See merge request !2759
-rw-r--r--doc/install/requirements.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 006dae8ca9a..c6a1c20d02f 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -66,7 +66,7 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim
You need at least 2GB of addressable memory (RAM + swap) to install and use GitLab!
With less memory GitLab will give strange errors during the reconfigure run and 500 errors during usage.
-- 512MB RAM + 1.5GB of swap is the absolute minimum but we strongly **advise against** this amount of memory. See the unicorn worker section below for more advise.
+- 512MB RAM + 1.5GB of swap is the absolute minimum but we strongly **advise against** this amount of memory. See the unicorn worker section below for more advice.
- 1GB RAM + 1GB swap supports up to 100 users but it will be slow
- **2GB RAM** is the **recommended** memory size and supports up to 100 users
- 4GB RAM supports up to 1,000 users