Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	guides/source/action_mailer_basics.md

36 files changed, 110 insertions, 78 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 521eaf25d2..693b6bdfcc 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -14,7 +14,6 @@ module ActionView
     #   # => <img alt="Rails" src="/assets/rails.png" />
     #   stylesheet_link_tag("application")
     #   # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" />
-    #
     module AssetTagHelper
       extend ActiveSupport::Concern
 
@@ -50,7 +49,6 @@ module ActionView
       #
       #   javascript_include_tag "http://www.example.com/xmlhr.js"
       #   # => <script src="http://www.example.com/xmlhr.js"></script>
-      #
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
         path_options = options.extract!('protocol').symbolize_keys
@@ -67,7 +65,7 @@ module ActionView
       # you don't specify an extension, <tt>.css</tt> will be appended automatically.
       # You can modify the link attributes by passing a hash as the last argument.
       # For historical reasons, the 'media' attribute will always be present and defaults
-      # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
+      # to "screen", so you must explicitly set it to "all" for the stylesheet(s) to
       # apply to all media types.
       #
       #   stylesheet_link_tag "style"
@@ -88,7 +86,6 @@ module ActionView
       #   stylesheet_link_tag "random.styles", "/css/stylish"
       #   # => <link href="/assets/random.styles" media="screen" rel="stylesheet" />
       #   #    <link href="/css/stylish.css" media="screen" rel="stylesheet" />
-      #
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
         path_options = options.extract!('protocol').symbolize_keys
@@ -109,10 +106,13 @@ module ActionView
       # +url_options+. You can modify the LINK tag itself in +tag_options+.
       #
       # ==== Options
+      #
       # * <tt>:rel</tt>  - Specify the relation of this link, defaults to "alternate"
       # * <tt>:type</tt>  - Override the auto-generated mime type
       # * <tt>:title</tt>  - Specify the title of the link, defaults to the +type+
       #
+      # ==== Examples
+      #
       #   auto_discovery_link_tag
       #   # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
       #   auto_discovery_link_tag(:atom)
@@ -148,9 +148,12 @@ module ActionView
       # you can override "rel" and "type".
       #
       # ==== Options
+      #
       # * <tt>:rel</tt>   - Specify the relation of this link, defaults to 'shortcut icon'
       # * <tt>:type</tt>  - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon'
       #
+      # ==== Examples
+      #
       #   favicon_link_tag '/myicon.ico'
       #   # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
@@ -160,7 +163,6 @@ module ActionView
       #
       #   favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
       #   # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
-      #
       def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
@@ -173,6 +175,7 @@ module ActionView
       # path or a file.
       #
       # ==== Options
+      #
       # You can add HTML attributes using the +options+. The +options+ supports
       # three additional keys for convenience and conformance:
       #
@@ -250,6 +253,8 @@ module ActionView
       #   width="30" and height="45". <tt>:size</tt> will be ignored if the
       #   value is not in the correct format.
       #
+      # ==== Examples
+      #
       #   video_tag("trailer")
       #   # => <video src="/videos/trailer" />
       #   video_tag("trailer.ogg")
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 9e1be65b1a..fda7038a5d 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -28,6 +28,8 @@ module ActionView
       # Formats a +number+ into a US phone number (e.g., (555)
       # 123-9876). You can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:area_code</tt> - Adds parentheses around the area code.
       # * <tt>:delimiter</tt> - Specifies the delimiter to use
       #   (defaults to "-").
@@ -38,6 +40,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_phone(5551234)                                           # => 555-1234
       #   number_to_phone("5551234")                                         # => 555-1234
       #   number_to_phone(1235551234)                                        # => 123-555-1234
@@ -61,6 +65,8 @@ module ActionView
       # Formats a +number+ into a currency string (e.g., $13.65). You
       # can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the level of precision (defaults
@@ -82,6 +88,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_currency(1234567890.50)                    # => $1,234,567,890.50
       #   number_to_currency(1234567890.506)                   # => $1,234,567,890.51
       #   number_to_currency(1234567890.506, precision: 3)     # => $1,234,567,890.506
@@ -108,6 +116,7 @@ module ActionView
       # Formats a +number+ as a percentage string (e.g., 65%). You can
       # customize the format in the +options+ hash.
       #
