Merge commit 'mainstream/master'

Conflicts:

	actionmailer/lib/action_mailer/base.rb
	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_controller/mime_type.rb
	railties/doc/guides/html/activerecord_validations_callbacks.html
	railties/doc/guides/html/caching_with_rails.html
	railties/doc/guides/html/command_line.html
	railties/doc/guides/html/configuring.html
	railties/doc/guides/html/creating_plugins.html
	railties/doc/guides/html/finders.html
	railties/doc/guides/html/routing_outside_in.html
	railties/doc/guides/source/activerecord_validations_callbacks.txt
	railties/doc/guides/source/caching_with_rails.txt
	railties/doc/guides/source/command_line.txt
	railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
	railties/doc/guides/source/creating_plugins/controllers.txt
	railties/doc/guides/source/creating_plugins/core_ext.txt
	railties/doc/guides/source/creating_plugins/helpers.txt
	railties/doc/guides/source/creating_plugins/index.txt
	railties/doc/guides/source/creating_plugins/migration_generator.txt
	railties/doc/guides/source/creating_plugins/models.txt
	railties/doc/guides/source/creating_plugins/odds_and_ends.txt
	railties/doc/guides/source/creating_plugins/routes.txt
	railties/doc/guides/source/finders.txt
	railties/doc/guides/source/routing_outside_in.txt
	railties/doc/guides/source/testing_rails_applications.txt

1 files changed, 72 insertions, 0 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index ae20cb50da..ca49c5d1c7 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,75 @@
+*2.3.0 [Edge]*
+
+* Add "-m/--template" option to Rails generator to apply a template to the generated application. [Jeremy McAnally]
+
+    This has been extracted from rg - http://github.com/jeremymcanally/rg
+    
+    Example:
+    
+        # template.rb
+        
+        # Install plugins from git or svn
+        plugin "will-paginate", :git => "git://github.com/mislav/will_paginate.git"
+        plugin "old-restful-auth", :svn => "http://svn.techno-weenie.net/projects/plugins/restful_authentication/"
+    
+        # Add gems to environment.rb
+        gem "jeremymcanally-context"
+        gem "bluecloth"
+    
+        # Vendor file. Data in a string or...
+        vendor("borrowed.rb", <<CODE
+          def helpful_method
+            do_something_helpful_here
+          end
+        CODE
+    
+        # ...file data from block return value.
+        # #initializer creates a new initializer file
+        initializer("crypto.rb") do
+          salt = "--#{Time.now}--#{rand}--#{srand(Time.now.to_i)}"
+    
+          "SPECIAL_SALT = '#{salt}'"
+        end
+    
+    Usage:
+    
+      To use a template, provide a file path or URL:
+    
+      1. Using a local file :
+
+        rails <application name> -m /path/to/my/template.rb
+        
+      2. Or directly from a URL :
+
+        rails <application name> --template=http://gist.github.com/31208.txt
+
+* Extracted the process scripts (inspector, reaper, spawner) into the plugin irs_process_scripts [DHH]
+
+* Changed Rails.root to return a Pathname object (allows for Rails.root.join('app', 'controllers') => "#{RAILS_ROOT}/app/controllers") #1482 [Damian Janowski/?]
+
+* Added view path support for engines [DHH]
+
+* Added that config/routes.rb files in engine plugins are automatically loaded (and reloaded when they change in dev mode) [DHH]
+
+* Added app/[models|controllers|helpers] to the load path for plugins that has an app directory (go engines ;)) [DHH]
+
+* Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. Turn this on for Passenger and JRuby. Also turned on by config.threadsafe!  [Jeremy Kemper]
+
+* Add a rake task to generate dispatchers : rake rails:generate_dispatchers [Pratik]
+
+* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik]
+
+* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
+
+* Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [DHH]
+
+* Switch from Test::Unit::TestCase to ActiveSupport::TestCase.  [Jeremy Kemper]
+
+* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
+
+* BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]
+
+
 *2.2.1 [RC2] (November 14th, 2008)*
 
 * Fixed plugin generator so that generated unit tests would subclass ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements #1137 [Mathias Meyer]