diff options
author | Marin Jankovski <marin@gitlab.com> | 2019-02-11 19:57:14 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2019-02-11 19:57:14 +0300 |
commit | 43fc0557e04e4ef9dab1816d3132d135bd260556 (patch) | |
tree | 0abfbd26cface7ab160a304cd3386d78fdadc773 /doc/administration | |
parent | 36854b9714f51a154f33c594fdb09c7da25be0e3 (diff) | |
parent | f812c9624f7c5eb6c7d69facc4f78290b718e520 (diff) |
Merge branch 'docs/refactor-update-guides' into 'master'
Refactor the upgrading from source docs
Closes gitlab-org/release/framework#190
See merge request gitlab-org/gitlab-ce!25003
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/integration/terminal.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 40e03093743..25d85d1687b 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -64,8 +64,9 @@ narrower set of rules, you can restrict it to URLs ending with `/terminal.ws` (although this may still have a few false positives). If you installed from source, or have made any configuration changes to your -Omnibus installation before upgrading to 8.15, you may need to make some -changes to your configuration. See the [8.14 to 8.15 upgrade](../../update/8.14-to-8.15.md#nginx-configuration) +Omnibus installation before upgrading to 8.15, you may need to make some changes +to your configuration. See the [Upgrading Community Edition and Enterprise +Edition from source](../../update/upgrading_from_source.md#nginx-configuration) document for more details. If you'd like to disable web terminal support in GitLab, just stop passing |