doc ignore_outcome and bump doc version2.2.0

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/conf.py b/doc/conf.py
index 630cb804..79857d76 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,8 +48,8 @@ copyright = u'2015, holger krekel and others'
 # built documents.
 #
 # The short X.Y version.
-release = "2.1"
-version = "2.1.0"
+release = "2.2"
+version = "2.2.0"
 # The full version, including alpha/beta/rc tags.
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/config.txt b/doc/config.txt
index ed9290cd..8bfa57d4 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -302,6 +302,15 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
     **default**: ``False``
 
+.. confval:: ignore_outcome=BOOL
+
+    .. versionadded:: 2.2
+
+    If set to True a failing result of this testenv will not make tox fail,
+    only a warning will be produced.
+
+    **default**: ``False``
+
 
 Substitutions
 -------------