summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-25 10:23:12 +0000
committerRémy Coutable <remy@rymai.me>2017-04-25 10:23:12 +0000
commit9a905e1b9f9575bb8d637560cb3c59fd82079d2d (patch)
tree950b2825a2f23483c4bf762bbc9198a47d680eec /doc/user
parentcd0410828e5aa78c557ddfa1759f17aada0e7a35 (diff)
parent485b63d12efee9ebe73b12e2fc176a3867c456a8 (diff)
downloadgitlab-ce-9a905e1b9f9575bb8d637560cb3c59fd82079d2d.tar.gz
Merge branch 'master' into 'master'
Fix typo in discussions doc. See merge request !10889
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/discussions/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index c5123c06ce0..59e343ebe51 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -12,7 +12,7 @@ You can leave a comment in the following places:
The comment area supports [Markdown] and [slash commands]. One can edit their
own comment at any time, and anyone with [Master access level][permissions] or
-higher can also a comment made by someone else.
+higher can also edit a comment made by someone else.
Apart from the standard comments, you also have the option to create a comment
in the form of a resolvable or threaded discussion.