From f6dc5e1cbc57dea47315a707c19ecfd77dbbded8 Mon Sep 17 00:00:00 2001
From: Norman Clarke <norman@njclarke.com>
Date: Sun, 19 Aug 2012 18:49:47 -0300
Subject: [PATCH] Updated changelog, bumped version

---
 CHANGELOG.md        | 34 ++++++++++++++++++----------------
 lib/haml/version.rb |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5357d2e6..0db03a21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,17 +5,6 @@
 * HTML5 is now the default output format rather than XHTML. This was already
   the default on Rails 3+, so many users will notice no difference.
 
-* The :javascript and :css filters no longer add CDATA tags when the format is
-  html4 or html5. This can be overridden by setting the `cdata` option to
-  `true`. CDATA tags are always added when the format is xhtml.
-
-* HTML2Haml has been extracted to a separate gem, creatively named "html2haml".
-
-* Haml's internals have been refactored to move the parser, compiler and options
-  handling into independent classes, rather than including them all in the
-  Engine module. You can also specify your own custom Haml parser or compiler
-  class in Haml::Options in order to extend or modify Haml reasonably easily.
-
 * The :sass filter now wraps its output in a script tag, as do the new :less and
   :scss filters. The :coffee filter wraps its output in a script tag.
 
@@ -23,6 +12,24 @@
   still need support for Rails 2 and Ruby 1.8.6, please use Haml 3.1.x which
   will continue to be maintained for bug fixes.
 
+* The :javascript and :css filters no longer add CDATA tags when the format is
+  html4 or html5. This can be overridden by setting the `cdata` option to
+  `true`. CDATA tags are always added when the format is xhtml.
+
+* HTML2Haml has been extracted to a separate gem, creatively named "html2haml".
+
+* The `:erb` filter now uses Rails's safe output buffer to provide XSS safety.
+
+* Haml's internals have been refactored to move the parser, compiler and options
+  handling into independent classes, rather than including them all in the
+  Engine module. You can also specify your own custom Haml parser or compiler
+  class in Haml::Options in order to extend or modify Haml reasonably easily.
+
+* Add an {file:REFERENCE.md#hyphenate_data_attrs-option `:hyphenate_data_attrs`
+  option} that converts underscores to hyphens in your HTML5 data keys. This is
+  a language change from 3.1 and is enabled by default.
+  (thanks to [Andrew Smith](https://github.com/fullsailor))
+
 * Added `remove_whitespace` option to always remove all whitespace around Haml
   tags. (thanks to [Tim van der Horst](https://github.com/vdh))
 
@@ -54,11 +61,6 @@
 * Performance improvements.
   (thanks to [Chris Heald](https://github.com/cheald))
 
-* Add an {file:REFERENCE.md#hyphenate_data_attrs-option `:hyphenate_data_attrs`
-  option} that converts underscores to hyphens in your HTML5 data keys. This is
-  a language change from 3.1 and is enabled by default.
-  (thanks to [Andrew Smith](https://github.com/fullsailor))
-
 * Helper `list_of` takes an extra argument that is rendered into list item
   attributes.
   (thanks  [Iain Barnett](http://iainbarnett.me.uk/))
diff --git a/lib/haml/version.rb b/lib/haml/version.rb
index 4f142408..9ca34eb9 100644
--- a/lib/haml/version.rb
+++ b/lib/haml/version.rb
@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "3.2.0.beta.2"
+  VERSION = "3.2.0.beta.3"
 end