+      # ==== Options
       #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
@@ -128,6 +137,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_percentage(100)                                        # => 100.000%
       #   number_to_percentage("98")                                       # => 98.000%
       #   number_to_percentage(100, precision: 0)                          # => 100%
@@ -151,6 +162,8 @@ module ActionView
       # (e.g., 12,324). You can customize the format in the +options+
       # hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
@@ -160,6 +173,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_with_delimiter(12345678)                        # => 12,345,678
       #   number_with_delimiter("123456")                        # => 123,456
       #   number_with_delimiter(12345678.05)                     # => 12,345,678.05
@@ -185,6 +200,8 @@ module ActionView
       # +:significant+ is +false+, and 5 if +:significant+ is +true+).
       # You can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -202,6 +219,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_with_precision(111.2345)                                         # => 111.235
       #   number_with_precision(111.2345, precision: 2)                           # => 111.23
       #   number_with_precision(13, precision: 5)                                 # => 13.00000
@@ -233,6 +252,8 @@ module ActionView
       # See <tt>number_to_human</tt> if you want to pretty-print a
       # generic number.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -252,6 +273,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_human_size(123)                                          # => 123 Bytes
       #   number_to_human_size(1234)                                         # => 1.21 KB
       #   number_to_human_size(12345)                                        # => 12.1 KB
@@ -324,6 +347,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_human(123)                                          # => "123"
       #   number_to_human(1234)                                         # => "1.23 Thousand"
       #   number_to_human(12345)                                        # => "12.3 Thousand"
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index 10dec66b4f..3fe3f4e9df 100644
--- a/actionpack/lib/action_view/helpers/tags/base.rb
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Base #:nodoc:
+    module Tags # :nodoc:
+      class Base # :nodoc:
         include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
         include FormOptionsHelper
 
diff --git a/actionpack/lib/action_view/helpers/tags/check_box.rb b/actionpack/lib/action_view/helpers/tags/check_box.rb
index e21cc07746..6d51f2629a 100644
--- a/actionpack/lib/action_view/helpers/tags/check_box.rb
+++ b/actionpack/lib/action_view/helpers/tags/check_box.rb
@@ -2,7 +2,7 @@ require 'action_view/helpers/tags/checkable'
 
 module ActionView
   module Helpers
-    module Tags
+    module Tags # :nodoc:
       class CheckBox < Base #:nodoc:
         include Checkable
 
diff --git a/actionpack/lib/action_view/helpers/tags/checkable.rb b/actionpack/lib/action_view/helpers/tags/checkable.rb
index b97c0c68d7..052e9df662 100644
--- a/actionpack/lib/action_view/helpers/tags/checkable.rb
+++ b/actionpack/lib/action_view/helpers/tags/checkable.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      module Checkable
+    module Tags # :nodoc:
+      module Checkable # :nodoc:
         def input_checked?(object, options)
           if options.has_key?("checked")
             checked = options.delete "checked"
diff --git a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
index 9655008fe2..52006d856b 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -2,11 +2,11 @@ require 'action_view/helpers/tags/collection_helpers'
 
 module ActionView
   module Helpers
-    module Tags
-      class CollectionCheckBoxes < Base
+    module Tags # :nodoc:
+      class CollectionCheckBoxes < Base # :nodoc:
         include CollectionHelpers
 
-        class CheckBoxBuilder < Builder
+        class CheckBoxBuilder < Builder # :nodoc:
           def check_box(extra_html_options={})
             html_options = extra_html_options.merge(@input_html_options)
             @template_object.check_box(@object_name, @method_name, html_options, @value, nil)
diff --git a/actionpack/lib/action_view/helpers/tags/collection_helpers.rb b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
index e92a318c73..cd12ddaf65 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
@@ -1,8 +1,8 @@
 module ActionView
   module Helpers
