Merge remote-tracking branch 'github/master' into 'master'

2016-05-25 16:13:57 -04:00 · 2016-05-25 16:13:57 -04:00 · 7fa1ab469f
parent 19cb7241ea 2c89d6664a
commit 7fa1ab469f
1 changed files with 1 additions and 1 deletions
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@ -26,7 +26,7 @@ that runs Redis.
    ```ruby
      external_url 'https://gitlab.example.com'

-      # Disable all components except PostgreSQL
+      # Disable all components except Redis
      redis['enable'] = true
      bootstrap['enable'] = false
      nginx['enable'] = false