diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:09:31 +0000 |
commit | f1d9023a9049ed7defec5566063b7f704c26dfd6 (patch) | |
tree | 0e7ea3a1e0d07c4b69baf361e99bad4fc1e16bc9 /doc/administration/pages | |
parent | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (diff) | |
download | gitlab-ce-f1d9023a9049ed7defec5566063b7f704c26dfd6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/pages')
-rw-r--r-- | doc/administration/pages/index.md | 4 | ||||
-rw-r--r-- | doc/administration/pages/source.md | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index 84133205bd3..c5467edd32f 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -80,7 +80,7 @@ added `gitlab.io` [in 2016](https://gitlab.com/gitlab-com/infrastructure/issues/ ### DNS configuration GitLab Pages expect to run on their own virtual host. In your DNS server/provider -you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the +you need to add a [wildcard DNS A record](https://en.wikipedia.org/wiki/Wildcard_DNS_record) pointing to the host that GitLab runs. For example, an entry would look like this: ```plaintext @@ -95,8 +95,6 @@ IPv6 address. If you don't have IPv6, you can omit the AAAA record. NOTE: **Note:** You should not use the GitLab domain to serve user pages. For more information see the [security section](#security). -[wiki-wildcard-dns]: https://en.wikipedia.org/wiki/Wildcard_DNS_record - ## Configuration Depending on your needs, you can set up GitLab Pages in 4 different ways. diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md index 94d2c5420aa..1bb3b86b419 100644 --- a/doc/administration/pages/source.md +++ b/doc/administration/pages/source.md @@ -61,7 +61,7 @@ Before proceeding with the Pages configuration, make sure that: ### DNS configuration GitLab Pages expect to run on their own virtual host. In your DNS server/provider -you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the +you need to add a [wildcard DNS A record](https://en.wikipedia.org/wiki/Wildcard_DNS_record) pointing to the host that GitLab runs. For example, an entry would look like this: ```plaintext @@ -75,8 +75,6 @@ and `192.0.2.1` is the IP address of your GitLab instance. You should not use the GitLab domain to serve user pages. For more information see the [security section](#security). -[wiki-wildcard-dns]: https://en.wikipedia.org/wiki/Wildcard_DNS_record - ## Configuration Depending on your needs, you can set up GitLab Pages in 4 different ways. |