Update CHANGELOGs for 3.0 release and upcoming 3.1

8 files changed, 26 insertions, 140 deletions

diff --git a/Rakefile b/Rakefile
index 092d854c35..5065fb286b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -144,6 +144,7 @@ task :rdoc do
   FileUtils.copy "activerecord/examples/associations.png", "doc/rdoc/files/examples/associations.png"
 end
 
+desc 'Bump all versions to match version.rb'
 task :update_versions do
   require File.dirname(__FILE__) + "/version"
 
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 3b82023641..62c1402346 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,19 +1,9 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
 
 * No changes
 
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") [JK]
 
@@ -21,16 +11,10 @@
 
 * Added ability to pass Proc objects to the defaults hash [ML]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
 
 * Lot of updates to various test cases that now work better with the new Mail and so have different expectations
 
-
-*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-
 * Added interceptors and observers from Mail [ML]
 
     ActionMailer::Base.register_interceptor calls Mail.register_interceptor
@@ -48,9 +32,6 @@
 
 * Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
 
-
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc.  If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
 
 * Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 00cde0c652..75d0632a6d 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,9 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
+
+* No changes
+
+
+*Rails 3.0.0 (August 29, 2010)*
 
 * password_field renders with nil value by default making the use of passwords secure by default, if you want to render you should do for instance f.password_field(:password, :value => @user.password) [Santiago Pastorino]
 
@@ -6,18 +11,12 @@
 
 * Add clear_helpers as a way to clean up all helpers added to this controller, maintaing just the helper with the same name as the controller. [José Valim]
 
-
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
 * See http://github.com/rails/rails/compare/v3.0.0_RC...v3.0.0_RC2 for gory details
 
 * Support routing constraints in functional tests. [Andrew White]
 
 * Add a header that tells Internet Explorer (all versions) to use the best available standards support. [Yehuda Katz]
 
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
-
 * Allow stylesheet/javascript extensions to be changed through railties. [Josh Kalderimis]
 
 * link_to, button_to, and tag/tag_options now rely on html_escape instead of escape_once. [fxn]
@@ -51,9 +50,6 @@
 
 * Removed textilize, textilize_without_paragraph and markdown helpers. [Santiago Pastorino]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * Remove middleware laziness [José Valim]
 
 * Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. [José Valim]
@@ -70,9 +66,6 @@
 
 * Changed translate helper so that it doesn’t mark every translation as safe HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. [Craig Davey]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> [spastorino]
 
 * Removed verify method in controllers. [JV]
@@ -107,9 +100,6 @@
   "HEAD" and #request_method returns "GET" in HEAD requests). This
   is for compatibility with Rack::Request [YK]
 
-
-*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-
 * #concat is now deprecated in favor of using <%= %> helpers [YK]
 
 * Block helpers now return Strings, so you can use <%= form_for @foo do |f| %>.
@@ -138,9 +128,6 @@
     # for just url_for
     include Rails.application.router.url_for
 
-
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * Fixed that PrototypeHelper#update_page should return html_safe [DHH]
 
 * Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 20eb1c9ad2..9c65778b59 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,30 +1,14 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
 
 * No changes
 
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * Added ActiveModel::MassAssignmentSecurity [Eric Chapweske, Josh Kalderimis]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * JSON supports a custom root option: to_json(:root => 'custom')  #4515 [Jatinder Singh]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-
 * #new_record? and #destroyed? were removed from ActiveModel::Lint. Use
   persisted? instead. A model is persisted if it's not a new_record? and it was
   not destroyed? [MG]
@@ -37,19 +21,15 @@
 * #to_key was added to ActiveModel::Lint so we can generate DOM IDs for
   AMo objects with composite keys [MG]
 
-
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * ActiveModel::Observer#add_observer!
 
   It has a custom hook to define after_find that should really be in a
   ActiveRecord::Observer subclass:
 
-	  def add_observer!(klass)
-	    klass.add_observer(self)
-	    klass.class_eval 'def after_find() end' unless
-				klass.respond_to?(:after_find)
-	  end
+    def add_observer!(klass)
+      klass.add_observer(self)
+      klass.class_eval 'def after_find() end' unless klass.respond_to?(:after_find)
+    end
 
 * Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH]
 
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 262db3c5ca..62f1470287 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,14 +1,9 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
 
 * No changes
 
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
 
@@ -20,9 +15,6 @@
 
 * PostgreSQL: ensure the database time zone matches Ruby's time zone #4895 [Aaron Patterson]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * Fixed that ActiveRecord::Base.compute_type would swallow NoMethodError #4751 [Andrew Bloomgarden, Andrew White]
 
 * Add index length support for MySQL. #1852 [Emili Parreno, Pratik Naik]
