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

Conflicts:
	actionpack/lib/action_view/helpers/asset_tag_helper.rb

12 files changed, 9 insertions, 76 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 8368ebfbca..a7a4ce21ff 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -252,7 +252,6 @@ module ActionView
       # The following call would generate such a tag:
       #
       #   <%= favicon_link_tag 'mb-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
-      #
       def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
@@ -290,7 +289,6 @@ module ActionView
       # Full paths from the document root will be passed through.
       # Used internally by +video_tag+ to build the video path.
       #
-      # ==== Examples
       #   video_path("hd")                                            # => /videos/hd
       #   video_path("hd.avi")                                        # => /videos/hd.avi
       #   video_path("trailers/hd.avi")                               # => /videos/trailers/hd.avi
@@ -312,7 +310,6 @@ module ActionView
       # Full paths from the document root will be passed through.
       # Used internally by +audio_tag+ to build the audio path.
       #
-      # ==== Examples
       #   audio_path("horse")                                            # => /audios/horse
       #   audio_path("horse.wav")                                        # => /audios/horse.wav
       #   audio_path("sounds/horse.wav")                                 # => /audios/sounds/horse.wav
@@ -323,7 +320,7 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
-      # Computes the full URL to a audio asset in the public audios directory.
+      # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
       def audio_url(source)
         URI.join(current_host, path_to_audio(source)).to_s
@@ -333,7 +330,6 @@ module ActionView
       # Computes the path to a font asset.
       # Full paths from the document root will be passed through.
       #
-      # ==== Examples
       #   font_path("font")                                           # => /assets/font
       #   font_path("font.ttf")                                       # => /assets/font.ttf
       #   font_path("dir/font.ttf")                                   # => /assets/dir/font.ttf
@@ -364,7 +360,6 @@ module ActionView
       #   width="30" and height="45". <tt>:size</tt> will be ignored if the
       #   value is not in the correct format.
       #
-      # ==== Examples
       #  image_tag("icon")  # =>
       #    <img src="/assets/icon" alt="Icon" />
       #  image_tag("icon.png")  # =>
@@ -413,7 +408,6 @@ 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")  # =>
@@ -446,15 +440,14 @@ module ActionView
       # The +source+ can be full path or file that exists in
       # your public audios directory.
       #
-      # ==== Examples
-      #  audio_tag("sound")  # =>
-      #    <audio src="/audios/sound" />
-      #  audio_tag("sound.wav")  # =>
-      #    <audio src="/audios/sound.wav" />
-      #  audio_tag("sound.wav", :autoplay => true, :controls => true)  # =>
-      #    <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
-      #  audio_tag("sound.wav", "sound.mid")  # =>
-      #    <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
+      #   audio_tag("sound")  # =>
+      #     <audio src="/audios/sound" />
+      #   audio_tag("sound.wav")  # =>
+      #     <audio src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", :autoplay => true, :controls => true)  # =>
+      #     <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", "sound.mid")  # =>
+      #     <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
       def audio_tag(*sources)
         multiple_sources_tag('audio', sources)
       end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index 7bff0c1149..4292d29f60 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -76,7 +76,6 @@ module ActionView
         # Full paths from the document root will be passed through.
         # Used internally by javascript_include_tag to build the script path.
         #
-        # ==== Examples
         #   javascript_path "xmlhr"                              # => /javascripts/xmlhr.js
         #   javascript_path "dir/xmlhr.js"                       # => /javascripts/dir/xmlhr.js
         #   javascript_path "/dir/xmlhr"                         # => /dir/xmlhr.js
@@ -114,7 +113,6 @@ module ActionView
         # You can modify the HTML attributes of the script tag by passing a hash as the
         # last argument.
         #
-        # ==== Examples
         #   javascript_include_tag "xmlhr"
         #   # => <script src="/javascripts/xmlhr.js?1284139606"></script>
         #
