Merge branch 'doc-markdown-move' into 'master'

Move markdown doc to the right location See merge request !5635

Merge branch 'doc-markdown-move' into 'master'
e63729d9 · Achilleas Pipinellis · 195b20e1 · 1a9431b9 · e63729d9 · e63729d9
Commit e63729d9 authored Aug 03, 2016 by Achilleas Pipinellis
5 changed files
--- 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)

--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
+This document was moved to [user/markdown.md](../user/markdown.md).
--- a/doc/user/project/img/markdown_logo.png
+++ b/doc/user/project/img/markdown_logo.png
--- a/doc/user/project/img/markdown_video.mp4
+++ b/doc/user/project/img/markdown_video.mp4
--- a/doc/user/project/markdown.md
+++ b/doc/user/project/markdown.md