Merge branch 'master' of github.com:lifo/docrails

* 'master' of github.com:lifo/docrails:
  Getting Started guide: remove calls to f.error_messages as it has been removed from Rails
  deliver_* is no more
  removed unnecessary indentation
  added note with example for using flash in redirection
  corrected sample code to clear @_current_user class variable also
  the partial option is not required for simple partial rendering
  colorize_logging is a Rails General Configuration option not a specific option of ActiveRecord
  Fixed the name of the 'generator option'
  this reads better, i don't know what the other 'so on' are, doesn't help reader imho
  added missing word to clear up meaning in my previous commit
  Add a note to TextHelpers making explicit their default behavior of not escaping but sanitizing.
  removed indentation, for code style consistency and readibility
  Use Rails.logger, not ActiveRecord::Base.logger
  removed etc. not require
  added missing space and minor rewording
  corrected to Rails 3 syntax for declaring resources
  Fixes ActionMailer example error

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index bb38c64307..28fff5c11e 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -32,7 +32,7 @@ config.filter_parameters << :password
 This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object:
 
 <ruby>
-config.active_record.colorize_logging = false
+config.active_record.timestamped_migrations = false
 </ruby>
 
 Rails will use that particular setting to configure Active Record.
@@ -45,6 +45,8 @@ h4. Rails General Configuration
 
 * +config.cache_store+ configures which cache store to use for Rails caching. Options include +:memory_store+, +:file_store+, +:mem_cache_store+ or the name of your own custom class.
 
+* +config.colorize_logging+ (true by default) specifies whether or not to use ANSI color codes when logging information.
+
 * +config.controller_paths+ accepts an array of paths that will be searched for controllers. Defaults to +app/controllers+.
 
 * +config.database_configuration_file+ overrides the default path for the database configuration file. Default to +config/database.yml+.
@@ -105,8 +107,6 @@ h4. Configuring Active Record
 
 * +config.active_record.pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to +true+ (the default), then the Customer class will use the +customers+ table. If set to +false+, then the Customers class will use the +customer+ table.
 
-* +config.active_record.colorize_logging+ (true by default) specifies whether or not to use ANSI color codes when logging information from ActiveRecord.
-
 * +config.active_record.default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:local+.
 
 * +config.active_record.schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements.