Fix CHANGELOGS

2 files changed, 38 insertions, 14 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a7dcd8f8c8..bb22e246a2 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,25 +1,28 @@
 ## Rails 3.2.8 ##
 
-*   No changes.
+*   Reverted the deprecation of `:confirm`. *Rafael Mendonça França*
+
+*   Reverted the deprecation of `:disable_with`. *Rafael Mendonça França*
 
 
 ## Rails 3.2.7 (Jul 26, 2012) ##
 
-* Do not convert digest auth strings to symbols. CVE-2012-3424
-  
-* Bump Journey requirements to 1.0.4
+*   Do not convert digest auth strings to symbols. CVE-2012-3424
+
+*   Bump Journey requirements to 1.0.4
+
+*   Add support for optional root segments containing slashes
 
-* Add support for optional root segments containing slashes
+*   Fixed bug creating invalid HTML in select options
 
-* Fixed bug creating invalid HTML in select options
+*   Show in log correct wrapped keys
 
-* Show in log correct wrapped keys
+*   Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.
 
-* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.
+*   ActionController::Metal doesn't have logger method, check it and then delegate
 
-* ActionController::Metal doesn't have logger method, check it and then delegate
+*   ActionController::Caching depends on RackDelegation and AbstractController::Callbacks
 
-* ActionController::Caching depends on RackDelegation and AbstractController::Callbacks
 
 ## Rails 3.2.6 (Jun 12, 2012) ##
 
@@ -27,6 +30,10 @@
 
     CVE-2012-2694
 
+*   Deprecate `:confirm` in favor of `':data => { :confirm => "Text" }'` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers.
+
+    *Carlos Galdino*
+
 *   Allow to use mounted_helpers (helpers for accessing mounted engines) in ActionView::TestCase. *Piotr Sarnacki*
 
 *   Include mounted_helpers (helpers for accessing mounted engines) in ActionDispatch::IntegrationTest by default. *Piotr Sarnacki*
@@ -41,7 +48,11 @@
 
 *   Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
 
-*   Deprecate `:mouseover` options for `image_tag` helper. *Rafael Mendonça França*
+*   Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to`, `button_tag` and `submit_tag` helpers.
+
+    *Carlos Galdino + Rafael Mendonça França*
+
+*   Deprecate `:mouseover` option for `image_tag` helper. *Rafael Mendonça França*
 
 *   Deprecate `button_to_function` and `link_to_function` helpers. *Rafael Mendonça França*
 
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d7bda6470e..038b8d85fb 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -2,14 +2,21 @@
 
 *   Removes the deprecation of `update_attribute`. *fxn*
 
+*   Reverted the deprecation of `composed_of`. *Rafael Mendonça França*
+
 *   Reverted the deprecation of `*_sql` association options. They will
-    be deprecated in 4.0 instead.
+    be deprecated in 4.0 instead. *Jon Leighton*
+
+*   Do not eager load AR session store. ActiveRecord::SessionStore depends on the abstract store
+    in Action Pack. Eager loading this class would break client code that eager loads Active Record
+    standalone.
+    Fixes #7160
 
-*   Do not eager load AR session store. ActiveRecord::SessionStore depends on the abstract store in Action Pack. Eager loading this class would break client code that eager loads Active Record standalone. Fixes #7160 *Xavier Noria*
+    *Xavier Noria*
 
 *   Do not set RAILS_ENV to "development" when using `db:test:prepare` and related rake tasks.
     This was causing the truncation of the development database data when using RSpec.
-    Fix #7175.
+    Fixes #7175.
 
     *Rafael Mendonça França*
 
@@ -28,6 +35,12 @@
 
     *Jon Leighton*
 
+*   `composed_of` has been deprecated. You'll have to write your own accessor
+    and mutator methods if you'd like to use value objects to represent some
+    portion of your models.
+
+    *Steve Klabnik*
+
 *   `update_attribute` has been deprecated. Use `update_column` if
     you want to bypass mass-assignment protection, validations, callbacks,
     and touching of updated_at. Otherwise please use `update_attributes`.