merge tox-1.8 maintenance

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/conf.py b/doc/conf.py
index 92ed895..3096b10 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2013, holger krekel and others'
 #
 # The short X.Y version.
 release = "1.8"
-version = "1.8.0"
+version = "1.8.1"
 # 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 2fba5f7..6ffd02b 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -259,6 +259,10 @@ Substitutions
 Any ``key=value`` setting in an ini-file can make use
 of value substitution through the ``{...}`` string-substitution pattern.
 
+You can escape curly braces with the ``\`` character if you need them, for example::
+
+    commands = echo "\{posargs\}" = {posargs}
+
 Globally available substitutions
 ++++++++++++++++++++++++++++++++