From c6f0f8f0d4ab44f5f770b248383c783aee306192 Mon Sep 17 00:00:00 2001 From: Allison Whilden Date: Tue, 20 Dec 2016 11:52:05 -0800 Subject: [PATCH] [ci skip] UX Guide: add comment and discussion to copy [ci skip] UX Guide: refine discussion definition --- doc/development/ux_guide/copy.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/development/ux_guide/copy.md b/doc/development/ux_guide/copy.md index 8896d450f14..e48897426cb 100644 --- a/doc/development/ux_guide/copy.md +++ b/doc/development/ux_guide/copy.md @@ -101,3 +101,11 @@ The form should be titled `Edit issue`. The submit button should be labeled `Sav | Approve | Approve an open merge request || | Remove approval, unapproved | Remove approval of an open merge request | Do not use `unapprove` as that is not an English word| | Merge | Merge an open merge request || + +### Comments & Discussions + +#### Comment +A **comment** is a written piece of text that users of GitLab can create. Comments have the meta data of author and time stamp. Comments can be added in a variety of contexts, such as issues, merge requests, and discussions. + +#### Dicussion +A **discussion** is a group of 1 or more comments. A discussion can include sub discussions. Some discussions have the special capability of being able to be **resolved**. Both the comments in the discussion and the discussion itself can be resolved. \ No newline at end of file