Commit 6fb05fee authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'master' into 'master'

fix minor spelling mistakes

See merge request gitlab-org/gitlab-ee!3006
parents f29bf995 95ae0234
...@@ -302,7 +302,7 @@ OU=GitLab, Inc,DC=gitlab,DC=com ...@@ -302,7 +302,7 @@ OU=GitLab, Inc,DC=gitlab,DC=com
This character needs to be escaped as documented in [RFC 4515](https://tools.ietf.org/search/rfc4515). This character needs to be escaped as documented in [RFC 4515](https://tools.ietf.org/search/rfc4515).
Due to the way the string is parsed, the special character needs to be convered Due to the way the string is parsed, the special character needs to be converted
to hex and `\\5C\\` (`5C` = `\` in hex) added before it. to hex and `\\5C\\` (`5C` = `\` in hex) added before it.
As an example the above DN would look like As an example the above DN would look like
......
...@@ -82,11 +82,11 @@ errors during usage. ...@@ -82,11 +82,11 @@ errors during usage.
We recommend having at least 2GB of swap on your server, even if you currently have We recommend having at least 2GB of swap on your server, even if you currently have
enough available RAM. Having swap will help reduce the chance of errors occurring enough available RAM. Having swap will help reduce the chance of errors occurring
if your available memory changes. We also recommend [configuring the kernels swappiness setting](https://askubuntu.com/a/103916) if your available memory changes. We also recommend [configuring the kernel's swappiness setting](https://askubuntu.com/a/103916)
to a low value like `10` to make the most of your RAM while still having the swap to a low value like `10` to make the most of your RAM while still having the swap
available when needed. available when needed.
Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about many you need of those. Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about how many you need of those.
## Database ## Database
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment