Permalink
Browse files

Merge pull request #7170 from makaroni4/master

Fix typo in documentation
  • Loading branch information...
2 parents b1d7283 + 103a313 commit f4c2a12f19504833223279e18d5a47c877805fce @rafaelfranca rafaelfranca committed Jul 26, 2012
@@ -102,7 +102,7 @@ def initialize(*)
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
@@ -78,7 +78,7 @@ def run_callbacks(kind, &block)
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

0 comments on commit f4c2a12

Please sign in to comment.