summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 16:15:11 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 16:15:11 +0000
commit5afa1c6e6aad2c5adaefecd1d81d9da8c7317191 (patch)
treec181d7617db8d9788e9b73a44ff8e41d970e76fa
parent125793f15a4d6ff1c5e853412032fd07c5069842 (diff)
parentdd46f56b8e6fbe95f46fa73c3c622c0fc5384781 (diff)
downloadgitlab-ce-5afa1c6e6aad2c5adaefecd1d81d9da8c7317191.tar.gz
Merge branch 'doc-api-fix' into 'master'
Minor fixes in API doc See merge request gitlab-org/gitlab-ce!17602
-rw-r--r--doc/api/README.md2
-rw-r--r--doc/api/discussions.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/README.md b/doc/api/README.md
index f40fd587c0a..ae4481b400e 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -37,7 +37,7 @@ following locations:
- [Group milestones](group_milestones.md)
- [Namespaces](namespaces.md)
- [Notes](notes.md) (comments)
-- [Threaded comments](discussions.md)
+- [Discussions](discussions.md) (threaded comments)
- [Notification settings](notification_settings.md)
- [Open source license templates](templates/licenses.md)
- [Pages Domains](pages_domains.md)
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 07837d7d4c3..c341b7f2009 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -1,6 +1,6 @@
# Discussions API
-Discussions are set of related notes on snippets, issues or epics.
+Discussions are set of related notes on snippets or issues.
## Issues