Revert "Remove blank trailing comments"

This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.

Reason: Not a fan of such massive changes. We usually close such changes
if made to Rails master as a pull request. Following the same principle
here and reverting.

[ci skip]

29 files changed, 67 insertions, 0 deletions

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 529f920e6c..4e0672d590 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -90,6 +90,7 @@ module AbstractController
       # +symbols+, +strings+, +modules+ and blocks.
       #
       #   helper(:three, BlindHelper) { def mice() 'mice' end }
+      #
       def helper(*args, &block)
         modules_for_helpers(args).each do |mod|
           add_template_helper(mod)
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 90058245f5..71425cd542 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -167,6 +167,7 @@ module ActionController
   #     redirect_to(:action => "elsewhere") and return if monkeys.nil?
   #     render :action => "overthere" # won't be called if monkeys is nil
   #   end
+  #
   class Base < Metal
     abstract!
 
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 720c0f2258..92433ab462 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -9,6 +9,7 @@ module ActionController
   #   class PostsController < ApplicationController
   #     use AuthenticationMiddleware, :except => [:index, :show]
   #   end
+  #
   class MiddlewareStack < ActionDispatch::MiddlewareStack #:nodoc:
     class Middleware < ActionDispatch::MiddlewareStack::Middleware #:nodoc:
       def initialize(klass, *args, &block)
@@ -96,6 +97,7 @@ module ActionController
   #
   # You can refer to the modules included in <tt>ActionController::Base</tt> to see
   # other features you can bring into your metal controller.
+  #
   class Metal < AbstractController::Base
     abstract!
 
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 598bc6c5cb..86d061e3b7 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -47,6 +47,7 @@ module ActionController
   #
   #   23 Aug 11:30 | Carolina Railhawks Soccer Match
   #   N/A | Carolina Railhaws Training Workshop
+  #
   module Helpers
     extend ActiveSupport::Concern
 
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index d9fc777250..0b800c3c62 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -52,6 +52,7 @@ module ActionController #:nodoc:
       end
 
       # Clear all mime types in <tt>respond_to</tt>.
+      #
       def clear_respond_to
         self.mimes_for_respond_to = Hash.new.freeze
       end
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 5aa3b2ca15..83407846dc 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -142,11 +142,13 @@ module ActionController #:nodoc:
 
     # Initializes a new responder an invoke the proper format. If the format is
     # not defined, call to_format.
+    #
     def self.call(*args)
       new(*args).respond
     end
 
     # Main entry point for responder responsible to dispatch to the proper format.
+    #
     def respond
       method = "to_#{format}"
       respond_to?(method) ? send(method) : to_format
@@ -154,6 +156,7 @@ module ActionController #:nodoc:
 
     # HTML format does not render the resource, it always attempt to render a
     # template.
+    #
     def to_html
       default_render
     rescue ActionView::MissingTemplate => e
@@ -168,6 +171,7 @@ module ActionController #:nodoc:
     # All other formats follow the procedure below. First we try to render a
     # template, if the template is not available, we verify if the resource
     # responds to :to_format and display it.
+    #
     def to_format
       if get? || !has_errors? || response_overridden?
         default_render
@@ -205,12 +209,14 @@ module ActionController #:nodoc:
     end
 
     # Checks whether the resource responds to the current format or not.
+    #
     def resourceful?
       resource.respond_to?("to_#{format}")
     end
 
     # Returns the resource location by retrieving it from the options or
     # returning the resources array.
+    #
     def resource_location
       options[:location] || resources
     end
@@ -219,6 +225,7 @@ module ActionController #:nodoc:
 
     # If a response block was given, use it, otherwise call render on
     # controller.
+    #
     def default_render
       if @default_response
         @default_response.call(options)
@@ -243,6 +250,7 @@ module ActionController #:nodoc:
     # Results in:
     #
     #   render :xml => @user, :status => :created
+    #
     def display(resource, given_options={})
       controller.render given_options.merge!(options).merge!(format => resource)
     end
@@ -252,12 +260,14 @@ module ActionController #:nodoc:
     end
 
     # Check whether the resource has errors.
