Merge branch 'master' into 4.x

elastic · Apr 25, 2016 · cca0e52 · cca0e52
2 parents 6f08be2 + 45fca77
commit cca0e52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '4.0.0a4'
+__version__ = '4.0.0a6'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,7 +3,7 @@
 Changelog
 =========
 
-4.0.0a5 (25 Apr 2016)
+4.0.0a6 (25 Apr 2016)
 ---------------------
 
 **General**

diff --git a/docs/asciidoc/actions.asciidoc b/docs/asciidoc/actions.asciidoc
@@ -172,7 +172,7 @@ Required settings
 [float]
 Optional settings
 ~~~~~~~~~~~~~~~~~
-* <<body,body>> No default value.  Can create any acceptable index settings and
+* <<option_body,body>> No default value.  Can create any acceptable index settings and
     mappings as nested YAML.  See
     https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html
     for more information.