diff --git a/docs/reference/analysis/analyzers.asciidoc b/docs/reference/analysis/analyzers.asciidoc
index b97231b0ab3..22881a68904 100644
--- a/docs/reference/analysis/analyzers.asciidoc
+++ b/docs/reference/analysis/analyzers.asciidoc
@@ -49,6 +49,14 @@ index :
         stopwords : [test1, test2, test3]
 --------------------------------------------------
 
+[[analyzers-stopwords]]
+=== Stopwords
+
+The `stopwords` parameter can be used to provide a custom set of stopwords. As
+certain analyzers use a default list of stopwords while others don't, please
+check out the individual analyzer sections. In case you want the analyzer to
+use no stopwords at all, simply provide `stopwords: _none_`
+
 Below is a list of the built in analyzers.
 
 include::analyzers/standard-analyzer.asciidoc[]
diff --git a/docs/reference/analysis/analyzers/standard-analyzer.asciidoc b/docs/reference/analysis/analyzers/standard-analyzer.asciidoc
index 14027ffde0b..0b6faed7712 100644
--- a/docs/reference/analysis/analyzers/standard-analyzer.asciidoc
+++ b/docs/reference/analysis/analyzers/standard-analyzer.asciidoc
@@ -17,7 +17,7 @@ type:
 [cols="<,<",options="header",]
 |=======================================================================
 |Setting |Description
-|`stopwords` |A list of stopword to initialize the stop filter with.
+|`stopwords` |A list of stopwords to initialize the stop filter with.
 Defaults to an 'empty' stopword list added[1.0.0.Beta1, Previously 
 defaulted to the English stopwords list]
 |`max_token_length` |The maximum token length. If a token is seen that
diff --git a/docs/reference/analysis/analyzers/stop-analyzer.asciidoc b/docs/reference/analysis/analyzers/stop-analyzer.asciidoc
index 18599af0f90..2a1bfd73113 100644
--- a/docs/reference/analysis/analyzers/stop-analyzer.asciidoc
+++ b/docs/reference/analysis/analyzers/stop-analyzer.asciidoc
@@ -12,7 +12,7 @@ The following are settings that can be set for a `stop` analyzer type:
 [cols="<,<",options="header",]
 |=======================================================================
 |Setting |Description
-|`stopwords` |A list of stopword to initialize the stop filter with.
+|`stopwords` |A list of stopwords to initialize the stop filter with.
 Defaults to the english stop words.
 
 |`stopwords_path` |A path (either relative to `config` location, or