summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 12:43:19 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 12:43:19 +0200
commit464cea7d4892e76bcb39f0a3eaf848369178293a (patch)
tree0c360c4fb2d7031ada60f4baca3a92362fa76f40 /config
parentf81495b1e1afeacedf7bc66b69e238e3db53010f (diff)
downloadgitlab-ce-464cea7d4892e76bcb39f0a3eaf848369178293a.tar.gz
Fix typos and grammar
[ci skip]
Diffstat (limited to 'config')
-rw-r--r--config/application.rb3
-rw-r--r--config/gitlab.yml.example3
-rw-r--r--config/unicorn.rb.example3
3 files changed, 6 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb
index 17574d8c992..ece8b3ff342 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,7 +53,8 @@ module Gitlab
config.action_view.sanitized_allowed_protocols = %w(smb)
# Relative URL support
- # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+ # WARNING: We recommend using an FQDN to host GitLab in a root path instead
+ # of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path
#
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 667e32dd671..faf05ecd466 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -39,7 +39,8 @@ production: &base
# ssh_host: ssh.host_example.com
# Relative URL support
- # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+ # WARNING: We recommend using an FQDN to host GitLab in a root path instead
+ # of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path
#
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 02b251f1847..e5058cebce8 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -12,7 +12,8 @@
# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# Relative URL support
-# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+# WARNING: We recommend using an FQDN to host GitLab in a root path instead
+# of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path
#