Change Markdown document location

app/views/projects/wikis/_form.html.haml

@@ -24,7 +24,7 @@
 
         = succeed '.' do
           More examples are in the
-          = link_to 'documentation', help_page_path(category: 'markdown', file: 'wiki', format: 'md')
+          = link_to 'documentation', help_page_path("user/project/markdown", anchor: "wiki-specific-markdown")
 
   .form-group
     = f.label :commit_message, class: 'control-label'

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](markdown/markdown.md) GitLab's advanced formatting system.
+- [Markdown](user/project/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)

doc/markdown/markdown.md → doc/user/project/markdown.md

@@ -338,11 +338,11 @@ The valid video extensions are `.mp4`, `.m4v`, `.mov`, `.webm`, and `.ogv`.
 
     Here's a sample video:
 
-    ![Sample Video](img/video.mp4)
+    ![Sample Video](img/markdown_video.mp4)
 
 Here's a sample video:
 
-![Sample Video](img/video.mp4)
+![Sample Video](img/markdown_video.mp4)
 
 # Standard Markdown
 
@@ -540,24 +540,24 @@ will point the link to `wikis/style` when the link is inside of a wiki markdown
     Here's our logo (hover to see the title text):
 
     Inline-style:
-    ![alt text](img/logo.png)
+    ![alt text](img/markdown_logo.png)
 
     Reference-style:
     ![alt text1][logo]
 
-    [logo]: img/logo.png
+    [logo]: img/markdown_logo.png
 
 Here's our logo:
 
 Inline-style:
 
-![alt text](img/logo.png)
+![alt text](img/markdown_logo.png)
 
 Reference-style:
 
 ![alt text][logo]
 
-[logo]: img/logo.png
+[logo]: img/markdown_logo.png
 
 ## Blockquotes