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

Conflicts:
	guides/source/configuring.md

actionview/lib/action_view/digestor.rb

@@ -12,7 +12,7 @@ module ActionView
       # Supported options:
       #
       # * <tt>name</tt>   - Template name
-      # * <tt>finder</tt>  - An instance of ActionView::LookupContext
+      # * <tt>finder</tt>  - An instance of <tt>ActionView::LookupContext</tt>
       # * <tt>dependencies</tt>  - An array of dependent views
       # * <tt>partial</tt>  - Specifies whether the template is a partial
       def digest(options)

actionview/lib/action_view/helpers/date_helper.rb

@@ -485,7 +485,7 @@ 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.
       #
-      #   my_time = Time.now + 16.minutes
+      #   my_time = Time.now + 16.seconds
       #
       #   # Generates a select field for seconds that defaults to the seconds for the time in my_time.
       #   select_second(my_time)

actionview/lib/action_view/lookup_context.rb

@@ -6,7 +6,7 @@ require 'action_view/template/resolver'
 module ActionView
   # = Action View Lookup Context
   #
-  # LookupContext is the object responsible to hold all information required to lookup
+  # <tt>LookupContext</tt> is the object responsible to hold all information required to lookup
   # templates, i.e. view paths and details. The LookupContext is also responsible to
   # generate a key, given to view paths, used in the resolver cache lookup. Since
   # this key is generated just once during the request, it speeds up all cache accesses.

actionview/lib/action_view/rendering.rb

@@ -59,7 +59,7 @@ module ActionView
       @_view_context_class ||= self.class.view_context_class
     end
 
-    # An instance of a view class. The default view class is ActionView::Base
+    # An instance of a view class. The default view class is ActionView::Base.
     #
     # The view class must have the following methods:
     # View.new[lookup_context, assigns, controller]

actionview/lib/action_view/view_paths.rb

@@ -36,8 +36,8 @@ module ActionView
       self.class._prefixes
     end
 
-    # LookupContext is the object responsible to hold all information required to lookup
-    # templates, i.e. view paths and details. Check ActionView::LookupContext for more
+    # <tt>LookupContext</tt> is the object responsible to hold all information required to lookup
+    # templates, i.e. view paths and details. Check <tt>ActionView::LookupContext</tt> for more
     # information.
     def lookup_context
       @_lookup_context ||=

activejob/lib/active_job/queue_name.rb

@@ -39,7 +39,7 @@ module ActiveJob
       self.queue_name_delimiter = '_' # set default delimiter to '_'
     end
 
-    # Returns the name of the queue the job will be run on
+    # Returns the name of the queue the job will be run on.
     def queue_name
       if @queue_name.is_a?(Proc)
         @queue_name = self.class.queue_name_from_part(instance_exec(&@queue_name))

guides/source/action_view_overview.md

@@ -725,7 +725,7 @@ Returns a select tag with options for each of the seconds 0 through 59 with the
 
 ```ruby
 # Generates a select field for seconds that defaults to the seconds for the time provided
-select_second(Time.now + 16.minutes)
+select_second(Time.now + 16.seconds)
 ```
 
 #### select_time
@@ -1429,7 +1429,7 @@ This sanitize helper will HTML encode all tags and strip all attributes that are
 sanitize @article.body
 ```
 
-If either the `:attributes` or `:tags` options are passed, only the mentioned tags and attributes are allowed and nothing else.
+If either the `:attributes` or `:tags` options are passed, only the mentioned attributes and tags are allowed and nothing else.
 
 ```ruby
 sanitize @article.body, tags: %w(table tr td), attributes: %w(id class style)

guides/source/rails_on_rack.md

@@ -327,8 +327,6 @@ Resources
 
 * [Official Rack Website](http://rack.github.io)
 * [Introducing Rack](http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html)
-* [Ruby on Rack #1 - Hello Rack!](http://m.onkey.org/ruby-on-rack-1-hello-rack)
-* [Ruby on Rack #2 - The Builder](http://m.onkey.org/ruby-on-rack-2-the-builder)
 
 ### Understanding Middlewares