-    module Tags
-      module CollectionHelpers
-        class Builder
+    module Tags # :nodoc:
+      module CollectionHelpers # :nodoc:
+        class Builder # :nodoc:
           attr_reader :object, :text, :value
 
           def initialize(template_object, object_name, method_name, object,
diff --git a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
index 893f4411e7..20be34c1f2 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -2,11 +2,11 @@ require 'action_view/helpers/tags/collection_helpers'
 
 module ActionView
   module Helpers
-    module Tags
-      class CollectionRadioButtons < Base
+    module Tags # :nodoc:
+      class CollectionRadioButtons < Base # :nodoc:
         include CollectionHelpers
 
-        class RadioButtonBuilder < Builder
+        class RadioButtonBuilder < Builder # :nodoc:
           def radio_button(extra_html_options={})
             html_options = extra_html_options.merge(@input_html_options)
             @template_object.radio_button(@object_name, @method_name, @value, html_options)
diff --git a/actionpack/lib/action_view/helpers/tags/collection_select.rb b/actionpack/lib/action_view/helpers/tags/collection_select.rb
index ec78e6e5f9..6cb2b2e0d3 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_select.rb
@@ -1,6 +1,6 @@
 module ActionView
   module Helpers
-    module Tags
+    module Tags # :nodoc:
       class CollectionSelect < Base #:nodoc:
         def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
           @collection   = collection
diff --git a/actionpack/lib/action_view/helpers/tags/color_field.rb b/actionpack/lib/action_view/helpers/tags/color_field.rb
index 6f08f8483a..d8fc797035 100644
--- a/actionpack/lib/action_view/helpers/tags/color_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/color_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class ColorField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class ColorField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
           options["value"] = @options.fetch("value") { validate_color_string(value(object)) }
diff --git a/actionpack/lib/action_view/helpers/tags/date_field.rb b/actionpack/lib/action_view/helpers/tags/date_field.rb
index 64c29dea3d..c22be0db29 100644
--- a/actionpack/lib/action_view/helpers/tags/date_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/date_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DateField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class DateField < DatetimeField # :nodoc:
         private
 
           def format_date(value)
diff --git a/actionpack/lib/action_view/helpers/tags/date_select.rb b/actionpack/lib/action_view/helpers/tags/date_select.rb
index 734591394b..0c4ac40070 100644
--- a/actionpack/lib/action_view/helpers/tags/date_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/date_select.rb
@@ -2,8 +2,8 @@ require 'active_support/core_ext/time/calculations'
 
 module ActionView
   module Helpers
-    module Tags
-      class DateSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class DateSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, options, html_options)
           @html_options = html_options
 
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_field.rb b/actionpack/lib/action_view/helpers/tags/datetime_field.rb
index e407146e96..9a2279c611 100644
--- a/actionpack/lib/action_view/helpers/tags/datetime_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/datetime_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
           options["value"] = @options.fetch("value") { format_date(value(object)) }
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb b/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
index 6668d6d718..b4a74185d1 100644
--- a/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeLocalField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeLocalField < DatetimeField # :nodoc:
         class << self
           def field_type
             @field_type ||= "datetime-local"
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_select.rb b/actionpack/lib/action_view/helpers/tags/datetime_select.rb
index a32c840bce..563de1840e 100644
--- a/actionpack/lib/action_view/helpers/tags/datetime_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/datetime_select.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeSelect < DateSelect #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeSelect < DateSelect # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/email_field.rb b/actionpack/lib/action_view/helpers/tags/email_field.rb
index 45cde507d7..7ce3ccb9bf 100644
--- a/actionpack/lib/action_view/helpers/tags/email_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/email_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class EmailField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class EmailField < TextField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/file_field.rb b/actionpack/lib/action_view/helpers/tags/file_field.rb
index 59f2ff71b4..476b820d84 100644
--- a/actionpack/lib/action_view/helpers/tags/file_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/file_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class FileField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class FileField < TextField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb b/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
index 507ba8835f..2ed4712dac 100644
--- a/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class GroupedCollectionSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class GroupedCollectionSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           @collection          = collection
           @group_method        = group_method
diff --git a/actionpack/lib/action_view/helpers/tags/hidden_field.rb b/actionpack/lib/action_view/helpers/tags/hidden_field.rb
index a8d13dc1b1..c3757c2461 100644
--- a/actionpack/lib/action_view/helpers/tags/hidden_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/hidden_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class HiddenField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class HiddenField < TextField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb
index 16135fcd5a..35d3ba8434 100644
--- a/actionpack/lib/action_view/helpers/tags/label.rb
+++ b/actionpack/lib/action_view/helpers/tags/label.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Label < Base #:nodoc:
+    module Tags # :nodoc:
+      class Label < Base # :nodoc:
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
           options ||= {}
 
