Update release notes from docrails.

2 files changed, 17 insertions, 2 deletions

diff --git a/railties/doc/guides/html/2_2_release_notes.html b/railties/doc/guides/html/2_2_release_notes.html
index e79f7ec511..68b8188f7c 100644
--- a/railties/doc/guides/html/2_2_release_notes.html
+++ b/railties/doc/guides/html/2_2_release_notes.html
@@ -812,6 +812,16 @@ Rails now supports HTTP-only cookies (and uses them for sessions), which help mi
 <tt>render</tt> now supports a <tt>:js</tt> option to render plain vanilla javascript with the right mime type.

 </p>

 </li>

+<li>

+<p>

+Request forgery protection has been tightened up to apply to HTML-formatted content requests only.

+</p>

+</li>

+<li>

+<p>

+Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling <tt>polymorphic_path([@project, @date, @area])</tt> with a nil date will give you <tt>project_area_path</tt>.

+</p>

+</li>

 </ul></div>

 </div>

 <h2 id="_action_view">7. Action View</h2>

@@ -856,6 +866,7 @@ More information:
 </ul></div>

 </li>

 </ul></div>

+<div class="para"><p>Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.</p></div>

 </div>

 <h2 id="_active_support">9. Active Support</h2>

 <div class="sectionbody">

@@ -1094,7 +1105,7 @@ Wrapped <tt>Rails.env</tt> in <tt>StringInquirer</tt> so you can do <tt>Rails.en
 </li>

 <li>

 <p>

-<tt>script/generate</tt> works without deprecation warnings when RubyGems 1.3.0 is present

+To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.

 </p>

 </li>

 </ul></div>

diff --git a/railties/doc/guides/source/2_2_release_notes.txt b/railties/doc/guides/source/2_2_release_notes.txt
index f78c179ba1..1e5c21f913 100644
--- a/railties/doc/guides/source/2_2_release_notes.txt
+++ b/railties/doc/guides/source/2_2_release_notes.txt
@@ -270,6 +270,8 @@ map.resources :products, :except => :destroy
 * Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
 * +redirect_to+ now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI).
 * +render+ now supports a +:js+ option to render plain vanilla javascript with the right mime type.
+* Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
+* Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling +polymorphic_path([@project, @date, @area])+ with a nil date will give you +project_area_path+.
 
 == Action View
 
@@ -285,6 +287,8 @@ Action Mailer now supports mailer layouts. You can make your HTML emails as pret
 * More information:
  - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts[What's New in Edge Rails: Mailer Layouts]
 
+Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.
+
 == Active Support
 
 Active Support now offers built-in memoization for Rails applications, the +each_with_object+ method, prefix support on delegates, and various other new utility methods.
@@ -399,7 +403,7 @@ You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the com
 * Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
 * +rake notes:custom ANNOTATION=MYFLAG+ lets you list out custom annotations.
 * Wrapped +Rails.env+ in +StringInquirer+ so you can do +Rails.env.development?+
-* +script/generate+ works without deprecation warnings when RubyGems 1.3.0 is present
+* To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
 
 == Deprecated