From 87958f0e78a2d59f612e07439015352135a40cb1 Mon Sep 17 00:00:00 2001
From: Paul Armstrong <paul@paularmstrongdesigns.com>
Date: Mon, 23 Sep 2013 09:51:52 -0700
Subject: [PATCH] version bump v1.0.0

---
 HISTORY.md          | 8 ++++++++
 README.md           | 1 +
 browser/comments.js | 2 +-
 docs/docs.json      | 2 +-
 docs/index.json     | 2 +-
 lib/swig.js         | 4 ++--
 package.json        | 2 +-
 tests/basic.test.js | 4 ++--
 8 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 04a88658..7edb4d1f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,11 @@
+[1.0.0](https://github.com/paularmstrong/swig/tree/v1.0.0) / 2013-09-23
+-------------------------------------------------------------------------------
+
+* **Fixed** Allow parent and other tags to work correctly nested in other tags. gh-331
+* **Fixed** Prevent lexer from matching partial logic/words in variables. gh-330
+
+Migrating from v0.x.x? View the [Migration Guide](https://github.com/paularmstrong/swig/wiki/Migrating-from-v0.x.x-to-v1.0.0)
+
 [1.0.0-rc3](https://github.com/paularmstrong/swig/tree/v1.0.0-rc3) / 2013-09-14
 -------------------------------------------------------------------------------
 
diff --git a/README.md b/README.md
index d2d21e91..be2719ef 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Need Help? Have Questions? Comments?
 
 * [Mailing List/Google Group](http://groups.google.com/forum/#!forum/swig-templates)
 * [StackOverflow](http://stackoverflow.com/questions/tagged/swig-template)
+* [Migration Guide](https://github.com/paularmstrong/swig/wiki/Migrating-from-v0.x.x-to-v1.0.0)
 
 Installation
 ------------
diff --git a/browser/comments.js b/browser/comments.js
index 38514aaa..130a205d 100644
--- a/browser/comments.js
+++ b/browser/comments.js
@@ -1,2 +1,2 @@
-/*! Swig v1.0.0-rc3 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
+/*! Swig v1.0.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
 /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */
diff --git a/docs/docs.json b/docs/docs.json
index c7adbeee..77dfc03d 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.0.0-rc3"
+  "version": "v1.0.0"
 }
diff --git a/docs/index.json b/docs/index.json
index c7adbeee..77dfc03d 100644
--- a/docs/index.json
+++ b/docs/index.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.0.0-rc3"
+  "version": "v1.0.0"
 }
diff --git a/lib/swig.js b/lib/swig.js
index e00ae258..0b1694af 100644
--- a/lib/swig.js
+++ b/lib/swig.js
@@ -9,11 +9,11 @@ var fs = require('fs'),
 /**
  * Swig version number as a string.
  * @example
- * if (swig.version === "1.0.0-rc3") { ... }
+ * if (swig.version === "1.0.0") { ... }
  *
  * @type {String}
  */
-exports.version = "1.0.0-rc3";
+exports.version = "1.0.0";
 
 /**
  * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional.
diff --git a/package.json b/package.json
index c1963b88..ac7bee8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swig",
-  "version": "1.0.0-rc3",
+  "version": "1.0.0",
   "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.",
   "keywords": [
     "template",
diff --git a/tests/basic.test.js b/tests/basic.test.js
index 7f40369b..1bf75121 100644
--- a/tests/basic.test.js
+++ b/tests/basic.test.js
@@ -13,8 +13,8 @@ function resetOptions() {
 }
 
 describe('version', function () {
-  it('is 1.0.0-rc3', function () {
-    expect(swig.version).to.equal('1.0.0-rc3');
+  it('is 1.0.0', function () {
+    expect(swig.version).to.equal('1.0.0');
   });
 });