@@ -160,8 +158,6 @@ module ActionView
         # <tt>config.perform_caching</tt> is set to true (which is the case by default for the Rails
         # production environment, but not for the development environment).
         #
-        # ==== Examples
-        #
         #   # assuming config.perform_caching is false
         #   javascript_include_tag :all, :cache => true
         #   # => <script src="/javascripts/jquery.js?1284139606"></script>
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 4bcb8b9718..57b0627225 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -54,7 +54,6 @@ module ActionView
         # Full paths from the document root will be passed through.
         # Used internally by +stylesheet_link_tag+ to build the stylesheet path.
         # 
-        # ==== Examples
         #   stylesheet_path "style"                                  # => /stylesheets/style.css
         #   stylesheet_path "dir/style.css"                          # => /stylesheets/dir/style.css
         #   stylesheet_path "/dir/style.css"                         # => /dir/style.css
@@ -79,7 +78,6 @@ module ActionView
         # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
         # apply to all media types.
         #
-        # ==== Examples
         #   stylesheet_link_tag "style" # =>
         #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" />
         #
@@ -117,7 +115,6 @@ module ActionView
         # is set to true (which is the case by default for the Rails production environment, but not for the development
         # environment). Examples:
         #
-        # ==== Examples
         #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is false =>
         #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" />
         #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" />
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 850dd5f448..33799d7d71 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -10,7 +10,6 @@ module ActionView
       #
       # See ActionController::Caching::Fragments for usage instructions.
       #
-      # ==== Examples
       # If you want to cache a navigation menu, you can do following:
       #
       #   <% cache do %>
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index d9d6f90211..397738dd98 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -13,7 +13,6 @@ module ActionView
       # The capture method allows you to extract part of a template into a
       # variable. You can then use this variable anywhere in your templates or layout.
       #
-      # ==== Examples
       # The capture method can be used in ERB templates...
       #
       #   <% @greeting = capture do %>
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index f0a593d2c1..659aacf6d7 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -64,7 +64,6 @@ module ActionView
       #   distance_of_time_in_words(from_time, to_time, :include_seconds => true)                     # => about 6 years
       #   distance_of_time_in_words(to_time, from_time, :include_seconds => true)                     # => about 6 years
       #   distance_of_time_in_words(Time.now, Time.now)                                               # => less than a minute
-      #
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
         if include_seconds_or_options.is_a?(Hash)
           options = include_seconds_or_options
@@ -140,7 +139,6 @@ module ActionView
 
       # Like <tt>distance_of_time_in_words</tt>, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
       #
-      # ==== Examples
       #   time_ago_in_words(3.minutes.from_now)                 # => 3 minutes
       #   time_ago_in_words(Time.now - 15.hours)                # => about 15 hours
       #   time_ago_in_words(Time.now)                           # => less than a minute
@@ -148,7 +146,6 @@ module ActionView
       #
       #   from_time = Time.now - 3.days - 14.minutes - 25.seconds
       #   time_ago_in_words(from_time)      # => 3 days
-      #
       def time_ago_in_words(from_time, include_seconds_or_options = {})
         distance_of_time_in_words(from_time, Time.now, include_seconds_or_options)
       end
@@ -197,7 +194,6 @@ module ActionView
       #
       # NOTE: Discarded selects will default to 1. So if no month select is available, January will be assumed.
       #
-      # ==== Examples
       #   # Generates a date select that when POSTed is stored in the article variable, in the written_on attribute.
       #   date_select("article", "written_on")
       #
@@ -253,7 +249,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   # Creates a time select tag that, when POSTed, will be stored in the article variable in the sunrise attribute.
       #   time_select("article", "sunrise")
       #
@@ -286,7 +281,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   # Generates a datetime select that, when POSTed, will be stored in the article variable in the written_on
       #   # attribute.
       #   datetime_select("article", "written_on")
@@ -325,7 +319,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_date_time = Time.now + 4.days
       #
       #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today).
