summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-19 17:32:04 +0000
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-19 17:32:04 +0000
commitdea36800066877e6d5aab036aa4417e68b37dca5 (patch)
tree34924f37673821e4c26c71098b3c6ab2af54f22d
parentf780bac0ccab5a6e47964d641bdf28cd361a4b1f (diff)
parent03e5873ae52f3c8c0efb7baa7d1a358a7c3e7974 (diff)
downloadgitlab-ce-dea36800066877e6d5aab036aa4417e68b37dca5.tar.gz
Merge branch 'doc-broken-links' into 'master'
Fix broken documentation links Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15249 - [x] `/help/ui`- This is working for me - [x] `/help/ci/examples/deployment/README.md` - Fixed - [x] `/help/ci/api/projects.md` - Fixed - [x] `/help/markdown/LICENSE` - Cannot do much to fix it, added a note. - [x] `/help/ci/ssh/README.md` - Cannot find this link referenced anywhere. See merge request !3903
-rw-r--r--doc/ci/examples/deployment/README.md (renamed from doc/ci/deployment/README.md)0
-rw-r--r--doc/ci/triggers/README.md2
-rw-r--r--doc/markdown/markdown.md3
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/ci/deployment/README.md b/doc/ci/examples/deployment/README.md
index 7d91ce6710f..7d91ce6710f 100644
--- a/doc/ci/deployment/README.md
+++ b/doc/ci/examples/deployment/README.md
diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md
index 79ed512aabb..5c316510d0e 100644
--- a/doc/ci/triggers/README.md
+++ b/doc/ci/triggers/README.md
@@ -33,7 +33,7 @@ POST /projects/:id/trigger/builds
The required parameters are the trigger's `token` and the Git `ref` on which
the trigger will be performed. Valid refs are the branch, the tag or the commit
-SHA. The `:id` of a project can be found by [querying the API](../api/projects.md)
+SHA. The `:id` of a project can be found by [querying the API](../../api/projects.md)
or by visiting the **Triggers** page which provides self-explanatory examples.
When a rebuild is triggered, the information is exposed in GitLab's UI under
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 4f199b6af6f..3f44a1b4c6c 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -402,7 +402,7 @@ There are two ways to create links, inline-style and reference-style.
[I'm a reference-style link][Arbitrary case-insensitive reference text]
-[I'm a relative reference to a repository file](LICENSE)
+[I'm a relative reference to a repository file](LICENSE)[^1]
[You can use numbers for reference-style link definitions][1]
@@ -594,3 +594,4 @@ By including colons in the header row, you can align the text within that column
[rouge]: http://rouge.jneen.net/ "Rouge website"
[redcarpet]: https://github.com/vmg/redcarpet "Redcarpet website"
+[^1]: This link will be broken if you see this document from the Help page or docs.gitlab.com