summaryrefslogtreecommitdiff
path: root/doc/install/relative_url.md
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 /doc/install/relative_url.md
parentf81495b1e1afeacedf7bc66b69e238e3db53010f (diff)
downloadgitlab-ce-464cea7d4892e76bcb39f0a3eaf848369178293a.tar.gz
Fix typos and grammar
[ci skip]
Diffstat (limited to 'doc/install/relative_url.md')
-rw-r--r--doc/install/relative_url.md15
1 files changed, 7 insertions, 8 deletions
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"