summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-02-22 13:06:44 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-02-22 13:06:44 -0300
commit3dcc2ca593ecc989265f3ed9487220836e91619e (patch)
treea19bc58e562df0b6ced2b4aeedda63f8152eba0a /doc
parente5e7fb55ed325bedd8aab4fb2c07d514bc920f95 (diff)
downloadgitlab-ce-3dcc2ca593ecc989265f3ed9487220836e91619e.tar.gz
fix spelling, add intermediate cert link
Diffstat (limited to 'doc')
-rw-r--r--doc/pages/getting_started_part_one.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/pages/getting_started_part_one.md b/doc/pages/getting_started_part_one.md
index 8ae4779108c..c3bee1f164c 100644
--- a/doc/pages/getting_started_part_one.md
+++ b/doc/pages/getting_started_part_one.md
@@ -135,7 +135,7 @@ Regardless the CA you choose, the steps to add your certificate to your Pages pr
#### What do you need
1. A PEM certificate
-1. An intermediary certificate
+1. An intermediate certificate
1. A public key
![Pages project - adding certificates](img/add_certificate_to_pages.png)
@@ -145,7 +145,7 @@ These fields are found under your **Project**'s **Settings** > **Pages** > **New
#### What's what?
- A PEM certificate is the certificate generated by the CA, which needs to be added to the field **Certificate (PEM)**.
-- An [intermediary certificate][] \(aka "root certificate"\) is the part of the encryption keychain that identifies the CA. Usually it's combined with the PEM certificate, but there are some cases in which you need to add them manually. [CloudFlare certs](https://about.gitlab.com/2017/02/07/setting-up-gitlab-pages-with-cloudflare-certificates/) are one of these cases.
+- An [intermediate certificate](https://en.wikipedia.org/wiki/Intermediate_certificate_authority) \(aka "root certificate"\) is the part of the encryption keychain that identifies the CA. Usually it's combined with the PEM certificate, but there are some cases in which you need to add them manually. [CloudFlare certs](https://about.gitlab.com/2017/02/07/setting-up-gitlab-pages-with-cloudflare-certificates/) are one of these cases.
- A public key is an encrypted key which validates your PEM against your domain.
#### Now what?
@@ -153,7 +153,7 @@ These fields are found under your **Project**'s **Settings** > **Pages** > **New
Now that you hopefully understand why you need all of this, it's simple:
- Your PEM certificate needs to be added to the first field
-- If your certificate is missing its intermediary, copy and paste the root certificate (usually available from your CA website) and paste it in the [same field as your PEM certificate](https://about.gitlab.com/2017/02/07/setting-up-gitlab-pages-with-cloudflare-certificates/), just jumping a line between them.
+- If your certificate is missing its intermediate, copy and paste the root certificate (usually available from your CA website) and paste it in the [same field as your PEM certificate](https://about.gitlab.com/2017/02/07/setting-up-gitlab-pages-with-cloudflare-certificates/), just jumping a line between them.
- Copy your public key and paste it in the last field
> Note: **do not** open certificates or encryption keys in regular text editors. Always use code editors (such as Sublime Text, Atom, Dreamweaver, Brackets, etc).