From fa52740dfa0d0d1948f43122149db5149d7052f4 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 18 Jan 2012 14:33:51 -0500
Subject: Update Release Notes: sprockets-rails section should be inside of
 ActionPack section

---
 railties/guides/source/3_2_release_notes.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/3_2_release_notes.textile')

diff --git a/railties/guides/source/3_2_release_notes.textile b/railties/guides/source/3_2_release_notes.textile
index 439cd5f714..c3652057e6 100644
--- a/railties/guides/source/3_2_release_notes.textile
+++ b/railties/guides/source/3_2_release_notes.textile
@@ -284,7 +284,7 @@ h5. Deprecations
 
 * Passing formats or handlers to render :template and friends like <tt>render :template => "foo.html.erb"</tt> is deprecated. Instead, you can provide :handlers and :formats directly as an options: <tt> render :template => "foo", :formats => [:html, :js], :handlers => :erb</tt>.
 
-h3. Sprockets
+h4. Sprockets
 
 * Adds a configuration option <tt>config.assets.logger</tt> to control Sprockets logging. Set it to +false+ to turn off logging and to +nil+ to default to +Rails.logger+.
 
-- 
cgit v1.2.3


From 9365f893fba9428d68e27a6e520d7d58cdcb1793 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 18 Jan 2012 14:43:59 -0500
Subject: Adding Action Mailer section to 3.2 release notes

---
 railties/guides/source/3_2_release_notes.textile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'railties/guides/source/3_2_release_notes.textile')

diff --git a/railties/guides/source/3_2_release_notes.textile b/railties/guides/source/3_2_release_notes.textile
index c3652057e6..5f6f425123 100644
--- a/railties/guides/source/3_2_release_notes.textile
+++ b/railties/guides/source/3_2_release_notes.textile
@@ -142,6 +142,12 @@ h4. Deprecations
 
 * +Rails::Plugin+ is deprecated and will be removed in Rails 4.0. Instead of adding plugins to +vendor/plugins+ use gems or bundler with path or git dependencies.
 
+h3. Action Mailer
+
+* Upgraded mail version to 2.4.0
+
+* Removed Old Action Mailer API. The Old API was deprecated since Rails 3.0 release.
+
 h3. Action Pack
 
 h4. Action Controller
-- 
cgit v1.2.3


From 68d389a99afa7d7de47f33a792322fe216f18365 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 19 Jan 2012 02:50:37 +0530
Subject: revise wording [ci skip]

---
 railties/guides/source/3_2_release_notes.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/3_2_release_notes.textile')

diff --git a/railties/guides/source/3_2_release_notes.textile b/railties/guides/source/3_2_release_notes.textile
index 5f6f425123..8b242df179 100644
--- a/railties/guides/source/3_2_release_notes.textile
+++ b/railties/guides/source/3_2_release_notes.textile
@@ -144,9 +144,9 @@ h4. Deprecations
 
 h3. Action Mailer
 
-* Upgraded mail version to 2.4.0
+* Upgraded <tt>mail</tt> version to 2.4.0.
 
-* Removed Old Action Mailer API. The Old API was deprecated since Rails 3.0 release.
+* Removed the old Action Mailer API which was deprecated since Rails 3.0.
 
 h3. Action Pack
 
-- 
cgit v1.2.3

