From 9be59e49bfce68f8ac5a73c4322fe16a475d282e Mon Sep 17 00:00:00 2001 From: James Miller Date: Wed, 25 Aug 2010 14:36:10 -0700 Subject: Fix typo, favour => favor --- railties/guides/source/3_0_release_notes.textile | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'railties') diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile index 14da650e83..464fd66b7b 100644 --- a/railties/guides/source/3_0_release_notes.textile +++ b/railties/guides/source/3_0_release_notes.textile @@ -201,9 +201,9 @@ Finally a couple of enhancements were added to the rake tasks: Railties now deprecates: -* RAILS_ROOT in favour of Rails.root, -* RAILS_ENV in favour of Rails.env, and -* RAILS_DEFAULT_LOGGER in favour of Rails.logger. +* RAILS_ROOT in favor of Rails.root, +* RAILS_ENV in favor of Rails.env, and +* RAILS_DEFAULT_LOGGER in favor of Rails.logger. PLUGIN/rails/tasks, and PLUGIN/tasks are no longer loaded all tasks now must be in PLUGIN/lib/tasks. @@ -241,7 +241,7 @@ h4. Action Controller Deprecations: -* filter_parameter_logging is deprecated in favour of config.filter_parameters << :password. +* filter_parameter_logging is deprecated in favor of config.filter_parameters << :password. More Information: * "Render Options in Rails 3":http://www.engineyard.com/blog/2010/render-options-in-rails-3/ @@ -363,8 +363,8 @@ Validations have been moved from Active Record into Active Model, providing an i * The +validates+ method has the following options: * :acceptance => Boolean. * :confirmation => Boolean. - * :exclusion => { :in => Ennumerable }. - * :inclusion => { :in => Ennumerable }. + * :exclusion => { :in => Enumerable }. + * :inclusion => { :in => Enumerable }. * :format => { :with => Regexp, :on => :create }. * :length => { :maximum => Fixnum }. * :numericality => Boolean. @@ -452,7 +452,7 @@ h4. Patches and Deprecations Additionally, many fixes in the Active Record branch: -* SQLite 2 support has been dropped in favour of SQLite 3. +* SQLite 2 support has been dropped in favor of SQLite 3. * MySQL support for column order. * PostgreSQL adapter has had its +TIME ZONE+ support fixed so it no longer inserts incorrect values. * Support multiple schemas in table names for PostgreSQL. @@ -464,11 +464,11 @@ As well as the following deprecations: * +named_scope+ in an Active Record class is deprecated and has been renamed to just +scope+. * In +scope+ methods, you should move to using the relation methods, instead of a :conditions => {} finder method, for example scope :since, lambda {|time| where("created_at > ?", time) }. -* save(false) is deprecated, in favour of save(:validate => false). +* save(false) is deprecated, in favor of save(:validate => false). * I18n error messages for ActiveRecord should be changed from :en.activerecord.errors.template to :en.errors.template. -* model.errors.on is deprecated in favour of model.errors[] +* model.errors.on is deprecated in favor of model.errors[] * validates_presence_of => validates... :presence => true -* ActiveRecord::Base.colorize_logging and config.active_record.colorize_logging are deprecated in favour of Rails::LogSubscriber.colorize_logging or config.colorize_logging +* ActiveRecord::Base.colorize_logging and config.active_record.colorize_logging are deprecated in favor of Rails::LogSubscriber.colorize_logging or config.colorize_logging NOTE: While an implementation of State Machine has been in Active Record edge for some months now, it has been removed from the Rails 3.0 release. @@ -491,7 +491,7 @@ Active Resource was also extracted out to Active Model allowing you to use Activ * Renamed SchemaDefinition to Schema and define_schema to schema. * Use the format of Active Resources rather than the content-type of remote errors to load errors. * Use instance_eval for schema block. -* Fix ActiveResource::ConnectionError#to_s when +@response+ does not respond to #code or #message, handles Ruby 1.9 compat. +* Fix ActiveResource::ConnectionError#to_s when +@response+ does not respond to #code or #message, handles Ruby 1.9 compatibility. * Add support for errors in JSON format. * Ensure load works with numeric arrays. * Recognizes a 410 response from remote resource as the resource has been deleted. @@ -500,7 +500,7 @@ Active Resource was also extracted out to Active Model allowing you to use Activ Deprecations: -* save(false) is deprecated, in favour of save(:validate => false). +* save(false) is deprecated, in favor of save(:validate => false). * Ruby 1.9.2: URI.parse and .decode are deprecated and are no longer used in the library. @@ -551,7 +551,7 @@ The following methods have been removed because they are now available in Ruby 1 * Object#instance_variable_defined? * Enumerable#none? -The security patch for REXML remains in Active Support because early patchlevels of Ruby 1.8.7 still need it. Active Support knows whether it has to apply it or not. +The security patch for REXML remains in Active Support because early patch-levels of Ruby 1.8.7 still need it. Active Support knows whether it has to apply it or not. The following methods have been removed because they are no longer used in the framework: @@ -579,7 +579,7 @@ Action Mailer has been given a new API with TMail being replaced out with the ne Deprecations: -* :charset, :content_type, :mime_version, :implicit_parts_order are all deprecated in favour of ActionMailer.default :key => value style declarations. +* :charset, :content_type, :mime_version, :implicit_parts_order are all deprecated in favor of ActionMailer.default :key => value style declarations. * Mailer dynamic create_method_name and deliver_method_name are deprecated, just call method_name which now returns a Mail::Message object. * ActionMailer.deliver(message) is deprecated, just call message.deliver. * template_root is deprecated, pass options to a render call inside a proc from the format.mime_type method inside the mail generation block -- cgit v1.2.3