diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-08 08:20:46 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-08 08:20:46 +0000 |
| commit | bc944d590babf48833a44b2ac84b8ac086a9b179 (patch) | |
| tree | e5040eab38bcc28c261a071c75775fc1c34b2bd0 | |
| parent | 15e519451e843b6d55a2c35bbefe039003b15c25 (diff) | |
| parent | 0b3289b9be75e0398f11b132ddf6a4a1b8e6ab59 (diff) | |
| download | gitlab-ce-bc944d590babf48833a44b2ac84b8ac086a9b179.tar.gz | |
Merge branch 'docs/fix-various-404s' into 'master'
Fix Markdown so renderer parses links correctly, fixing 404s
See merge request gitlab-org/gitlab-ce!22895
| -rw-r--r-- | doc/administration/auth/okta.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/additional_resources.md | 12 | ||||
| -rw-r--r-- | doc/university/training/topics/tags.md | 2 | ||||
| -rw-r--r-- | doc/university/training/user_training.md | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/administration/auth/okta.md b/doc/administration/auth/okta.md index 664657650d4..ae38094391b 100644 --- a/doc/administration/auth/okta.md +++ b/doc/administration/auth/okta.md @@ -11,7 +11,7 @@ The following documentation enables Okta as a SAML provider. 1. When the app screen comes up you see another button to **Create an App** and choose SAML 2.0 on the next screen. 1. Now, very important, add a logo - (you can choose it from https://about.gitlab.com/press/). You'll have to + (you can choose it from <https://about.gitlab.com/press/>). You'll have to crop and resize it. 1. Next, you'll need the to fill in the SAML general config. Here's an example image. diff --git a/doc/university/training/topics/additional_resources.md b/doc/university/training/topics/additional_resources.md index d01634df744..4871372d105 100644 --- a/doc/university/training/topics/additional_resources.md +++ b/doc/university/training/topics/additional_resources.md @@ -4,9 +4,9 @@ comments: false # Additional Resources -1. GitLab Documentation [http://docs.gitlab.com](http://docs.gitlab.com/) -2. GUI Clients [http://git-scm.com/downloads/guis](http://git-scm.com/downloads/guis) -3. Pro git book [http://git-scm.com/book](http://git-scm.com/book) -4. Platzi Course [https://courses.platzi.com/courses/git-gitlab/](https://courses.platzi.com/courses/git-gitlab/) -5. Code School tutorial [http://try.github.io/](http://try.github.io/) -6. Contact Us at `subscribers@gitlab.com` +1. GitLab Documentation: <http://docs.gitlab.com>. +1. GUI Clients: <http://git-scm.com/downloads/guis>. +1. Pro Git book: <http://git-scm.com/book>. +1. Platzi Course: <https://courses.platzi.com/courses/git-gitlab/>. +1. Code School tutorial: <http://try.github.io/>. +1. Contact us at `subscribers@gitlab.com`. diff --git a/doc/university/training/topics/tags.md b/doc/university/training/topics/tags.md index 6333ceedbd7..9526bcbfb82 100644 --- a/doc/university/training/topics/tags.md +++ b/doc/university/training/topics/tags.md @@ -22,7 +22,7 @@ comments: false **Additional resources** -[http://git-scm.com/book/en/Git-Basics-Tagging](http://git-scm.com/book/en/Git-Basics-Tagging) +<http://git-scm.com/book/en/Git-Basics-Tagging> ---------- diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index f3a4d766522..ca3f777f403 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -385,7 +385,7 @@ Thank you for your hard work! - GitLab Documentation: <http://docs.gitlab.com/>. - GUI Clients: <http://git-scm.com/downloads/guis>. -- Pro git book: <http://git-scm.com/book>. +- Pro Git book: <http://git-scm.com/book>. - Platzi Course: <https://courses.platzi.com/courses/git-gitlab/>. - Code School tutorial: <http://try.github.io/>. - Contact us at `subscribers@gitlab.com`. |