Merge branch 'doc-slash-commands-loc' into 'master'

Doc slash commands loc



See merge request !678

app/views/projects/notes/_hints.html.haml

@@ -5,7 +5,7 @@
     = link_to 'Markdown', help_page_path('markdown/markdown'), target: '_blank', tabindex: -1
     - if supports_slash_commands
       and
-      = link_to 'slash commands', help_page_path('workflow/slash_commands'), target: '_blank', tabindex: -1
+      = link_to 'slash commands', help_page_path('user/project/slash_commands'), target: '_blank', tabindex: -1
       are
     - else
       is

doc/workflow/slash_commands.md → doc/user/project/slash_commands.md

@@ -26,5 +26,5 @@ do.
 | `/done`                    | Mark todo as done |
 | `/subscribe`               | Subscribe |
 | `/unsubscribe`             | Unsubscribe |
-| `/due <in 2 days | this Friday | December 31st>` | Set due date |
+| `/due <in 2 days or this Friday or December 31st>` | Set due date |
 | `/remove_due_date`          | Remove due date |

doc/workflow/README.md

@@ -8,7 +8,6 @@
 - [Groups](groups.md)
 - [Importing to GitLab](doc/importing/README.md)
 - [Keyboard shortcuts](shortcuts.md)
-- [Slash commands](slash_commands.md)
 - [File finder](file_finder.md)
 - [File lock](../user/project/file_lock.md)
 - [Labels](../user/project/labels.md)
@@ -22,6 +21,7 @@
 - [Fast-forward merge](ff_merge.md)
 - [Rebase before merge](rebase_before_merge.md)
 - [Protected branches](../user/project/protected_branches.md)
+- [Slash commands](../user/project/slash_commands.md)
 - [Sharing a project with a group](share_with_group.md)
 - [Share projects with other groups](share_projects_with_other_groups.md)
 - [Two-factor Authentication (2FA)](two_factor_authentication.md)