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

Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb

5 files changed, 6 insertions, 6 deletions

diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index ec475134ef..1650602d24 100644
--- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -2,7 +2,7 @@ require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/deprecation'
 
-# Retained for backward compatibility.  Methods are now included in Class.
+# Retained for backward compatibility. Methods are now included in Class.
 module ClassInheritableAttributes # :nodoc:
   DEPRECATION_WARNING_MESSAGE = "class_inheritable_attribute is deprecated, please use class_attribute method instead. Notice their behavior are slightly different, so refer to class_attribute documentation first"
 end
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 236055d77a..26a99658cc 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -103,7 +103,7 @@ class Date
   alias_method :minus_without_duration, :-
   alias_method :-, :minus_with_duration
 
-  # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with
+  # Provides precise Date calculations for years, months, and days. The +options+ parameter takes a hash with
   # any of these keys: <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>.
   def advance(options)
     options = options.dup
diff --git a/activesupport/lib/active_support/core_ext/file/atomic.rb b/activesupport/lib/active_support/core_ext/file/atomic.rb
index 26b73ed442..3645597301 100644
--- a/activesupport/lib/active_support/core_ext/file/atomic.rb
+++ b/activesupport/lib/active_support/core_ext/file/atomic.rb
@@ -1,5 +1,5 @@
 class File
-  # Write to a file atomically.  Useful for situations where you don't
+  # Write to a file atomically. Useful for situations where you don't
   # want other processes or threads to see half-written files.
   #
   #   File.atomic_write("important.file") do |file|
diff --git a/activesupport/lib/active_support/core_ext/kernel/agnostics.rb b/activesupport/lib/active_support/core_ext/kernel/agnostics.rb
index c0cb4fb427..64837d87aa 100644
--- a/activesupport/lib/active_support/core_ext/kernel/agnostics.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/agnostics.rb
@@ -1,11 +1,11 @@
 class Object
   # Makes backticks behave (somewhat more) similarly on all platforms.
   # On win32 `nonexistent_command` raises Errno::ENOENT; on Unix, the
-  # spawned shell prints a message to stderr and sets $?.  We emulate
+  # spawned shell prints a message to stderr and sets $?. We emulate
   # Unix on the former but not the latter.
   def `(command) #:nodoc:
     super
   rescue Errno::ENOENT => e
     STDERR.puts "#$0: #{e}"
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index fb5abf2aa5..8221dc4abe 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -22,7 +22,7 @@ class Object
   # <tt>object.presence</tt> is equivalent to <tt>object.present? ? object : nil</tt>.
   #
   # This is handy for any representation of objects where blank is the same
-  # as not present at all.  For example, this simplifies a common check for
+  # as not present at all. For example, this simplifies a common check for
   # HTTP POST/query parameters:
   #
   #   state   = params[:state]   if params[:state].present?