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

Conflicts:
	activerecord/lib/active_record/core.rb

2 files changed, 7 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 083856b2ca..245849d706 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -5,7 +5,7 @@ module ActionView
 
   # = Action View Context
   #
-  # Action View contexts are supplied to Action Controller to render template.
+  # Action View contexts are supplied to Action Controller to render a template.
   # The default Action View context is ActionView::Base.
   #
   # In order to work with ActionController, a Context must just include this module.
@@ -25,7 +25,7 @@ module ActionView
     end
 
     # Encapsulates the interaction with the view flow so it
-    # returns the correct buffer on yield. This is usually
+    # returns the correct buffer on +yield+. This is usually
     # overwriten by helpers to add more behavior.
     # :api: plugin
     def _layout_for(name=nil)
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index fae1e44a8f..67117077dc 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -199,17 +199,19 @@ module ActionView
       #   # => Once upon a time
       #
       #   word_wrap('Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding a successor to the throne turned out to be more trouble than anyone could have imagined...')
-      #   # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\n a successor to the throne turned out to be more trouble than anyone could have\n imagined...
+      #   # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\na successor to the throne turned out to be more trouble than anyone could have\nimagined...
       #
       #   word_wrap('Once upon a time', :line_width => 8)
-      #   # => Once upon\na time
+      #   # => Once\nupon a\ntime
       #
       #   word_wrap('Once upon a time', :line_width => 1)
       #   # => Once\nupon\na\ntime
       #
       # You can still use <tt>word_wrap</tt> with the old API that accepts the
       # +line_width+ as its optional second parameter:
-      #   word_wrap('Once upon a time', 8)     # => Once upon\na time
+      #
+      #   word_wrap('Once upon a time', 8)
+      #   # => Once\nupon a\ntime
       def word_wrap(text, *args)
         options = args.extract_options!
         unless args.blank?