summaryrefslogtreecommitdiff
path: root/doc/user/project/pages/index.md
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-04-11 10:58:06 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-04-11 10:58:06 +0000
commit4dfd4d2744f3effcce59b498e9d56a559fc2a6f3 (patch)
tree814c011206c133576dc6f4c926a4a1e4fcc6c84e /doc/user/project/pages/index.md
parent4d39435ea865c92b589b1b6dd8b21102a7ef1adf (diff)
downloadgitlab-ce-4dfd4d2744f3effcce59b498e9d56a559fc2a6f3.tar.gz
Refactor intro guide
Remove redundancies: - Domains - User/group/project sites
Diffstat (limited to 'doc/user/project/pages/index.md')
-rw-r--r--doc/user/project/pages/index.md9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md
index 885df9f0850..0cd47c65d76 100644
--- a/doc/user/project/pages/index.md
+++ b/doc/user/project/pages/index.md
@@ -5,6 +5,11 @@ last_updated: 2019-03-05
# GitLab Pages
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/80) in GitLab Enterprise Edition 8.3.
+> - Custom CNAMEs with TLS support were [introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/173) in GitLab Enterprise Edition 8.5.
+> - [Ported](https://gitlab.com/gitlab-org/gitlab-ce/issues/14605) to GitLab Community Edition in GitLab 8.17.
+> Support for subgroup project's websites was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/30548) in GitLab 11.8.
+
**GitLab Pages is a feature that allows you to publish static websites
directly from a repository in GitLab.**
@@ -83,7 +88,7 @@ that will build your site and publish it to the GitLab Pages server. The sequenc
scripts that GitLab CI/CD runs to accomplish this task is created from a file named
`.gitlab-ci.yml`, which you can [create and modify](getting_started_part_four.md) at will.
-You can either use GitLab's [default domain for GitLab Pages websites](getting_started_part_one.md#gitlab-pages-domain),
+You can either use GitLab's [default domain for GitLab Pages websites](getting_started_part_one.md#gitlab-pages-domain-names),
`*.gitlab.io`, or your own domain (`example.com`). In that case, you'll
need admin access to your domain's registrar (or control panel) to set it up with Pages.
@@ -128,7 +133,7 @@ To learn more about GitLab Pages, read the following tutorials:
- [Projects for GitLab Pages and URL structure](getting_started_part_two.md): Forking projects and creating new ones from scratch, understanding URLs structure and baseurls
- [GitLab Pages custom domains and SSL/TLS Certificates](getting_started_part_three.md): How to add custom domains and subdomains to your website, configure DNS records and SSL/TLS certificates
- [Creating and Tweaking GitLab CI/CD for GitLab Pages](getting_started_part_four.md): Understand how to create your own `.gitlab-ci.yml` for your site
-- [Technical aspects, custom 404 pages, limitations](introduction.md)
+- [Exploring GitLab Pages](introduction.md): Technical aspects, specific configuration options, custom 404 pages, limitations
### GitLab Pages with Static Site Generators (SSGs)