diff --git a/actionpack/lib/action_view/helpers/tags/month_field.rb b/actionpack/lib/action_view/helpers/tags/month_field.rb
index 3d3c32d847..4c0fb846ee 100644
--- a/actionpack/lib/action_view/helpers/tags/month_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/month_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class MonthField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class MonthField < DatetimeField # :nodoc:
         private
 
           def format_date(value)
diff --git a/actionpack/lib/action_view/helpers/tags/number_field.rb b/actionpack/lib/action_view/helpers/tags/number_field.rb
index 9cd04434f0..4f95b1b4de 100644
--- a/actionpack/lib/action_view/helpers/tags/number_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/number_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class NumberField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class NumberField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
 
diff --git a/actionpack/lib/action_view/helpers/tags/password_field.rb b/actionpack/lib/action_view/helpers/tags/password_field.rb
index 6e7a4d3c36..6099fa6f19 100644
--- a/actionpack/lib/action_view/helpers/tags/password_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/password_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class PasswordField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class PasswordField < TextField # :nodoc:
         def render
           @options = {:value => nil}.merge!(@options)
           super
diff --git a/actionpack/lib/action_view/helpers/tags/radio_button.rb b/actionpack/lib/action_view/helpers/tags/radio_button.rb
index 8a0421f061..4849c537a5 100644
--- a/actionpack/lib/action_view/helpers/tags/radio_button.rb
+++ b/actionpack/lib/action_view/helpers/tags/radio_button.rb
@@ -2,8 +2,8 @@ require 'action_view/helpers/tags/checkable'
 
 module ActionView
   module Helpers
-    module Tags
-      class RadioButton < Base #:nodoc:
+    module Tags # :nodoc:
+      class RadioButton < Base # :nodoc:
         include Checkable
 
         def initialize(object_name, method_name, template_object, tag_value, options)
diff --git a/actionpack/lib/action_view/helpers/tags/range_field.rb b/actionpack/lib/action_view/helpers/tags/range_field.rb
index 47db4680e7..f98ae88043 100644
--- a/actionpack/lib/action_view/helpers/tags/range_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/range_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class RangeField < NumberField #:nodoc:
+    module Tags # :nodoc:
+      class RangeField < NumberField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/search_field.rb b/actionpack/lib/action_view/helpers/tags/search_field.rb
index 818fd4b887..c09e2f1be7 100644
--- a/actionpack/lib/action_view/helpers/tags/search_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/search_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class SearchField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class SearchField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
 
diff --git a/actionpack/lib/action_view/helpers/tags/select.rb b/actionpack/lib/action_view/helpers/tags/select.rb
index 53a108b7e6..d64e2f68ef 100644
--- a/actionpack/lib/action_view/helpers/tags/select.rb
+++ b/actionpack/lib/action_view/helpers/tags/select.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Select < Base #:nodoc:
+    module Tags # :nodoc:
+      class Select < Base # :nodoc:
         def initialize(object_name, method_name, template_object, choices, options, html_options)
           @choices = choices
           @choices = @choices.to_a if @choices.is_a?(Range)
@@ -31,7 +31,6 @@ module ActionView
         #
         #   [nil, []]
         #   { nil => [] }
-        #
         def grouped_choices?
           !@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
         end
diff --git a/actionpack/lib/action_view/helpers/tags/tel_field.rb b/actionpack/lib/action_view/helpers/tags/tel_field.rb
index 87c1f6b6b6..987bb9e67a 100644
--- a/actionpack/lib/action_view/helpers/tags/tel_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/tel_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TelField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class TelField < TextField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
index f74652c5e7..c81156c0c8 100644
--- a/actionpack/lib/action_view/helpers/tags/text_area.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TextArea < Base #:nodoc:
+    module Tags # :nodoc:
+      class TextArea < Base # :nodoc:
         def render
           options = @options.stringify_keys
           add_default_name_and_id(options)
