summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-01-23 13:48:43 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-01 23:50:01 +0000
commit452b9c8b955274f8892d3fa4a0fc335d28515272 (patch)
treecc207f5806870978f0f5ed8667f63e2619520c84 /doc
parent39e74b1cba3773fd0fb37bc78a7400ec7c6b7ab3 (diff)
downloadgitlab-ce-452b9c8b955274f8892d3fa4a0fc335d28515272.tar.gz
Merge multiple notes into one in Pages user docs
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/pages/index.md12
1 files changed, 5 insertions, 7 deletions
diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md
index e427d7f283d..a07c23a3274 100644
--- a/doc/user/project/pages/index.md
+++ b/doc/user/project/pages/index.md
@@ -1,12 +1,10 @@
# GitLab Pages
-> **Note:**
-> This feature was [introduced][ee-80] in GitLab EE 8.3.
-> Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
-
-> **Note:**
-> This document is about the user guide. To learn how to enable GitLab Pages
-> across your GitLab instance, visit the [administrator documentation](administration.md).
+> **Notes:**
+> - This feature was [introduced][ee-80] in GitLab EE 8.3.
+> - Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
+> - This document is about the user guide. To learn how to enable GitLab Pages
+> across your GitLab instance, visit the [administrator documentation](../../../administration/pages/index.md).
With GitLab Pages you can host for free your static websites on GitLab.
Combined with the power of [GitLab CI] and the help of [GitLab Runner] you can