+    #
     def has_errors?
       resource.respond_to?(:errors) && !resource.errors.empty?
     end
 
     # By default, render the <code>:edit</code> action for HTML requests with errors, unless
     # the verb was POST.
+    #
     def default_action
       @action ||= DEFAULT_ACTIONS_FOR_VERBS[request.request_method_symbol]
     end
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 0c3caa9514..eeb37db2e7 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -194,6 +194,7 @@ module ActionController #:nodoc:
   # ==== Passenger
   #
   # To be described.
+  #
   module Streaming
     extend ActiveSupport::Concern
 
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index ca40ab9502..e31f3b823d 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -46,6 +46,7 @@ module ActionDispatch
       #   GET /posts/5.xml   | request.format => Mime::XML
       #   GET /posts/5.xhtml | request.format => Mime::HTML
       #   GET /posts/5       | request.format => Mime::HTML or MIME::JS, or request.accepts.first
+      #
       def format(view_path = [])
         formats.first
       end
@@ -81,6 +82,7 @@ module ActionDispatch
 
       # Receives an array of mimes and return the first user sent mime that
       # matches the order array.
+      #
       def negotiate_mime(order)
         formats.each do |priority|
           if priority == Mime::ALL
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 23415dae54..2f6968eb2e 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -22,6 +22,7 @@ module ActionDispatch
   # is false. Callbacks may be registered even when it is not included in the
   # middleware stack, but are executed only when <tt>ActionDispatch::Reloader.prepare!</tt>
   # or <tt>ActionDispatch::Reloader.cleanup!</tt> are called manually.
+  #
   class Reloader
     include ActiveSupport::Callbacks
 
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index a2a6fb39dc..38a0270151 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -277,6 +277,7 @@ module ActionDispatch
   #   rake routes
   #
   # Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
+  #
   module Routing
     autoload :Mapper, 'action_dispatch/routing/mapper'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 79eee21619..67a208263b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -897,6 +897,7 @@ module ActionDispatch
       #   resources :articles, :id => /[^\/]+/
       #
       # This allows any character other than a slash as part of your +:id+.
+      #
       module Resources
         # CANONICAL_ACTIONS holds all actions that does not need a prefix or
         # a path appended since they fit properly in their scope level.
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 817cdb2d4e..8fde667108 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -51,6 +51,7 @@ module ActionDispatch
     #
     #   polymorphic_url([blog, @post])  # calls blog.post_path(@post)
     #   form_for([blog, @post])         # => "/blog/posts/1"
+    #
     module PolymorphicRoutes
       # Constructs a call to a named RESTful route for the given record and returns the
       # resulting URL string. For example:
@@ -83,6 +84,7 @@ module ActionDispatch
       #
       #   # the class of a record will also map to the collection
       #   polymorphic_url(Comment) # same as comments_url()
+      #
       def polymorphic_url(record_or_hash_or_array, options = {})
         if record_or_hash_or_array.kind_of?(Array)
           record_or_hash_or_array = record_or_hash_or_array.compact
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index d8beba4397..b3823bb496 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -121,6 +121,7 @@ module ActionDispatch
       # a string.
       #
       #   match 'accounts/:name' => redirect(SubdomainRedirector.new('api'))
+      #
       def redirect(*args, &block)
         options = args.extract_options!
         status  = options.delete(:status) || 301
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c5601a82d6..0ae668d42a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -180,6 +180,7 @@ module ActionDispatch
           # Also allow options hash, so you can do:
           #
           #   foo_url(bar, baz, bang, :sort_by => 'baz')
+          #
           def define_url_helper(route, name, options)
             selector = url_helper_name(name, options[:only_path])
 
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 207f56aaea..fd3bed7e8f 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -79,6 +79,7 @@ module ActionDispatch
     #   end
     #
     #   User.find(1).base_uri # => "/users/1"
+    #
     module UrlFor
       extend ActiveSupport::Concern
       include PolymorphicRoutes
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 1539b894c9..567ca0c392 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -140,6 +140,7 @@ module ActionDispatch
       #       end
       #     end
       #   end
