diff options
Diffstat (limited to 'actionpack/lib')
10 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index bd250af90e..fd7e9e5244 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -577,7 +577,7 @@ module ActionController #:nodoc: # value that appears in the slot for <tt>:first</tt> is not equal to default value for <tt>:first</tt> we stop using # defaults. On it's own, this rule can account for much of the typical Rails URL behavior. # - # Although a convienence, defaults can occasionaly get in your way. In some cases a default persists longer than desired. + # Although a convenience, defaults can occasionally get in your way. In some cases a default persists longer than desired. # The default may be cleared by adding <tt>:name => nil</tt> to <tt>url_for</tt>'s options. # This is often required when writing form helpers, since the defaults in play may vary greatly depending upon where the # helper is used from. The following line will redirect to PostController's default action, regardless of the page it is @@ -983,7 +983,7 @@ module ActionController #:nodoc: # # When using <tt>redirect_to :back</tt>, if there is no referrer, # RedirectBackError will be raised. You may specify some fallback - # behavior for this case by rescueing RedirectBackError. + # behavior for this case by rescuing RedirectBackError. def redirect_to(options = {}) #:doc: case options when %r{^\w+://.*} diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e90e27c388..3689c335fc 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -291,7 +291,7 @@ module ActionController #:nodoc: end def extract_extension(file_path) - # Don't want just what comes after the last '.' to accomodate multi part extensions + # Don't want just what comes after the last '.' to accommodate multi part extensions # such as tar.gz. file_path[/^[^.]+\.(.+)$/, 1] end diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index 401726b855..ccdb54c2a1 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -102,7 +102,7 @@ module ActionController #:nodoc: # end # end # - # Finally, all the above styles can be mixed together, and the +helper+ method can be invokved with a mix of + # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of # +symbols+, +strings+, +modules+ and blocks. # helper(:three, BlindHelper) { def mice() 'mice' end } # diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index bfacfb26d1..677d25b6c9 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -304,7 +304,7 @@ module ActionController end end - # Get a temporarly URL writer object + # Get a temporary URL writer object def generic_url_rewriter cgi = MockCGI.new('REQUEST_METHOD' => "GET", 'QUERY_STRING' => "", diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb index 7ffc1fcfa8..1a3c770254 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb @@ -794,7 +794,7 @@ module HTML # eventually, and array of substitution values. # # This method is called from four places, so it helps to put it here - # for resue. The only logic deals with the need to detect comma + # for reuse. The only logic deals with the need to detect comma # separators (alternate) and apply them to the selector group of the # top selector. def next_selector(statement, values) diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb index 80bff8a4cd..fc8cd66d72 100644 --- a/actionpack/lib/action_view/helpers/capture_helper.rb +++ b/actionpack/lib/action_view/helpers/capture_helper.rb @@ -119,7 +119,7 @@ module ActionView # # The deprecated way of accessing a content_for block is to use an instance variable # named <tt>@content_for_#{name_of_the_content_block}</tt>. So <tt><%= content_for :footer %></tt> - # would be avaiable as <tt><%= @content_for_footer %></tt>. The preferred usage is now + # would be available as <tt><%= @content_for_footer %></tt>. The preferred usage is now # <tt><%= yield :footer %></tt>. def content_for(name, content = nil, &block) existing_content_for = instance_variable_get("@content_for_#{name}").to_s diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 8e7542e206..1ea3cbd74e 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -140,7 +140,7 @@ module ActionView javascript << "\n" << IO.read(filename) end - # load other librairies + # load other libraries (Dir.glob(File.join(JAVASCRIPT_PATH, '*')) - prototype_libs).each do |filename| javascript << "\n" << IO.read(filename) end diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index c6669ccde3..def33b9ee1 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -511,7 +511,7 @@ module ActionView # element's existing content. # <tt>:bottom</tt>:: HTML is inserted inside the element, after the # element's existing content. - # <tt>:before</tt>:: HTML is inserted immediately preceeding the element. + # <tt>:before</tt>:: HTML is inserted immediately preceding the element. # <tt>:after</tt>:: HTML is inserted immediately following the element. # # +options_for_render+ may be either a string of HTML to insert, or a hash diff --git a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb index 033000b004..83f4d168a8 100644 --- a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb +++ b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb @@ -30,7 +30,7 @@ module ActionView # variable in the generated JavaScript execution context. This can be # used for example with drop_receiving_element: # - # <%= drop_receving_element (...), :loading => visual_effect(:fade) %> + # <%= drop_receiving_element (...), :loading => visual_effect(:fade) %> # # This would fade the element that was dropped on the drop receiving # element. diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index f11eae7969..bb7ddefcad 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -82,7 +82,7 @@ module ActionView end # Extracts an excerpt from +text+ that matches the first instance of +phrase+. - # The +radius+ expands the excerpt on each side of the first occurance of +phrase+ by the number of characters + # The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters # defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+, # then the +excerpt_string+ will be prepended/appended accordingly. If the +phrase+ # isn't found, nil is returned. |