summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis (🌴 July 10 - July 20 🌴) <axil@gitlab.com>2018-07-09 15:17:10 +0000
committerAchilleas Pipinellis (🌴 July 10 - July 20 🌴) <axil@gitlab.com>2018-07-09 15:17:10 +0000
commit21a511e47e448250802b1777b43589c9168e0638 (patch)
treeb4ddc5f14ff3428b6c27102e02156510b78ef7a3
parente8d7b283be1b9bb636e769908c2d9e603f3aa679 (diff)
parent47f5dab6923b438c3a1e27671bd44333971191b9 (diff)
downloadgitlab-ce-21a511e47e448250802b1777b43589c9168e0638.tar.gz
Merge branch 'docs-clarify-pages-domain' into 'master'
Docs: make it clear that you need a completely separate domain for Pages Closes #31961 See merge request gitlab-org/gitlab-ce!20369
-rw-r--r--doc/administration/pages/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 9b1297ca4ba..c0a281382a5 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -49,8 +49,8 @@ supporting custom domains a secondary IP is not needed.
Before proceeding with the Pages configuration, you will need to:
-1. Have a separate domain under which the GitLab Pages will be served. In this
- document we assume that to be `example.io`.
+1. Have an exclusive root domain for serving GitLab Pages. Note that you cannot
+ use a subdomain of your GitLab's instance domain.
1. Configure a **wildcard DNS record**.
1. (Optional) Have a **wildcard certificate** for that domain if you decide to
serve Pages under HTTPS.