diff options
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/user/project/img/markdown_logo.png (renamed from doc/markdown/img/logo.png) | bin | 9509 -> 9509 bytes | |||
| -rw-r--r-- | doc/user/project/img/markdown_video.mp4 (renamed from doc/markdown/img/video.mp4) | bin | 383631 -> 383631 bytes | |||
| -rw-r--r-- | doc/user/project/markdown.md (renamed from doc/markdown/markdown.md) | 12 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 6360371804a..643f7c589e6 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/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' diff --git a/doc/README.md b/doc/README.md index b5b377822e6..751e685b19b 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](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) diff --git a/doc/markdown/img/logo.png b/doc/user/project/img/markdown_logo.png Binary files differindex 05c8b0d0ccf..05c8b0d0ccf 100644 --- a/doc/markdown/img/logo.png +++ b/doc/user/project/img/markdown_logo.png diff --git a/doc/markdown/img/video.mp4 b/doc/user/project/img/markdown_video.mp4 Binary files differindex 1fc478842f5..1fc478842f5 100644 --- a/doc/markdown/img/video.mp4 +++ b/doc/user/project/img/markdown_video.mp4 diff --git a/doc/markdown/markdown.md b/doc/user/project/markdown.md index d7f09ec070c..7fe96e67dbb 100644 --- a/doc/markdown/markdown.md +++ b/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: -  +  Here's a sample video: - + # 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: -  +  Reference-style: ![alt text1][logo] - [logo]: img/logo.png + [logo]: img/markdown_logo.png Here's our logo: Inline-style: - + Reference-style: ![alt text][logo] -[logo]: img/logo.png +[logo]: img/markdown_logo.png ## Blockquotes |