diff --git a/actionpack/lib/action_view/helpers/tags/text_field.rb b/actionpack/lib/action_view/helpers/tags/text_field.rb
index 024a1a8af2..baa5ff768e 100644
--- a/actionpack/lib/action_view/helpers/tags/text_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TextField < Base #:nodoc:
+    module Tags # :nodoc:
+      class TextField < Base # :nodoc:
         def render
           options = @options.stringify_keys
           options["size"] = options["maxlength"] unless options.key?("size")
diff --git a/actionpack/lib/action_view/helpers/tags/time_field.rb b/actionpack/lib/action_view/helpers/tags/time_field.rb
index a3941860c9..0e90a3aed7 100644
--- a/actionpack/lib/action_view/helpers/tags/time_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/time_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class TimeField < DatetimeField # :nodoc:
         private
 
           def format_date(value)
diff --git a/actionpack/lib/action_view/helpers/tags/time_select.rb b/actionpack/lib/action_view/helpers/tags/time_select.rb
index 9e97deb706..0b06311d25 100644
--- a/actionpack/lib/action_view/helpers/tags/time_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/time_select.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeSelect < DateSelect #:nodoc:
+    module Tags # :nodoc:
+      class TimeSelect < DateSelect # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/time_zone_select.rb b/actionpack/lib/action_view/helpers/tags/time_zone_select.rb
index 0a176157c3..80d165ec7e 100644
--- a/actionpack/lib/action_view/helpers/tags/time_zone_select.rb
+++ b/actionpack/lib/action_view/helpers/tags/time_zone_select.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeZoneSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class TimeZoneSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, priority_zones, options, html_options)
           @priority_zones = priority_zones
           @html_options   = html_options
diff --git a/actionpack/lib/action_view/helpers/tags/url_field.rb b/actionpack/lib/action_view/helpers/tags/url_field.rb
index 1ffdfe0b3c..d76340178d 100644
--- a/actionpack/lib/action_view/helpers/tags/url_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/url_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class UrlField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class UrlField < TextField # :nodoc:
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags/week_field.rb b/actionpack/lib/action_view/helpers/tags/week_field.rb
index 1e13939a0a..5b3d0494e9 100644
--- a/actionpack/lib/action_view/helpers/tags/week_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/week_field.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class WeekField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class WeekField < DatetimeField # :nodoc:
         private
 
           def format_date(value)
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 2e124cf085..147f9fd8ed 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -126,8 +126,8 @@ module ActionView
       # Extracts an excerpt from +text+ that matches the first instance of +phrase+.
       # The <tt>:radius</tt> option expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
       # defined in <tt>:radius</tt> (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
-      # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. The
-      # <tt>:separator</tt> enable to choose the delimation. The resulting string will be stripped in any case. If the +phrase+
+      # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. Use the
+      # <tt>:separator</tt> option to choose the delimitation. The resulting string will be stripped in any case. If the +phrase+
       # isn't found, nil is returned.
       #
       #   excerpt('This is an example', 'an', radius: 5)
@@ -145,7 +145,7 @@ module ActionView
       #   excerpt('This is also an example', 'an', radius: 8, omission: '<chop> ')
       #   # => <chop> is also an example
       #
-      #   excerpt('This is a very beautiful morning', 'very', separator:  ' ', radius: 1)
+      #   excerpt('This is a very beautiful morning', 'very', separator: ' ', radius: 1)
       #   # => ...a very beautiful...
       def excerpt(text, phrase, options = {})
         return unless text && phrase
@@ -250,8 +250,11 @@ module ActionView
       #   simple_format("Look ma! A class!", class: 'description')
       #   # => "<p class='description'>Look ma! A class!</p>"
       #
-      #   simple_format("<span>I'm allowed!</span> It's true.", {}, sanitize: false)
-      #   # => "<p><span>I'm allowed!</span> It's true.</p>"
+      #   simple_format("<blink>Unblinkable.</blink>")
+      #   # => "<p>Unblinkable.</p>"
+      #
+      #   simple_format("<blink>Blinkable!</blink> It's true.", {}, sanitize: false)
+      #   # => "<p><blink>Blinkable!</span> It's true.</p>"
       def simple_format(text, html_options = {}, options = {})
         wrapper_tag = options.fetch(:wrapper_tag, :p)