summaryrefslogtreecommitdiff
path: root/doc/user/project/pages
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-09-28 14:00:20 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-09-28 14:01:15 -0300
commit98f4c8cb5bdedadfa3517862934a4bf65dfeea41 (patch)
tree75771cdc167e4ae194a508469a62c384c72cfc53 /doc/user/project/pages
parentaa21f0935382b81beb6115c82da3a3573f93cf18 (diff)
downloadgitlab-ce-98f4c8cb5bdedadfa3517862934a4bf65dfeea41.tar.gz
copyedit - reorg headers
Diffstat (limited to 'doc/user/project/pages')
-rw-r--r--doc/user/project/pages/getting_started_part_three.md42
1 files changed, 21 insertions, 21 deletions
diff --git a/doc/user/project/pages/getting_started_part_three.md b/doc/user/project/pages/getting_started_part_three.md
index 4fc6f701144..0096f8507d2 100644
--- a/doc/user/project/pages/getting_started_part_three.md
+++ b/doc/user/project/pages/getting_started_part_three.md
@@ -33,8 +33,8 @@ you'll need to set up [DNS records](#dns-records)
To finish the association, you need to [add your domain to your project's Pages settings](#add-your-custom-domain-to-gitlab-pages-settings).
Let's start from the beginning with [DNS records](#dns-records).
-If you already know how these things work and want to skip the tutorial,
-you may be interested in the [TL;DR](#tl-dr) section below.
+If you already know how they work and want to skip the introduction to DNS,
+you may be interested in skipping it until the [TL;DR](#tl-dr) section below.
### DNS Records
@@ -103,7 +103,23 @@ without any `/project-name`.
![DNS CNAME record pointing to GitLab.com project](img/dns_cname_record_example.png)
-#### Add your custom domain to GitLab Pages settings
+#### TL;DR
+
+| From | DNS Record | To |
+| ---- | ---------- | -- |
+| domain.com | A | 52.167.214.135 |
+| subdomain.domain.com | CNAME | namespace.gitlab.io |
+
+> **Notes**:
+>
+> - **Do not** use a CNAME record if you want to point your
+`domain.com` to your GitLab Pages site. Use an `A` record instead.
+> - **Do not** add any special chars after the default Pages
+domain. E.g., **do not** point your `subdomain.domain.com` to
+`namespace.gitlab.io.` or `namespace.gitlab.io/`.
+> - GitLab Pages IP on GitLab.com [has been changed](https://about.gitlab.com/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/) from `104.208.235.32` to `52.167.214.135`.
+
+### Add your custom domain to GitLab Pages settings
Once you've set the DNS record, you'll need navigate to your project's
**Setting > Pages** and click **+ New domain** to add your custom domain to
@@ -113,8 +129,8 @@ your site will be accessible only via HTTP:
![Add new domain](img/add_certificate_to_pages.png)
-You add more than one alias (custom domains and subdomains) to the same project.
-An alias can be understood as a way to have many doors leading to the same room.
+You can add more than one alias (custom domains and subdomains) to the same project.
+An alias can be understood as having many doors leading to the same room.
All the aliases you've set to your site will be listed on **Setting > Pages**.
From that page, you can view, add, and remove them.
@@ -126,22 +142,6 @@ to your domain will respond with a 404.
Read through the [general documentation on GitLab Pages](introduction.md#add-a-custom-domain-to-your-pages-website) to learn more about adding
custom domains to GitLab Pages sites.
-#### TL;DR
-
-| From | DNS Record | To |
-| ---- | ---------- | -- |
-| domain.com | A | 52.167.214.135 |
-| subdomain.domain.com | CNAME | namespace.gitlab.io |
-
-> **Notes**:
->
-> - **Do not** use a CNAME record if you want to point your
-`domain.com` to your GitLab Pages site. Use an `A` record instead.
-> - **Do not** add any special chars after the default Pages
-domain. E.g., **do not** point your `subdomain.domain.com` to
-`namespace.gitlab.io.` or `namespace.gitlab.io/`.
-> - GitLab Pages IP on GitLab.com [has been changed](https://about.gitlab.com/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/) from `104.208.235.32` to `52.167.214.135`.
-
### SSL/TLS Certificates
Every GitLab Pages project on GitLab.com will be available under