From a520408f512331dc7dc4167cb3a48f81006572ac Mon Sep 17 00:00:00 2001
From: Matt Wildig <matt@mattwildig.co.uk>
Date: Mon, 25 Jun 2012 21:31:01 +0100
Subject: [PATCH] Document js and css filters handling of CDATA

---
 CHANGELOG.md        |  4 ++++
 REFERENCE.md        | 10 ++++++----
 lib/haml/options.rb |  6 +++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c22e5dc..720fc62e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 3.2.0 (Unreleased)
 
+* 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
diff --git a/REFERENCE.md b/REFERENCE.md
index 60a5ad84..b45c3756 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1092,8 +1092,9 @@ Tilt.
 
 {#css-filter}
 ### `:css`
-Surrounds the filtered text with `<style>` and CDATA tags. Useful for including
-inline CSS.
+Surrounds the filtered text with `<style>` and (optionally) CDATA tags. Useful
+for including inline CSS. Use the {Haml::Options#cdata `:cdata` option} to
+control when CDATA tags are added.
 
 {#erb-filter}
 ### `:erb`
@@ -1109,8 +1110,9 @@ before placing it in the document.
 
 {#javascript-filter}
 ### `:javascript`
-Surrounds the filtered text with `<script>` and CDATA tags.
-Useful for including inline Javascript.
+Surrounds the filtered text with `<script>` and (optionally) CDATA tags.
+Useful for including inline Javascript. Use the {Haml::Options#cdata `:cdata`
+option} to control when CDATA tags are added.
 
 {#less-filter}
 ### `:less`
diff --git a/lib/haml/options.rb b/lib/haml/options.rb
index 6399b33e..88ca9dcf 100644
--- a/lib/haml/options.rb
+++ b/lib/haml/options.rb
@@ -148,7 +148,11 @@ module Haml
     # Defaults to `true` in Rails production  mode, and `false` everywhere else.
     attr_accessor :ugly
 
-    # Whether to include CDATA sections around javascript blocks.
+    # Whether to include CDATA sections around javascript and css blocks when
+    # using the `:javascript` or `:css` filters.
+    #
+    # This option also affects the `:sass`, `:scss`, `:less` and `:coffeescript`
+    # filters.
     #
     # Defaults to `false` for html, `true` for xhtml. Cannot be changed when using
     # xhtml.