aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Makarevich <makaroni4@gmail.com>2012-07-26 22:44:36 +0400
committerAnatoly Makarevich <makaroni4@gmail.com>2012-07-26 22:44:36 +0400
commit103a31391b50e930b6cded6e73f721d0b4868697 (patch)
treeec6d8d2bb935720f678e36c24bff2571af9c9f15
parentb1d7283b2ac6763973e1a64475fc1c279cec8775 (diff)
downloadrails-103a31391b50e930b6cded6e73f721d0b4868697.tar.gz
rails-103a31391b50e930b6cded6e73f721d0b4868697.tar.bz2
rails-103a31391b50e930b6cded6e73f721d0b4868697.zip
fix typo in documentation
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb2
-rw-r--r--activesupport/lib/active_support/callbacks.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index fd3bed7e8f..f4c708ea33 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -102,7 +102,7 @@ module ActionDispatch
super
end
- # Hook overriden in controller to add request information
+ # Hook overridden in controller to add request information
# with `default_url_options`. Application logic should not
# go into url_options.
def url_options
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 6cc875c69a..8f79334159 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -78,7 +78,7 @@ module ActiveSupport
private
# A hook invoked everytime a before callback is halted.
- # This can be overriden in AS::Callback implementors in order
+ # This can be overridden in AS::Callback implementors in order
# to provide better debugging/logging.
def halted_callback_hook(filter)
end