Commit 119c575e authored by Amy Qualls's avatar Amy Qualls

Merge branch '262057-edit-markdown-md-to-minimize-the-number-of-notes' into 'master'

Resolve "Edit markdown.md to minimize the number of notes"

See merge request gitlab-org/gitlab!49234
parents b7d48b86 20b13c95
...@@ -477,7 +477,7 @@ In addition to this, links to some objects are also recognized and formatted. So ...@@ -477,7 +477,7 @@ In addition to this, links to some objects are also recognized and formatted. So
### Task lists ### Task lists
> If this is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#task-lists). If this section is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#task-lists).
You can add task lists anywhere Markdown is supported, but you can only "click" You can add task lists anywhere Markdown is supported, but you can only "click"
to toggle the boxes if they are in issues, merge requests, or comments. In other to toggle the boxes if they are in issues, merge requests, or comments. In other
...@@ -780,6 +780,7 @@ But let's throw in a <b>tag</b>. ...@@ -780,6 +780,7 @@ But let's throw in a <b>tag</b>.
There are multiple ways to emphasize text in Markdown. You can italicize, bold, strikethrough, There are multiple ways to emphasize text in Markdown. You can italicize, bold, strikethrough,
as well as combine these emphasis styles together. as well as combine these emphasis styles together.
Strikethrough is not part of the core Markdown standard, but is part of GFM.
Examples: Examples:
...@@ -801,9 +802,6 @@ Combined emphasis with **asterisks and _underscores_**. ...@@ -801,9 +802,6 @@ Combined emphasis with **asterisks and _underscores_**.
Strikethrough uses two tildes. ~~Scratch this.~~ Strikethrough uses two tildes. ~~Scratch this.~~
NOTE: **Note:**
Strikethrough is not part of the core Markdown standard, but is part of GFM.
#### Multiple underscores in words and mid-word emphasis #### Multiple underscores in words and mid-word emphasis
If this section is not rendered correctly, [view it in GitLab](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#multiple-underscores-in-words). If this section is not rendered correctly, [view it in GitLab](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#multiple-underscores-in-words).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment