syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master

6 files changed, 49 insertions, 2 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 9c073dce1f..167c1da9c5 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -2,6 +2,10 @@
 
 * No changes
 
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index b94723c969..db02beee35 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,5 @@
 *Rails 3.1.0 (unreleased)*
 
-* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
-
 * Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a :data hash of options:
 
     tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
@@ -25,6 +23,10 @@
 
 * Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
 
+*Rails 3.0.2 (unreleased)*
+
+* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index e93d84ab59..4e963c77b0 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -2,6 +2,10 @@
 
 * No changes
 
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index d3530e0da9..11eb47917d 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -18,6 +18,35 @@
 
   [Aaron Patterson]
 
+*Rails 3.0.2 (unreleased)*
+
+* reorder is deprecated in favor of except(:order).order(...) [Santiago Pastorino]
+
+* except is now AR public API
+
+    Model.order('name').except(:order).order('salary')
+
+  generates:
+
+    SELECT * FROM models ORDER BY salary
+
+  [Santiago Pastorino]
+
+* The following code:
+
+    Model.limit(10).scoping { Model.count }
+
+  now generates the following SQL:
+
+    SELECT COUNT(*) FROM models LIMIT 10
+
+  This may not return what you want.  Instead, you may with to do something
+  like this:
+
+    Model.limit(10).scoping { Model.all.size }
+
+  [Aaron Patterson]
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * Introduce a fix for CVE-2010-3993
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 24fe3072e0..386bafd7de 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -2,6 +2,10 @@
 
 * No changes
 
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 3b6a29f7d6..6e8cce0d27 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -4,6 +4,10 @@
 
 * Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
 
+*Rails 3.0.2 (unreleased)*
+
+* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.