@@ -362,7 +355,6 @@ module ActionView
       #   select_datetime(my_date_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_datetime(my_date_time, :prompt => {:hour => true}) # generic prompt for hours
       #   select_datetime(my_date_time, :prompt => true) # generic prompts for all
-      #
       def select_datetime(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_datetime
       end
@@ -374,7 +366,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_date = Time.now + 6.days
       #
       #   # Generates a date select that defaults to the date in my_date (six days after today).
@@ -403,7 +394,6 @@ module ActionView
       #   select_date(my_date, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_date(my_date, :prompt => {:hour => true}) # generic prompt for hours
       #   select_date(my_date, :prompt => true) # generic prompts for all
-      #
       def select_date(date = Date.current, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_date
       end
@@ -414,7 +404,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_time = Time.now + 5.days + 7.hours + 3.minutes + 14.seconds
       #
       #   # Generates a time select that defaults to the time in my_time.
@@ -442,7 +431,6 @@ module ActionView
       #   select_time(my_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_time(my_time, :prompt => {:hour => true}) # generic prompt for hours
       #   select_time(my_time, :prompt => true) # generic prompts for all
-      #
       def select_time(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_time
       end
@@ -451,7 +439,6 @@ module ActionView
       # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'second' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 16.minutes
       #
       #   # Generates a select field for seconds that defaults to the seconds for the time in my_time.
@@ -467,7 +454,6 @@ module ActionView
       #   # Generates a select field for seconds with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_second(14, :prompt => 'Choose seconds')
-      #
       def select_second(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_second
       end
@@ -477,7 +463,6 @@ module ActionView
       # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'minute' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 6.hours
       #
       #   # Generates a select field for minutes that defaults to the minutes for the time in my_time.
@@ -493,7 +478,6 @@ module ActionView
       #   # Generates a select field for minutes with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_minute(14, :prompt => 'Choose minutes')
-      #
       def select_minute(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_minute
       end
@@ -502,7 +486,6 @@ module ActionView
       # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'hour' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 6.hours
       #
       #   # Generates a select field for hours that defaults to the hour for the time in my_time.
@@ -521,7 +504,6 @@ module ActionView
       #
       #   # Generate a select field for hours in the AM/PM format
       #   select_hour(my_time, :ampm => true)
-      #
       def select_hour(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_hour
       end
@@ -531,7 +513,6 @@ module ActionView
       # If you want to display days with a leading zero set the <tt>:use_two_digit_numbers</tt> key in +options+ to true.
       # Override the field name using the <tt>:field_name</tt> option, 'day' by default.
       #
-      # ==== Examples
       #   my_date = Time.now + 2.days
       #
       #   # Generates a select field for days that defaults to the day for the date in my_date.
@@ -550,7 +531,6 @@ module ActionView
       #   # Generates a select field for days with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_day(5, :prompt => 'Choose day')
-      #
       def select_day(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_day
       end
@@ -565,7 +545,6 @@ module ActionView
       # If you want to display months with a leading zero set the <tt>:use_two_digit_numbers</tt> key in +options+ to true.
       # Override the field name using the <tt>:field_name</tt> option, 'month' by default.
       #
-      # ==== Examples
       #   # Generates a select field for months that defaults to the current month that
       #   # will use keys like "January", "March".
       #   select_month(Date.today)
@@ -597,7 +576,6 @@ module ActionView
       #   # Generates a select field for months with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_month(14, :prompt => 'Choose month')
-      #
       def select_month(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_month
       end
@@ -608,7 +586,6 @@ module ActionView
       # greater than <tt>:end_year</tt>. The <tt>date</tt> can also be substituted for a year given as a number.
       # Override the field name using the <tt>:field_name</tt> option, 'year' by default.
       #
-      # ==== Examples
       #   # Generates a select field for years that defaults to the current year that
       #   # has ascending year values.
       #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
@@ -628,14 +605,12 @@ module ActionView
       #   # Generates a select field for years with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_year(14, :prompt => 'Choose year')
-      #
       def select_year(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_year
       end
 
       # Returns an html time tag for the given date or time.
       #
-      # ==== Examples
       #   time_tag Date.today  # =>
       #     <time datetime="2010-11-04">November 04, 2010</time>
       #   time_tag Time.now  # =>
@@ -649,7 +624,6 @@ module ActionView
       #     <span>Right now</span>
       #   <% end %>
       #   # => <time datetime="2010-11-04T17:55:45+01:00"><span>Right now</span></time>
-      #
       def time_tag(date_or_time, *args, &block)
         options  = args.extract_options!
         format   = options.delete(:format) || :long
diff --git a/actionpack/lib/action_view/helpers/debug_helper.rb b/actionpack/lib/action_view/helpers/debug_helper.rb
index c0cc7d347c..878a8734a4 100644
--- a/actionpack/lib/action_view/helpers/debug_helper.rb
+++ b/actionpack/lib/action_view/helpers/debug_helper.rb
@@ -8,8 +8,6 @@ module ActionView
       # If the object cannot be converted to YAML using +to_yaml+, +inspect+ will be called instead.
       # Useful for inspecting an object at the time of rendering.
       #
-      # ==== Example
-      #
       #   @user = User.new({ :username => 'testing', :password => 'xyz', :age => 42}) %>
       #   debug(@user)
       #   # =>
@@ -25,7 +23,6 @@ module ActionView
       #
       #   new_record: true
       #   </pre>
-
       def debug(object)
         begin
           Marshal::dump(object)
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 0fbd6ac41b..cc1f133196 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -900,7 +900,6 @@ module ActionView
       # In that case it is preferable to either use +check_box_tag+ or to use
       # hashes instead of arrays.
       #
-      # ==== Examples
       #   # Let's say that @post.validated? is 1:
       #   check_box("post", "validated")
       #   # => <input name="post[validated]" type="hidden" value="0" />
@@ -926,7 +925,6 @@ module ActionView
       # To force the radio button to be checked pass <tt>:checked => true</tt> in the
       # +options+ hash. You may pass HTML options there as well.
       #
-      # ==== Examples
       #   # Let's say that @post.category returns "rails":
       #   radio_button("post", "category", "rails")
       #   radio_button("post", "category", "java")
@@ -945,8 +943,6 @@ module ActionView
       # assigned to the template (identified by +object_name+). Inputs of type "search" may be styled differently by
       # some browsers.
       #
-      # ==== Examples
-      #
       #   search_field(:user, :name)
       #   # => <input id="user_name" name="user[name]" type="search" />
       #   search_field(:user, :name, :autosave => false)
@@ -962,7 +958,6 @@ module ActionView
       #   # => <input autosave="false" id="user_name" incremental="true" name="user[name]" onsearch="true" type="search" />
       #   search_field(:user, :name, :autosave => true, :onsearch => true)
       #   # => <input autosave="com.example.www" id="user_name" incremental="true" name="user[name]" onsearch="true" results="10" type="search" />
-      #
       def search_field(object_name, method, options = {})
         Tags::SearchField.new(object_name, method, self, options).render
       end
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index cafcd93f58..7e33ca2fac 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -264,7 +264,6 @@ module ActionView
       # Finally, this method supports a <tt>:default</tt> option, which selects
       # a default ActiveSupport::TimeZone if the object's time zone is +nil+.
       #
-      # Examples:
       #   time_zone_select( "user", "time_zone", nil, :include_blank => true)
       #
       #   time_zone_select( "user", "time_zone", nil, :default => "Pacific Time (US & Canada)" )
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 7768c8c151..a727b910e5 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -69,8 +69,6 @@ module ActionView
       # html-scanner tokenizer and so its HTML parsing ability is limited by
       # that of html-scanner.
       #
-      # ==== Examples
-      #
       #   strip_tags("Strip <i>these</i> tags!")
       #   # => Strip these tags!
       #
@@ -85,7 +83,6 @@ module ActionView
 
       # Strips all link tags from +text+ leaving just the link text.
       #
-      # ==== Examples
       #   strip_links('<a href="http://www.rubyonrails.org">Ruby on Rails</a>')
       #   # => Ruby on Rails
       #
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index f7afa48256..d5cd60e8a1 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -103,7 +103,6 @@ module ActionView
       # otherwise be recognized as markup. CDATA sections begin with the string
       # <tt><![CDATA[</tt> and end with (and may not contain) the string <tt>]]></tt>.
       #
-      # ==== Examples
       #   cdata_section("<hello world>")
       #   # => <![CDATA[<hello world>]]>
       #
@@ -119,7 +118,6 @@ module ActionView
 
       # Returns an escaped version of +html+ without affecting existing escaped entities.
       #
-      # ==== Examples
       #   escape_once("1 < 2 &amp; 3")
       #   # => "1 &lt; 2 &amp; 3"
       #
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 698f4434ba..074cbb202d 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -37,7 +37,6 @@ module ActionView
       # do not operate as expected in an eRuby code block. If you absolutely must
       # output text within a non-output code block (i.e., <% %>), you can use the concat method.
       #
-      # ==== Examples
       #   <%
       #       concat "hello"
       #       # is the equivalent of <%= "hello" %>
@@ -67,8 +66,6 @@ module ActionView
       # used in views, unless wrapped by <tt>raw()</tt>. Care should be taken if +text+ contains HTML tags
       # or entities, because truncation may produce invalid HTML (such as unbalanced or incomplete tags).
       #
-      # ==== Examples
-      #
       #   truncate("Once upon a time in a world far far away")
       #   # => "Once upon a time in a world..."
       #
@@ -93,7 +90,6 @@ module ActionView
       # as a single-quoted string with <tt>\1</tt> where the phrase is to be inserted (defaults to
       # '<mark>\1</mark>')
       #
-      # ==== Examples
       #   highlight('You searched for: rails', 'rails')
       #   # => You searched for: <mark>rails</mark>
       #
@@ -133,7 +129,6 @@ module ActionView
       # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. The resulting string
       # will be stripped in any case. If the +phrase+ isn't found, nil is returned.
       #
-      # ==== Examples
       #   excerpt('This is an example', 'an', :radius => 5)
       #   # => ...s is an exam...
       #
@@ -181,7 +176,6 @@ module ActionView
       # +plural+ is supplied, it will use that when count is > 1, otherwise
       # it will use the Inflector to determine the plural form
       #
-      # ==== Examples
       #   pluralize(1, 'person')
       #   # => 1 person
       #
@@ -201,8 +195,6 @@ module ActionView
       # breaks on the first whitespace character that does not exceed +line_width+
       # (which is 80 by default).
       #
-      # ==== Examples
-      #
       #   word_wrap('Once upon a time')
       #   # => Once upon a time
       #
@@ -280,7 +272,6 @@ module ActionView
       # and passing the name of the cycle. The current cycle string can be obtained
       # anytime using the current_cycle method.
       #
-      # ==== Examples
       #   # Alternate CSS classes for even and odd numbers...
       #   @items = [1,2,3,4]
       #   <table>
@@ -326,7 +317,6 @@ module ActionView
       # for complex table highlighting or any other design need which requires
       # the current cycle string in more than one place.
       #
-      # ==== Example
       #   # Alternate background colors
       #   @items = [1,2,3,4]
       #   <% @items.each do |item| %>
@@ -342,7 +332,6 @@ module ActionView
       # Resets a cycle so that it starts from the first element the next time
       # it is called. Pass in +name+ to reset a named cycle.
       #
-      # ==== Example
       #   # Alternate CSS classes for even and odd numbers...
       #   @items = [[1,2,3,4], [5,6,3], [3,4,5,6,7,4]]
       #   <table>