diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-20 08:56:01 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-20 08:56:01 +0000 |
| commit | a154c934eb4cfa8d3846520bce3eceab9b636b37 (patch) | |
| tree | 12a3bbb96cf63dfa6e6a53c765287283be29173f /doc | |
| parent | 225bbf84edc2f809a9212379b5e527f14058d2b8 (diff) | |
| parent | de440ee5e3fd03d0e3de33c474b1889e03aaf04a (diff) | |
| download | gitlab-ce-a154c934eb4cfa8d3846520bce3eceab9b636b37.tar.gz | |
Merge branch 'update-docs' into 'master'
More GitLab spellings. No dedicated CI in omnibus
See merge request !1838
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install/installation.md | 2 | ||||
| -rw-r--r-- | doc/release/monthly.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 52ae30af805..a710407d4f6 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -320,7 +320,7 @@ GitLab Shell is an SSH access and repository management software developed speci **Note:** If you want to use HTTPS, see [Using HTTPS](#using-https) for the additional steps. -**Note:** Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in /etc/hosts ("127.0.0.1 hostname"). This might be necessary for example if you set up gitlab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with "Check GitLab API access: FAILED. code: 401" and pushing commits will be rejected with "[remote rejected] master -> master (hook declined)". +**Note:** Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in /etc/hosts ("127.0.0.1 hostname"). This might be necessary for example if you set up GitLab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with "Check GitLab API access: FAILED. code: 401" and pushing commits will be rejected with "[remote rejected] master -> master (hook declined)". ### Install gitlab-workhorse diff --git a/doc/release/monthly.md b/doc/release/monthly.md index c9ab87671d2..aff3f066b24 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -159,7 +159,7 @@ Please do not raise issues directly in this issue but link to issues that might The decision to create a patch release or not is with the release manager who is assigned to this issue. The release manager will comment here about the plans for patch releases. -Assign the issue to the release manager and at mention all members of gitlab core team. If there are any known bugs in the release add them immediately. +Assign the issue to the release manager and at mention all members of GitLab core team. If there are any known bugs in the release add them immediately. ## Tweet about RC1 |