@@ -47,9 +39,6 @@
 
 * Observers can prevent records from saving by returning false, just like before_save and friends.  #4087 [Mislav Marohnić]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * Add Relation extensions. [Pratik Naik]
 
   users = User.where(:admin => true).extending(User::AdminPowers)
@@ -64,9 +53,6 @@
 
 * Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH]
 
-
-*Rails 3.0.0 [Beta 1] (February 4th, 2010)*
-
 * PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 [Jack Christensen]
 
 * Allow relations to be used as scope.
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 7fc621f005..37da2a711c 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,30 +1,12 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
 
 * No changes
 
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  [Santiago Pastorino]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * Add support for errors in JSON format.  #1956 [Fabien Jakimowicz]
 
 * Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh]
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index f05cdcb8f4..84cdc22e40 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,16 +1,13 @@
-*Rails 3.0.0 (unreleased)*
-
-* Implemented String#strip_heredoc. [fxn]
-
-* Pluggable cache stores: setting config.cache_store = "custom_store" will require 'active_support/cache/custom_store' and look for the CustomStore constant.  #5486 [Mike Perham]
+*Rails 3.1.0 (unreleased)*
 
+* No changes
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
 
-* No changes
+*Rails 3.0.0 (August 29, 2010)*
 
+* Implemented String#strip_heredoc. [fxn]
 
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+* Pluggable cache stores: setting config.cache_store = "custom_store" will require 'active_support/cache/custom_store' and look for the CustomStore constant.  #5486 [Mike Perham]
 
 * Removed Object#returning, Object#tap should be used instead. [Santiago Pastorino]
 
@@ -30,9 +27,6 @@
 
 * Date#since, #ago, #beginning_of_day, #end_of_day, and #xmlschema honor now the user time zone if set. [Geoff Buesing]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * Extracted String#truncate from TextHelper#truncate [DHH]
 
 * Ruby 1.9: support UTF-8 case folding.  #4595 [Norman Clarke]
@@ -85,18 +79,12 @@
 
 * JSON: encode objects that don't have a native JSON representation using to_hash, if available, instead of instance_values (the old fallback) or to_s (other encoders' default). Encode BigDecimal and Regexp encode as strings to conform with other encoders. Try to transcode non-UTF-8 strings.  [Jeremy Kemper]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * HashWithIndifferentAccess: remove inherited symbolize_keys! since its keys are always strings.  [Santiago Pastorino]
 
 * Improve transliteration quality.  #4374 [Norman Clarke]
 
 * Speed up and add Ruby 1.9 support for ActiveSupport::Multibyte::Chars#tidy_bytes.  #4350 [Norman Clarke]
 
-
-*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-
 * Reduced load time by deferring configuration of classes using
   ActiveSupport::on_load(:component_name) [YK]
 
@@ -108,9 +96,6 @@
 
 * JSON backend for YAJL. Preferred if available.  #2666 [Brian Lopez]
 
-
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * Introduce class_attribute to declare inheritable class attributes. Writing an attribute on a subclass behaves just like overriding the superclass reader method.  Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute.  [Jeremy Kemper, Yehuda Katz]
 
 * Time#- with a DateTime argument behaves the same as with a Time argument, i.e. returns the difference between self and arg as a Float #3476 [Geoff Buesing]
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 046b555a89..6add449cc4 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,14 +1,9 @@
-*Rails 3.0.0 (unreleased)*
+*Rails 3.1.0 (unreleased)*
 
 * No changes
 
 
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No changes
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * Application generation: --skip-testunit and --skip-activerecord become --skip-test-unit and --skip-active-record respectively. [fxn]
 
@@ -24,19 +19,10 @@
 
 * Made the rails command work even when you're in a subdirectory [Chad Fowler]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * Removed Rails Metal [Yehuda Katz, José Valim].
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * Renamed config.cookie_secret to config.secret_token and pass it as env key. [José Valim]
 
-
-*Rails 3.0.0 [beta 2] (April 1st, 2010)*
-
 * Session store configuration has changed [Yehuda Katz, Carl Lerche]
 
     config.session_store :cookie_store, {:key => "..."}
@@ -48,8 +34,6 @@
 * Added config.generators.templates to provide alternative paths for the generators
   to look for templates [José Valim]
 
-*Rails 3.0.0 [beta 1] (February 4, 2010)*
-
 * Added "rake about" as a replacement for script/about [DHH]
 
 * Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]. Example: