summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-12-04 12:30:51 +0000
committerRémy Coutable <remy@rymai.me>2017-12-04 12:30:51 +0000
commitffc45b49acc4b4c7cdc97b91f131bbc154442e5b (patch)
tree8abbd164ee2d9b7773466e5e96b53f721304025a /doc
parent50eb125282ba83e71447161ee2add396fa5eef9b (diff)
parent0f99e9a50b3faf1da47d37a0642d22e636498a80 (diff)
downloadgitlab-ce-ffc45b49acc4b4c7cdc97b91f131bbc154442e5b.tar.gz
Merge branch '40770-doc-elasticsearch' into 'master'
Fix typo in Elasticsearch Closes #40770 See merge request gitlab-org/gitlab-ce!15699
Diffstat (limited to 'doc')
-rw-r--r--doc/development/changelog.md2
-rw-r--r--doc/university/glossary/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index f869938fe11..48cffc0dd18 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -80,7 +80,7 @@ changes.
The first example focuses on _how_ we fixed something, not on _what_ it fixes.
The rewritten version clearly describes the _end benefit_ to the user (fewer 500
-errors), and _when_ (searching commits with ElasticSearch).
+errors), and _when_ (searching commits with Elasticsearch).
Use your best judgement and try to put yourself in the mindset of someone
reading the compiled changelog. Does this entry add value? Does it offer context
diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md
index 076fbf6f710..fbe7353c6ca 100644
--- a/doc/university/glossary/README.md
+++ b/doc/university/glossary/README.md
@@ -175,7 +175,7 @@ A [feature](https://docs.gitlab.com/ce/user/project/container_registry.html) of
### EC2 Instance
-### ElasticSearch
+### Elasticsearch
Elasticsearch is a flexible, scalable and powerful search service. When [enabled](https://gitlab.com/help/integration/elasticsearch.md), it helps keep GitLab's search fast when dealing with a huge amount of data.