+      #
       def with_routing
         old_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
         if defined?(@controller) && @controller
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 d7df9ea0d5..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
@@ -139,6 +139,7 @@ module ActionView
         # you have too many stylesheets for IE to load.
         #
         #   stylesheet_link_tag :all, :concat => true
+        #
         def stylesheet_link_tag(*sources)
           @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
           @stylesheet_include.include_tag(*sources)
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index c1f47a2eac..397738dd98 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -33,6 +33,7 @@ module ActionView
       #   <body>
       #   <b><%= @greeting %></b>
       #   </body></html>
+      #
       def capture(*args)
         value = nil
         buffer = with_output_buffer { value = yield(*args) }
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 12576ecd01..fc81bcea80 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -763,6 +763,7 @@ module ActionView
       #
       #   text_field(:snippet, :code, :size => 20, :class => 'code_input')
       #   # => <input type="text" id="snippet_code" name="snippet[code]" size="20" value="#{@snippet.code}" class="code_input" />
+      #
       def text_field(object_name, method, options = {})
         Tags::TextField.new(object_name, method, self, options).render
       end
@@ -784,6 +785,7 @@ module ActionView
       #
       #   password_field(:account, :pin, :size => 20, :class => 'form_input')
       #   # => <input type="password" id="account_pin" name="account[pin]" size="20" class="form_input" />
+      #
       def password_field(object_name, method, options = {})
         Tags::PasswordField.new(object_name, method, self, options).render
       end
@@ -822,6 +824,7 @@ module ActionView
       #
       #   file_field(:attachment, :file, :class => 'file_input')
       #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
+      #
       def file_field(object_name, method, options = {})
         Tags::FileField.new(object_name, method, self, options).render
       end
@@ -910,6 +913,7 @@ module ActionView
       #   check_box("eula", "accepted", { :class => 'eula_check' }, "yes", "no")
       #   # => <input name="eula[accepted]" type="hidden" value="no" />
       #   #    <input type="checkbox" class="eula_check" id="eula_accepted" name="eula[accepted]" value="yes" />
+      #
       def check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
         Tags::CheckBox.new(object_name, method, self, checked_value, unchecked_value, options).render
       end
@@ -962,6 +966,7 @@ module ActionView
       #
       #   telephone_field("user", "phone")
       #   # => <input id="user_phone" name="user[phone]" type="tel" />
+      #
       def telephone_field(object_name, method, options = {})
         Tags::TelField.new(object_name, method, self, options).render
       end
@@ -980,6 +985,7 @@ module ActionView
       #   @user.born_on = Date.new(1984, 1, 27)
       #   date_field("user", "born_on", value: "1984-05-12")
       #   # => <input id="user_born_on" name="user[born_on]" type="date" value="1984-05-12" />
+      #
       def date_field(object_name, method, options = {})
         Tags::DateField.new(object_name, method, self, options).render
       end
@@ -996,6 +1002,7 @@ module ActionView
       # === Example
       #   time_field("task", "started_at")
       #   # => <input id="task_started_at" name="task[started_at]" type="time" />
+      #
       def time_field(object_name, method, options = {})
         Tags::TimeField.new(object_name, method, self, options).render
       end
@@ -1004,6 +1011,7 @@ module ActionView
       #
       #   url_field("user", "homepage")
       #   # => <input id="user_homepage" name="user[homepage]" type="url" />
+      #
       def url_field(object_name, method, options = {})
         Tags::UrlField.new(object_name, method, self, options).render
       end
@@ -1012,6 +1020,7 @@ module ActionView
       #
       #   email_field("user", "address")
       #   # => <input id="user_address" name="user[address]" type="email" />
+      #
       def email_field(object_name, method, options = {})
         Tags::EmailField.new(object_name, method, self, options).render
       end
@@ -1191,6 +1200,7 @@ module ActionView
       #       submit:
       #         post:
       #           create: "Add %{model}"
+      #
       def submit(value=nil, options={})
         value, options = nil, value if value.is_a?(Hash)
         value ||= submit_default_value
@@ -1223,6 +1233,7 @@ module ActionView
       #       submit:
       #         post:
       #           create: "Add %{model}"
