From dba196cb7f8d34b93f6872e4a43737bb52019065 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 17 Jan 2010 03:26:20 +0530
Subject: Merge docrails

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 3 +++
 actionpack/lib/action_view/helpers/sanitize_helper.rb | 2 +-
 actionpack/lib/action_view/helpers/text_helper.rb     | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 7688e786b1..048bedc7ba 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -55,6 +55,9 @@ module ActionView
       # * Any other key creates standard HTML attributes for the tag.
       #
       # ==== Examples
+      #   select_tag "people", options_from_collection_for_select(@people, "name", "id")
+      #   # <select id="people" name="people"><option value="1">David</option></select>
+      #   
       #   select_tag "people", "<option>David</option>"
       #   # => <select id="people" name="people"><option>David</option></select>
       #
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index f03ffe5ef4..657d26f0a2 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -22,7 +22,7 @@ module ActionView
       #
       # Custom Use (only the mentioned tags and attributes are allowed, nothing else)
       #
-      #   <%= sanitize @article.body, :tags => %w(table tr td), :attributes => %w(id class style)
+      #   <%= sanitize @article.body, :tags => %w(table tr td), :attributes => %w(id class style) %>
       #
       # Add table tags to the default allowed tags
       #
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index be15e227b9..814d86812d 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -226,8 +226,7 @@ module ActionView
       # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
       #
       # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-      # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-      # is available</i>.
+      # <i>This method is only available if RedCloth[http://redcloth.org/] is available</i>.
       #
       # ==== Examples
       #   textilize("*This is Textile!*  Rejoice!")
@@ -263,8 +262,7 @@ module ActionView
       # but without the bounding <p> tag that RedCloth adds.
       #
       # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-      # <i>This method is requires RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-      # to be available</i>.
+      # <i>This method is only available if RedCloth[http://redcloth.org/] is available</i>.
       #
       # ==== Examples
       #   textilize_without_paragraph("*This is Textile!*  Rejoice!")
-- 
cgit v1.2.3