summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-03 06:04:12 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-03 06:04:12 +0000
commite63729d9e70a661fb3fb8cb558716f6a44a52798 (patch)
tree915dcfb016db1eb3dc87d0f06462b8602b6bc74c
parent195b20e1b9ff08437c5a436dc14f04e7f1bee807 (diff)
parent1a9431b914b7d138a37557b5d4a81ecd2423692c (diff)
downloadgitlab-ce-e63729d9e70a661fb3fb8cb558716f6a44a52798.tar.gz
Merge branch 'doc-markdown-move' into 'master'
Move markdown doc to the right location See merge request !5635
-rw-r--r--doc/README.md2
-rw-r--r--doc/markdown/markdown.md1
-rw-r--r--doc/user/img/markdown_logo.png (renamed from doc/user/project/img/markdown_logo.png)bin9509 -> 9509 bytes
-rw-r--r--doc/user/img/markdown_video.mp4 (renamed from doc/user/project/img/markdown_video.mp4)bin383631 -> 383631 bytes
-rw-r--r--doc/user/markdown.md (renamed from doc/user/project/markdown.md)0
5 files changed, 2 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md
index 751e685b19b..d28ad499d3a 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -9,7 +9,7 @@
- [GitLab Basics](gitlab-basics/README.md) Find step by step how to start working on your commandline and on GitLab.
- [Importing to GitLab](workflow/importing/README.md).
- [Importing and exporting projects between instances](user/project/settings/import_export.md).
-- [Markdown](user/project/markdown.md) GitLab's advanced formatting system.
+- [Markdown](user/markdown.md) GitLab's advanced formatting system.
- [Migrating from SVN](workflow/importing/migrating_from_svn.md) Convert a SVN repository to Git and GitLab.
- [Permissions](user/permissions.md) Learn what each role in a project (external/guest/reporter/developer/master/owner) can do.
- [Profile Settings](profile/README.md)
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
new file mode 100644
index 00000000000..4ac81ab3ee7
--- /dev/null
+++ b/doc/markdown/markdown.md
@@ -0,0 +1 @@
+This document was moved to [user/markdown.md](../user/markdown.md).
diff --git a/doc/user/project/img/markdown_logo.png b/doc/user/img/markdown_logo.png
index 05c8b0d0ccf..05c8b0d0ccf 100644
--- a/doc/user/project/img/markdown_logo.png
+++ b/doc/user/img/markdown_logo.png
Binary files differ
diff --git a/doc/user/project/img/markdown_video.mp4 b/doc/user/img/markdown_video.mp4
index 1fc478842f5..1fc478842f5 100644
--- a/doc/user/project/img/markdown_video.mp4
+++ b/doc/user/img/markdown_video.mp4
Binary files differ
diff --git a/doc/user/project/markdown.md b/doc/user/markdown.md
index 7fe96e67dbb..7fe96e67dbb 100644
--- a/doc/user/project/markdown.md
+++ b/doc/user/markdown.md