summaryrefslogtreecommitdiff
path: root/doc/administration/troubleshooting/elasticsearch.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 18:06:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 18:06:27 +0000
commitd2801eda8464e5e9ce730caf30111c1190fe87a0 (patch)
tree9b2814ff0c6a61ac192b86afaa35fa2d1985277b /doc/administration/troubleshooting/elasticsearch.md
parent88542a5e9613c8442a982e65ad5cf13eb33bc541 (diff)
downloadgitlab-ce-d2801eda8464e5e9ce730caf30111c1190fe87a0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/troubleshooting/elasticsearch.md')
-rw-r--r--doc/administration/troubleshooting/elasticsearch.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/troubleshooting/elasticsearch.md b/doc/administration/troubleshooting/elasticsearch.md
index 37ec32413f8..5846514c574 100644
--- a/doc/administration/troubleshooting/elasticsearch.md
+++ b/doc/administration/troubleshooting/elasticsearch.md
@@ -171,7 +171,7 @@ To do this:
pp s.search_objects.class.name
```
-The ouput from the last command is the key here. If it shows:
+The output from the last command is the key here. If it shows:
- `ActiveRecord::Relation`, **it is not** using Elasticsearch.
- `Kaminari::PaginatableArray`, **it is** using Elasticsearch.
@@ -326,7 +326,7 @@ feel free to update that page with issues you encounter and solutions.
Setting up Elasticsearch isn't too bad, but it can be a bit finnicky and time consuming.
-The eastiest method is to spin up a docker container with the required version and
+The easiest method is to spin up a docker container with the required version and
bind ports 9200/9300 so it can be used.
The following is an example of running a docker container of Elasticsearch v7.2.0: