summaryrefslogtreecommitdiff
path: root/doc/pages/administration.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-21 00:41:08 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:28 +0000
commitfd9916c8d2976f724589d581943cc6aa4b1237f7 (patch)
tree9be002e6f673e7635df36a5a628c9b1a65a2be3b /doc/pages/administration.md
parentdeb9481efde12e6198b0330bb8eb4c802d1d4b4c (diff)
downloadgitlab-ce-fd9916c8d2976f724589d581943cc6aa4b1237f7.tar.gz
Add section about changes from 8.4 to 8.5
[ci skip]
Diffstat (limited to 'doc/pages/administration.md')
-rw-r--r--doc/pages/administration.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md
index 529a1450fd3..5e0e4f8efed 100644
--- a/doc/pages/administration.md
+++ b/doc/pages/administration.md
@@ -5,6 +5,15 @@ _**Note:** This feature was [introduced][ee-80] in GitLab EE 8.3_
If you are looking for ways to upload your static content in GitLab Pages, you
probably want to read the [user documentation](README.md).
+## Changes to GitLab Pages from GitLab 8.4 to 8.5
+
+In GitLab 8.5 we introduced the [gitlab-pages daemon] which is now the
+recommended way to set up GitLab Pages.
+
+The NGINX configs have changed to reflect this change.
+
+[gitlab-pages daemon]: https://gitlab.com/gitlab-org/gitlab-pages
+
## Configuration
There are a couple of things to consider before enabling GitLab pages in your