add some changelogs for the merged PRs

2 files changed, 12 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3e73166..d998145 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,14 @@
 
 - fix issue190: allow setenv to be empty.
 
+- allow escaping curly braces with "\".  Thanks Marc Abramowitz for the PR.
+
+- allow "." names in environment names such that "py27-django1.7" is a
+  valid environment name.  Thanks Alex Gaynor and Alex Schepanovski.
+
+- report subprocess exit code when execution fails.  Thanks Marius
+  Gedminas.
+
 
 1.8.0
 -----------
diff --git a/doc/config.txt b/doc/config.txt
index 8ce64db..91587f2 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -244,6 +244,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
 ++++++++++++++++++++++++++++++++