Permalink
Browse files

Merge branch 'master' of github.com:dtrasbo/formatize

Conflicts:
	README.md
  • Loading branch information...
dtrasbo committed Mar 30, 2012
2 parents 35c0b75 + e9aca99 commit 009837d8f8ba94adf163a08f771838dac18ed4e6
Showing with 5 additions and 1 deletion.
  1. +5 −1 README.md
View
@@ -33,7 +33,7 @@ When necessary, flags are listed as such:
# => "(snip)"
[The `RedCloth` documentation](http://redcloth.rubyforge.org/classes/RedCloth/TextileDoc.html)
-lists the available flags. The `textilize_without_paragraphs` method
+lists the available flags. The `textilize_without_paragraph` method
delegates to `textilize` but strips the surrounding `<p>` tags.
### The `markdown` helper method
@@ -65,6 +65,10 @@ it's useful to be able to bypass the pre-parsing sanitization. Two ways:
2. Use the special `:safe` flag, which is not passed on to the parser.
_(Deprecated in 1.1, removed in 2.0)._
+With Rails' `sanitize`, if you don't bypass it, you can choose which tags and
+attributes to allow as described in the
+[documentation](http://api.rubyonrails.org/classes/ActionView/Helpers/SanitizeHelper.html#method-i-sanitize).
+
Compatibility
-------------

0 comments on commit 009837d

Please sign in to comment.