+      #
       def button(value=nil, options={})
         value, options = nil, value if value.is_a?(Hash)
         value ||= submit_default_value
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 90fa1f3520..eef426703d 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -98,6 +98,7 @@ module ActionView
     #     <option value="3">Jokes</option>
     #     <option value="4">Poems</option>
     #   </select>
+    #
     module FormOptionsHelper
       # ERB::Util can mask some helpers like textilize. Make sure to include them.
       include TextHelper
@@ -153,6 +154,7 @@ module ActionView
       # key in the query string, that works for ordinary forms.
       #
       # In case if you don't want the helper to generate this hidden field you can specify <tt>:include_blank => false</tt> option.
+      #
       def select(object, method, choices, options = {}, html_options = {})
         Tags::Select.new(object, method, self, choices, options, html_options).render
       end
@@ -239,6 +241,7 @@ module ActionView
       #       <option value="2">Ireland</option>
       #     </optgroup>
       #   </select>
+      #
       def grouped_collection_select(object, method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
         Tags::GroupedCollectionSelect.new(object, method, self, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options).render
       end
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 07453c4b50..e65b4e3e95 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -63,6 +63,7 @@ module ActionView
       #
       #   form_tag('http://far.away.com/form', :authenticity_token => "cf50faa3fe97702ca1ae")
       #   # form with custom authenticity token
+      #
       def form_tag(url_for_options = {}, options = {}, &block)
         html_options = html_options_for_form(url_for_options, options)
         if block_given?
@@ -408,6 +409,7 @@ module ActionView
       #
       #   submit_tag "Save", :confirm => "Are you sure?"
       #   # => <input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />
+      #
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
 
@@ -444,6 +446,7 @@ module ActionView
       #   # => <button name="button" type="button">
       #   #     <strong>Ask me!</strong>
       #   #    </button>
+      #
       def button_tag(content_or_options = nil, options = nil, &block)
         options = content_or_options if block_given? && content_or_options.is_a?(Hash)
         options ||= {}
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 9e43a1faf1..dfc26acfad 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -514,6 +514,7 @@ module ActionView
       #  number_to_human(343, :units => :distance, :precision => 1)                # => "300 meters"
       #  number_to_human(1, :units => :distance)                                   # => "1 meter"
       #  number_to_human(0.34, :units => :distance)                                # => "34 centimeters"
+      #
       def number_to_human(number, options = {})
         options = options.symbolize_keys
 
diff --git a/actionpack/lib/action_view/helpers/output_safety_helper.rb b/actionpack/lib/action_view/helpers/output_safety_helper.rb
index 891dd859fa..2e7e9dc50c 100644
--- a/actionpack/lib/action_view/helpers/output_safety_helper.rb
+++ b/actionpack/lib/action_view/helpers/output_safety_helper.rb
@@ -26,6 +26,7 @@ module ActionView #:nodoc:
       #
       #   safe_join(["<p>foo</p>".html_safe, "<p>bar</p>".html_safe], "<br />".html_safe)
       #   # => "<p>foo</p><br /><p>bar</p>"
+      #
       def safe_join(array, sep=$,)
         sep = ERB::Util.html_escape(sep)
 
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 8734136f39..9b35f076e5 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -29,6 +29,7 @@ module ActionView
       #
       #    <div id="person_123" class="person foo"> Joe Bloggs </div>
       #    <div id="person_124" class="person foo"> Jane Bloggs </div>
+      #
       def div_for(record, *args, &block)
         content_tag_for(:div, record, *args, &block)
       end
@@ -78,6 +79,7 @@ module ActionView
       # produces:
       #
       #    <li id="person_123" class="person bar">...
+      #
       def content_tag_for(tag_name, single_or_multiple_records, prefix = nil, options = nil, &block)
         options, prefix = prefix, nil if prefix.is_a?(Hash)
 
diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb
index 55fb443929..626e1a1ab7 100644
--- a/actionpack/lib/action_view/helpers/rendering_helper.rb
+++ b/actionpack/lib/action_view/helpers/rendering_helper.rb
@@ -75,6 +75,7 @@ module ActionView
       #   <html>
       #     Hello David
       #   </html>
+      #
       def _layout_for(*args, &block)
         name = args.first
 
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index ba74217c12..a727b910e5 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -55,6 +55,7 @@ module ActionView
       # resulting markup is valid (conforming to a document type) or even well-formed.
       # The output may still contain e.g. unescaped '<', '>', '&' characters and
       # confuse browsers.
+      #
       def sanitize(html, options = {})
         self.class.white_list_sanitizer.sanitize(html, options).try(:html_safe)
       end
@@ -143,6 +144,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.full_sanitizer = MySpecialSanitizer.new
         #   end
+        #
         def full_sanitizer
           @full_sanitizer ||= HTML::FullSanitizer.new
         end
@@ -153,6 +155,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.link_sanitizer = MySpecialSanitizer.new
         #   end
+        #
         def link_sanitizer
           @link_sanitizer ||= HTML::LinkSanitizer.new
         end
@@ -163,6 +166,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.white_list_sanitizer = MySpecialSanitizer.new
         #   end
+        #
         def white_list_sanitizer
           @white_list_sanitizer ||= HTML::WhiteListSanitizer.new
         end
@@ -172,6 +176,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_uri_attributes = 'lowsrc', 'target'
         #   end
+        #
         def sanitized_uri_attributes=(attributes)
           HTML::WhiteListSanitizer.uri_attributes.merge(attributes)
         end
@@ -181,6 +186,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_bad_tags = 'embed', 'object'
         #   end
+        #
         def sanitized_bad_tags=(attributes)
           HTML::WhiteListSanitizer.bad_tags.merge(attributes)
         end
@@ -190,6 +196,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
         #   end
+        #
         def sanitized_allowed_tags=(attributes)
           HTML::WhiteListSanitizer.allowed_tags.merge(attributes)
         end
@@ -199,6 +206,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_attributes = 'onclick', 'longdesc'
         #   end
+        #
         def sanitized_allowed_attributes=(attributes)
           HTML::WhiteListSanitizer.allowed_attributes.merge(attributes)
         end
@@ -208,6 +216,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_css_properties = 'expression'
         #   end
+        #
         def sanitized_allowed_css_properties=(attributes)
           HTML::WhiteListSanitizer.allowed_css_properties.merge(attributes)
         end
@@ -217,6 +226,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_css_keywords = 'expression'
         #   end
+        #
         def sanitized_allowed_css_keywords=(attributes)
           HTML::WhiteListSanitizer.allowed_css_keywords.merge(attributes)
         end
@@ -226,6 +236,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_shorthand_css_properties = 'expression'
         #   end
+        #
         def sanitized_shorthand_css_properties=(attributes)
           HTML::WhiteListSanitizer.shorthand_css_properties.merge(attributes)
         end
@@ -235,6 +246,7 @@ module ActionView
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_protocols = 'ssh', 'feed'
         #   end
+        #
         def sanitized_allowed_protocols=(attributes)
           HTML::WhiteListSanitizer.allowed_protocols.merge(attributes)
         end
diff --git a/actionpack/lib/action_view/helpers/tags/select.rb b/actionpack/lib/action_view/helpers/tags/select.rb
index 4d94ee2c23..53a108b7e6 100644
--- a/actionpack/lib/action_view/helpers/tags/select.rb
+++ b/actionpack/lib/action_view/helpers/tags/select.rb
@@ -31,6 +31,7 @@ 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/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 2e45a2ae0f..7e69547dab 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -586,6 +586,7 @@ module ActionView
       #
       #   current_page?(:controller => 'product', :action => 'index')
       #   # => false
+      #
       def current_page?(options)
         unless request
           raise "You cannot use helpers that need to determine the current " \
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index d267a8466a..fa2038f78d 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -215,6 +215,7 @@ module ActionView
   # * <tt>:locale</tt> - possible locale versions
   # * <tt>:formats</tt> - possible request formats (for example html, json, xml...)
   # * <tt>:handlers</tt> - possible handlers (for example erb, haml, builder...)
+  #
   class FileSystemResolver < PathResolver
     def initialize(path, pattern=nil)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)