summaryrefslogtreecommitdiff
path: root/doc/user/markdown.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 03:07:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 03:07:56 +0000
commitafa0ab923d697a3e737b04d078d3f28e0d573901 (patch)
treefa06ad775e52d99f1bd0fa2107452a2853fce015 /doc/user/markdown.md
parente8793358645d6c84b46ef56dafcbf834f20d6415 (diff)
downloadgitlab-ce-afa0ab923d697a3e737b04d078d3f28e0d573901.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/markdown.md')
-rw-r--r--doc/user/markdown.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 82d37c54fd4..2d7b9e17a40 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -275,7 +275,7 @@ In GitLab, front matter is only used in Markdown files and wiki pages, not the o
places where Markdown formatting is supported. It must be at the very top of the document,
and must be between delimiters, as explained below.
-The following delimeters are supported:
+The following delimiters are supported:
- YAML (`---`):
@@ -601,7 +601,7 @@ Inline `code` has `back-ticks around` it.
---
Similarly, a whole block of code can be fenced with triple backticks ```` ``` ````,
-triple tildes (`~~~`), or indended 4 or more spaces to achieve a similar effect for
+triple tildes (`~~~`), or indented 4 or more spaces to achieve a similar effect for
a larger body of code.
~~~