diff options
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 | ||||
| -rw-r--r-- | actionview/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/try.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 2c8a67db09..5bb34daf81 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -100,10 +100,10 @@ module AbstractController # Returns the full controller name, underscored, without the ending Controller. # - # class MyApp - # MyPostsController < AbstractController::Base + # class MyApp::MyPostsController < AbstractController::Base # end # end + # # MyApp::MyPostsController.controller_path # => "my_app/my_posts" # # ==== Returns diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 585d20c56c..5514213ad8 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -17,7 +17,7 @@ module AbstractController extend ActiveSupport::Concern include ActionView::ViewPaths - # Normalize arguments, options and then delegates render_to_body and + # Normalizes arguments, options and then delegates render_to_body and # sticks the result in <tt>self.response_body</tt>. # :api: public def render(*args, &block) diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 6357f8ac57..ec92f21d81 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,4 +1,4 @@ -* Default translations that have a lower precidence than an html safe default, +* Default translations that have a lower precedence than a html safe default, but are not themselves safe, should not be marked as html_safe. *Justin Coyne* diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb index 6b3fc48a3f..e0f70b9caa 100644 --- a/activesupport/lib/active_support/core_ext/object/try.rb +++ b/activesupport/lib/active_support/core_ext/object/try.rb @@ -63,7 +63,7 @@ class Object try!(*a, &b) if a.empty? || respond_to?(a.first) end - # Same as #try, but will raise a NoMethodError exception if the receiver is + # Same as #try, but raises a NoMethodError exception if the receiver is # not +nil+ and does not implement the tried method. # # "a".try!(:upcase) # => "A" |