Fix typos and grammar

[ci skip]

5 files changed, 14 insertions, 12 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
 #
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 86d37d64edd..0bfd33da057 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -487,7 +487,7 @@ You can use `sudo service gitlab start` and `sudo service gitlab stop` to start
 ### Relative URL support
 
 See the [Relative URL documentation](relative_url.md) for more information on
-how to set this up.
+how to configure GitLab with a relative URL.
 
 ### Using HTTPS
 
diff --git a/doc/install/relative_url.md b/doc/install/relative_url.md
index 24dde42b310..b341b6311c6 100644
--- a/doc/install/relative_url.md
+++ b/doc/install/relative_url.md
@@ -9,15 +9,15 @@ first time._
 
 ---
 
-While it is recommended to install GitLab in its own (sub)domain, sometimes
+While it is recommended to install GitLab on its own (sub)domain, sometimes
 this is not possible due to a variety of reasons. In that case, GitLab can also
 be installed under a relative URL, for example `https://example.com/gitlab`.
 
-There is no limit as to how much deeply nested the relative URL can be. For
-example you could serve GitLab under `/foo/bar/gitlab/git` without any issues.
+There is no limit to how deeply nested the relative URL can be. For example you
+could serve GitLab under `/foo/bar/gitlab/git` without any issues.
 
 Note that by changing the URL on an existing GitLab installation, all remote
-URLS will change, so you'll have to manually edit them in any local repository
+URLs will change, so you'll have to manually edit them in any local repository
 that points to your GitLab instance.
 
 ---
@@ -47,8 +47,7 @@ See the [requirements](requirements.md) document for more information.
 
 _**Note:**
 Do not make any changes to your web server configuration file regarding
-relative URL. The relative URL support is basically implemented by GitLab
-Workhorse._
+relative URL. The relative URL support is implemented by GitLab Workhorse._
 
 ---
 
@@ -109,7 +108,7 @@ Make sure to follow all steps below:
     gitlab-workhorse setting as needed.
 
 1.  After all the above changes recompile the assets. This is an important task
-    and will take some time to complete depending on the server resources.
+    and will take some time to complete depending on the server resources:
 
     ```
     cd /home/git/gitlab
@@ -121,7 +120,7 @@ Make sure to follow all steps below:
 ### Disable relative URL in GitLab
 
 To disable the relative URL, follow the same steps as above and set up the
-GitLab URL to a one that doesn't contain a relative path.
+GitLab URL to one that doesn't contain a relative path.
 
 [omnibus-rel]: http://doc.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab"
 [restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"