summaryrefslogtreecommitdiff
path: root/doc/pages
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-22 12:34:16 +0100
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-02-22 12:34:16 +0100
commit3bf60f8a64d7f6fd0d642378e6ed70785b65405c (patch)
treec6bcfff12c8810e8c4d98646fcf35aad2a9629e8 /doc/pages
parentdde136ad8ec02e7a61d1197cbb209117b252dd8f (diff)
downloadgitlab-ce-3bf60f8a64d7f6fd0d642378e6ed70785b65405c.tar.gz
Change images location (s/images/img)
Diffstat (limited to 'doc/pages')
-rw-r--r--doc/pages/images/add_certificate_to_pages.pngbin58581 -> 0 bytes
-rw-r--r--doc/pages/images/choose_ci_template.pngbin75580 -> 0 bytes
-rw-r--r--doc/pages/images/dns_a_record_example.pngbin10681 -> 0 bytes
-rw-r--r--doc/pages/images/dns_cname_record_example.pngbin11972 -> 0 bytes
-rw-r--r--doc/pages/images/remove_fork_relashionship.pngbin39941 -> 0 bytes
-rw-r--r--doc/pages/images/setup_ci.pngbin27380 -> 0 bytes
-rw-r--r--doc/pages/img/add_certificate_to_pages.pngbin0 -> 14608 bytes
-rw-r--r--doc/pages/img/choose_ci_template.pngbin0 -> 23532 bytes
-rw-r--r--doc/pages/img/dns_a_record_example.pngbin0 -> 4709 bytes
-rw-r--r--doc/pages/img/dns_cname_record_example.pngbin0 -> 5004 bytes
-rw-r--r--doc/pages/img/remove_fork_relashionship.pngbin0 -> 13646 bytes
-rw-r--r--doc/pages/img/setup_ci.pngbin0 -> 10033 bytes
-rw-r--r--doc/pages/pages_quick_start_guide.md12
-rw-r--r--doc/pages/pages_static_sites_domains_dns_records_ssl_tls_certificates.md6
14 files changed, 9 insertions, 9 deletions
diff --git a/doc/pages/images/add_certificate_to_pages.png b/doc/pages/images/add_certificate_to_pages.png
deleted file mode 100644
index 94d48fafa6e..00000000000
--- a/doc/pages/images/add_certificate_to_pages.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/images/choose_ci_template.png b/doc/pages/images/choose_ci_template.png
deleted file mode 100644
index dea4ad2ed28..00000000000
--- a/doc/pages/images/choose_ci_template.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/images/dns_a_record_example.png b/doc/pages/images/dns_a_record_example.png
deleted file mode 100644
index f035d30984c..00000000000
--- a/doc/pages/images/dns_a_record_example.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/images/dns_cname_record_example.png b/doc/pages/images/dns_cname_record_example.png
deleted file mode 100644
index 93e011d743d..00000000000
--- a/doc/pages/images/dns_cname_record_example.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/images/remove_fork_relashionship.png b/doc/pages/images/remove_fork_relashionship.png
deleted file mode 100644
index 8c4fab92990..00000000000
--- a/doc/pages/images/remove_fork_relashionship.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/images/setup_ci.png b/doc/pages/images/setup_ci.png
deleted file mode 100644
index 5569f6aacf5..00000000000
--- a/doc/pages/images/setup_ci.png
+++ /dev/null
Binary files differ
diff --git a/doc/pages/img/add_certificate_to_pages.png b/doc/pages/img/add_certificate_to_pages.png
new file mode 100644
index 00000000000..d92a981dc60
--- /dev/null
+++ b/doc/pages/img/add_certificate_to_pages.png
Binary files differ
diff --git a/doc/pages/img/choose_ci_template.png b/doc/pages/img/choose_ci_template.png
new file mode 100644
index 00000000000..0697542abc8
--- /dev/null
+++ b/doc/pages/img/choose_ci_template.png
Binary files differ
diff --git a/doc/pages/img/dns_a_record_example.png b/doc/pages/img/dns_a_record_example.png
new file mode 100644
index 00000000000..b923730388a
--- /dev/null
+++ b/doc/pages/img/dns_a_record_example.png
Binary files differ
diff --git a/doc/pages/img/dns_cname_record_example.png b/doc/pages/img/dns_cname_record_example.png
new file mode 100644
index 00000000000..d64a843a283
--- /dev/null
+++ b/doc/pages/img/dns_cname_record_example.png
Binary files differ
diff --git a/doc/pages/img/remove_fork_relashionship.png b/doc/pages/img/remove_fork_relashionship.png
new file mode 100644
index 00000000000..f5b5e543f21
--- /dev/null
+++ b/doc/pages/img/remove_fork_relashionship.png
Binary files differ
diff --git a/doc/pages/img/setup_ci.png b/doc/pages/img/setup_ci.png
new file mode 100644
index 00000000000..7ce0431f4d4
--- /dev/null
+++ b/doc/pages/img/setup_ci.png
Binary files differ
diff --git a/doc/pages/pages_quick_start_guide.md b/doc/pages/pages_quick_start_guide.md
index b86b451ba5e..b0a33136d06 100644
--- a/doc/pages/pages_quick_start_guide.md
+++ b/doc/pages/pages_quick_start_guide.md
@@ -46,8 +46,8 @@ Watch the [video tutorial](https://youtu.be/TWqh9MtT4Bg) we've created for the s
1. Choose your SSG template
1. Fork a project from the [Pages group](https://gitlab.com/pages)
1. Remove the fork relationship by navigating to your **Project**'s **Settings** > **Edit Project**
-
- ![remove fork relashionship](images/remove_fork_relashionship.png)
+
+ ![remove fork relashionship](img/remove_fork_relashionship.png)
1. Enable Shared Runners for your fork: navigate to your **Project**'s **Settings** > **CI/CD Pipelines**
1. Trigger a build (push a change to any file)
@@ -73,17 +73,17 @@ To turn a **project website** forked from the Pages group into a **user/group**
1. From your **Project**'s **[Dashboard](https://gitlab.com/dashboard/projects)**, click **New project**, and name it considering the [examples above](#practical-examples).
1. Clone it to your local computer, add your website files to your project, add, commit and push to GitLab.
1. From the your **Project**'s page, click **Set up CI**:
-
- ![setup GitLab CI](images/setup_ci.png)
+
+ ![setup GitLab CI](img/setup_ci.png)
1. Choose one of the templates from the dropbox menu. Pick up the template corresponding to the SSG you're using (or plain HTML).
- ![gitlab-ci templates](images/choose_ci_template.png)
+ ![gitlab-ci templates](img/choose_ci_template.png)
Once you have both site files and `.gitlab-ci.yml` in your project's root, GitLab CI will build your site and deploy it with Pages. Once the first build passes, you see your site is live by navigating to your **Project**'s **Settings** > **Pages**, where you'll find its default URL.
> **Notes:**
->
+>
> - GitLab Pages [supports any SSG](https://about.gitlab.com/2016/06/17/ssg-overview-gitlab-pages-part-3-examples-ci/), but, if you don't find yours among the templates, you'll need to configure your own `.gitlab-ci.yml`. Do do that, please read through the article [Creating and Tweaking `.gitlab-ci.yml` for GitLab Pages](pages_creating_and_tweaking_gitlab-ci_.html). New SSGs are very welcome among the [example projects](https://gitlab.com/pages). If you set up a new one, please [contribute](https://gitlab.com/pages/pages.gitlab.io/blob/master/CONTRIBUTING.md) to our examples.
>
> - The second step _"Clone it to your local computer"_, can be done differently, achieving the same results: instead of cloning the bare repository to you local computer and moving your site files into it, you can run `git init` in your local website directory, add the remote URL: `git remote add origin git@gitlab.com:namespace/project-name.git`, then add, commit, and push.
diff --git a/doc/pages/pages_static_sites_domains_dns_records_ssl_tls_certificates.md b/doc/pages/pages_static_sites_domains_dns_records_ssl_tls_certificates.md
index c6e2cab0bc3..2564d87ac3a 100644
--- a/doc/pages/pages_static_sites_domains_dns_records_ssl_tls_certificates.md
+++ b/doc/pages/pages_static_sites_domains_dns_records_ssl_tls_certificates.md
@@ -86,7 +86,7 @@ In case you want to point a root domain (`example.com`) to your GitLab Pages sit
**Practical Example:**
-![DNS A record pointing to GitLab.com Pages server](images/dns_a_record_example.png)
+![DNS A record pointing to GitLab.com Pages server](img/dns_a_record_example.png)
#### DNS CNAME record
@@ -96,7 +96,7 @@ Notice that, despite it's a user or project website, the `CNAME` should point to
**Practical Example:**
-![DNS CNAME record pointing to GitLab.com project](images/dns_cname_record_example.png)
+![DNS CNAME record pointing to GitLab.com project](img/dns_cname_record_example.png)
#### TL;DR
@@ -138,7 +138,7 @@ Regardless the CA you choose, the steps to add your certificate to your Pages pr
1. An intermediary certificate
1. A public key
-![Pages project - adding certificates](images/add_certificate_to_pages.png)
+![Pages project - adding certificates](img/add_certificate_to_pages.png)
These fields are found under your **Project**'s **Settings** > **Pages** > **New Domain**.