From 2af36bbbd4c5a9967e5f3b4263100ef793aee4d7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 5 Dec 2007 18:54:41 +0000 Subject: Fix typos (closes #10378) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8301 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions.rb | 2 +- actionpack/lib/action_controller/base.rb | 12 ++++++------ actionpack/lib/action_controller/layout.rb | 2 +- actionpack/lib/action_controller/rescue.rb | 2 +- actionpack/lib/action_controller/routing_optimisation.rb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index ee4ad5c5ae..5b9a2b71f2 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -16,7 +16,7 @@ module ActionController #:nodoc: # assert flash.empty? # makes sure that there's nothing in the flash # # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To - # appease our yearning for symbols, though, an alternative accessor has been deviced using a method call instead of index referencing. + # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing. # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work. # # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url. diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b9fd25aa8f..379e88b9c5 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -164,7 +164,7 @@ module ActionController #:nodoc: # For removing objects from the session, you can either assign a single key to nil, like session[:person] = nil, or you can # remove the entire session with reset_session. # - # Sessions are stored in a browser cookie that's crytographically signed, but unencrypted, by default. This prevents + # Sessions are stored in a browser cookie that's cryptographically signed, but unencrypted, by default. This prevents # the user from tampering with the session but also allows him to see its contents. # # Do not put secret information in session! @@ -293,7 +293,7 @@ module ActionController #:nodoc: # The param_parsers hash lets you register handlers which will process the http body and add parameters to the # params hash. These handlers are invoked for post and put requests. # - # By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instanciated + # By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instantiated # in the params. This allows XML requests to mask themselves as regular form submissions, so you can have one # action serve both regular forms and web service requests. # @@ -454,10 +454,10 @@ module ActionController #:nodoc: view_paths.push(*path) end - # Replace sensitive paramater data from the request log. - # Filters paramaters that have any of the arguments as a substring. + # Replace sensitive parameter data from the request log. + # Filters parameters that have any of the arguments as a substring. # Looks in all subhashes of the param hash for keys to filter. - # If a block is given, each key and value of the paramater hash and all + # If a block is given, each key and value of the parameter hash and all # subhashes is passed to it, the value or key # can be replaced using String#replace or similar method. # @@ -590,7 +590,7 @@ module ActionController #:nodoc: # However, you might ask why the action from the current request, 'contacts', isn't carried over into the new URL. The # answer has to do with the order in which the parameters appear in the generated path. In a nutshell, since the # value that appears in the slot for :first is not equal to default value for :first we stop using - # defaults. On it's own, this rule can account for much of the typical Rails URL behavior. + # defaults. On its own, this rule can account for much of the typical Rails URL behavior. #   # 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 :name => nil to url_for's options. diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index c245fe2326..cbe0ea6587 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -70,7 +70,7 @@ module ActionController #:nodoc: # no layout explicitly assigned with the +layout+ method. Nested controllers use the same folder structure for automatic layout. # assignment. So an Admin::WeblogController will look for a template named app/views/layouts/admin/weblog.erb. # Setting a layout explicitly will always override the automatic behaviour for the controller where the layout is set. - # Explicitly setting the layout in a parent class, though, will not override the child class's layout assignement if the child + # Explicitly setting the layout in a parent class, though, will not override the child class's layout assignment if the child # class has a layout with the same name. # # == Inheritance for layouts diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 454d593df7..46611b7c00 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -227,7 +227,7 @@ module ActionController #:nodoc: # assume they should exist at this point. An early raised exception # could trigger some other handler and the array could include # precisely a string whose corresponding constant has not yet been - # seen. This is why we are tolerant to unkown constants. + # seen. This is why we are tolerant to unknown constants. # # Note that this tolerance only matters if the exception was given as # a string, otherwise a NameError will be raised by the interpreter diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb index 3669f5c950..ba4aeb4e82 100644 --- a/actionpack/lib/action_controller/routing_optimisation.rb +++ b/actionpack/lib/action_controller/routing_optimisation.rb @@ -8,7 +8,7 @@ module ActionController # :requirements, we can just build up a string and return it. # # To support building optimisations for other common cases, the - # generation code is seperated into several classes + # generation code is separated into several classes module Optimisation def generate_optimisation_block(route, kind) return "" unless route.optimise? -- cgit v1.2.3