From 4045422a6740798b067b200f2e8f96f0e1483b14 Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Sun, 17 Apr 2016 14:47:50 -0700
Subject: [PATCH] Prepare v1.12.0 for release

---
 Changes.md            |  9 +++++++++
 README.md             | 20 +++++++++++++++++++-
 package.json          |  2 +-
 src/rivescript.coffee |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Changes.md b/Changes.md
index 0a22bb8..1a1b4d0 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,5 +1,14 @@
 # Changes
 
+* 1.12.0 2016-04-17
+  - Fix the `stringify()` function to also escape newlines on conditionals.
+  - Various fixes to "pipe syntax" for arrays, optionals and alternations;
+    having a "blank" entry separated by pipes (e.g. a trailing or leading pipe)
+    would cause matching issues. These have been fixed and a syntax error is
+    given if this is detected at parsing time.
+  - Added additional documentation for the usage of `deparse()` and related
+    functions to the `eg/deparse` directory.
+
 * 1.10.0 2016-03-30
   - Fix a bug where `! local concat` settings wouldn't apply to the first
     continuation of a conditional (bug #88)
diff --git a/README.md b/README.md
index 01b8088..4855013 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ Grunt options:
   for local testing and demoing.
 * `grunt test` - Run unit tests.
 
-## GRUNT CONNECT
+## GRUNT SERVER
 
 This project uses [Grunt](http://gruntjs.com) for compiling to minified JS and
 also includes a simple web server for local testing and demoing for RiveScript.
@@ -189,6 +189,24 @@ $ npm install              # Install dev dependencies
 $ grunt server             # Will start a local web server and open eg/chat.html
 ```
 
+## PUBLISHING
+
+Steps for the npm maintainer of this module:
+
+1. Increment the version number in `package.json` and `src/rivescript.coffee`
+2. Add a change log notice to `Changes.md`
+3. Run `grunt dist` to build the JavaScript sources and `grunt test` to verify
+   all tests pass.
+3. Test a local installation from a different directory
+   (`npm install ../rivescript-js`)
+4. `npm login` if it's the first time on a new system, and `npm publish` to
+   publish the module to NPM.
+5. Create compiled zip and tarballs for GitHub releases:
+  * Copy git repo to a new folder.
+  * `rm -rf .git node_modules` to remove cruft from the new folder.
+  * `zip -r rivescript-js-VERSION.zip rivescript-js`
+  * `tar -czvf rivescript-js-VERSION.tar.gz rivescript-js`
+
 ## LICENSE
 
 ```
diff --git a/package.json b/package.json
index 951a01d..f7d657c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rivescript",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "RiveScript is a scripting language for chatterbots, making it easy to write trigger/response pairs for building up a bot's intelligence.",
   "keywords": [
     "bot",
diff --git a/src/rivescript.coffee b/src/rivescript.coffee
index 38cb8dd..864c6b5 100644
--- a/src/rivescript.coffee
+++ b/src/rivescript.coffee
@@ -7,7 +7,7 @@
 "use strict"
 
 # Constants
-VERSION  = "1.10.0"
+VERSION  = "1.12.0"
 
 # Helper modules
 Parser  = require "./parser"