Merge branch 'master' into 4.x

elastic · Apr 22, 2016 · 9f54de7 · 9f54de7
2 parents 5a6e5bb + 8b966ee
commit 9f54de7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '4.0.0a2'
+__version__ = '4.0.0a3'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,7 +3,7 @@
 Changelog
 =========
 
-4.0.0a1 (21 Apr 2016)
+4.0.0a3 (21 Apr 2016)
 ---------------------
 
 It's time for Curator 4.0 alpha 1!

diff --git a/docs/asciidoc/configuration.asciidoc b/docs/asciidoc/configuration.asciidoc
@@ -406,7 +406,7 @@ The default value is `False`.
 [[loglevel]]
 === loglevel
 
-This should be `CRIT`, `WARN`, `INFO`, `DEBUG`, or left empty.
+This should be `CRITICAL`, `ERROR`, `WARNING`, `INFO`, `DEBUG`, or left empty.
 
 [source,sh]
 -----------
@@ -415,9 +415,10 @@ loglevel:
 
 Set the minimum acceptable log severity to display.
 
-* `CRIT` will only display critical messages.
-* `WARN` will display warning and critical messages.
-* `INFO` will display informational, warning, and critical messages.
+* `CRITICAL` will only display critical messages.
+* `ERROR` will only display error and critical messages.
+* `WARN` will display error, warning, and critical messages.
+* `INFO` will display informational, error, warning, and critical messages.
 * `DEBUG` will display debug messages, in addition to all of the above.
 
 The default value is `INFO`.