From 451448847cdac309e5f5f83e0d43641c5ef4c1c4 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Mon, 8 Aug 2016 04:31:50 +0000 Subject: [PATCH 1/3] Update Pages - EE features --- doc/pages/README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/pages/README.md b/doc/pages/README.md index a4f6eb14156d7b..78fd1d176b1951 100644 --- a/doc/pages/README.md +++ b/doc/pages/README.md @@ -1,3 +1,23 @@ +---- + +## What is GitLab Pages about? + +[GitLab Pages](https://pages/gitlab.io) is a static site hosting service. + +You keep your website project in your own GitLab EE instance, build, +test, and deploy it automatically with +[Gitlab CI](https://about.gitlab.com/gitlab-ci/), and serve it with +[GitLab Pages Server](https://gitlab.com/gitlab-org/gitlab-pages). + +## Use-cases + +- Host your company's website +- Host your costumers' websites +- Host your team members' websites +- Host different websites for each of your companies' departments + +---- + # GitLab Pages > **Note:** -- GitLab From a908b1abd0bedeaa6a771d485c5a80b91cbd3989 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 03:07:43 +0000 Subject: [PATCH 2/3] adjustments based on https://gitlab.com/gitlab-com/marketing/issues/336#note_13718538 + updates --- doc/pages/README.md | 49 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/doc/pages/README.md b/doc/pages/README.md index 78fd1d176b1951..3c4a4664e2547b 100644 --- a/doc/pages/README.md +++ b/doc/pages/README.md @@ -1,22 +1,3 @@ ----- - -## What is GitLab Pages about? - -[GitLab Pages](https://pages/gitlab.io) is a static site hosting service. - -You keep your website project in your own GitLab EE instance, build, -test, and deploy it automatically with -[Gitlab CI](https://about.gitlab.com/gitlab-ci/), and serve it with -[GitLab Pages Server](https://gitlab.com/gitlab-org/gitlab-pages). - -## Use-cases - -- Host your company's website -- Host your costumers' websites -- Host your team members' websites -- Host different websites for each of your companies' departments - ----- # GitLab Pages @@ -66,6 +47,30 @@ information, if you are using GitLab.com to host your website. +## Overview + +[GitLab Pages][pages-webpage] is a static site hosting service. It's a free +service at [GitLab.com][com], and available on-premises for [GitLab EE][ee] +instances only. + +You keep your website project in your own GitLab EE instance, build, +test, and deploy it automatically with +[GitLab CI][ci-webpage], and serve it with +[GitLab Pages Server][pages-daemon]. + +GitLab CI can build your site with [any Static Site Generator][ssgs-post-3] +and deploy it to GitLab Pages, which also supports SSL/TLS certificates and custom +domain and subdomain names. + +## Use-cases + +- Host your company's website +- Host your costumers' websites +- Host your team members' websites +- Host different websites for each of your companies' departments +- Use GitLab Pages as **staging** server and [deploy automatically or +manually][post-ivan] to your **production** server + ## Getting started with GitLab Pages > **Note:** @@ -481,3 +486,9 @@ For a list of known issues, visit GitLab's [public issue tracker]. [pages-jekyll]: https://gitlab.com/pages/jekyll [metarefresh]: https://en.wikipedia.org/wiki/Meta_refresh [public issue tracker]: https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name=Pages +[pages-webpage]: https://pages/gitlab.io +[ci-webpage]: https://about.gitlab.com/gitlab-ci/ +[ssgs-post-3]: https://about.gitlab.com/2016/06/17/ssg-overview-gitlab-pages-part-3-examples-ci/ +[com]: https://gitlab.com/users/sign_in +[ee]: https://about.gitlab.com/features/#enterprise +[post-ivan]: https://about.gitlab.com/2016/08/18/using-gitlab-labels/ci-deployment-and-environments/ \ No newline at end of file -- GitLab From 0ff167ed70fff038e166f136cfcb154d31b4c368 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 06:35:16 +0000 Subject: [PATCH 3/3] trying to make the build pass --- doc/pages/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/pages/README.md b/doc/pages/README.md index 3c4a4664e2547b..6e748c8228c867 100644 --- a/doc/pages/README.md +++ b/doc/pages/README.md @@ -1,4 +1,3 @@ - # GitLab Pages > **Note:** @@ -47,6 +46,8 @@ information, if you are using GitLab.com to host your website. +--- + ## Overview [GitLab Pages][pages-webpage] is a static site hosting service. It's a free @@ -68,8 +69,7 @@ domain and subdomain names. - Host your costumers' websites - Host your team members' websites - Host different websites for each of your companies' departments -- Use GitLab Pages as **staging** server and [deploy automatically or -manually][post-ivan] to your **production** server +- Use GitLab Pages as **staging** server and [deploy automatically or manually][post-ivan] to your **production** server ## Getting started with GitLab Pages @@ -491,4 +491,4 @@ For a list of known issues, visit GitLab's [public issue tracker]. [ssgs-post-3]: https://about.gitlab.com/2016/06/17/ssg-overview-gitlab-pages-part-3-examples-ci/ [com]: https://gitlab.com/users/sign_in [ee]: https://about.gitlab.com/features/#enterprise -[post-ivan]: https://about.gitlab.com/2016/08/18/using-gitlab-labels/ci-deployment-and-environments/ \ No newline at end of file +[post-ivan]: https://about.gitlab.com/2016/08/18/using-gitlab-labels/ci-deployment-and-environments/ -- GitLab