Merge josevalim/deprecations branch.

I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.

3 files changed, 28 insertions, 19 deletions

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:
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 696db30efb..dfc4d38112 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -1296,6 +1296,31 @@ Active Support defines 3rd person aliases of +String#start_with?+ and +String#en
 
 NOTE: Defined in +active_support/core_ext/string/starts_ends_with.rb+.
 
+h4. +strip_heredoc+
+
+The method +strip_heredoc+ strips indentation in heredocs.
+
+For example in
+
+<ruby>
+if options[:usage]
+  puts <<-USAGE.strip_heredoc
+    This command does such and such.
+
+    Supported options are:
+      -h         This message
+      ...
+  USAGE
+end
+</ruby>
+
+the user would see the usage message aligned against the left margin.
+
+Technically, it looks for the least indented line in the whole string, and removes
+that amount of leading whitespace.
+
+NOTE: Defined in +active_support/core_ext/string/strip.rb+.
+
 h4. Access
 
 h5. +at(position)+
diff --git a/railties/guides/source/contributing_to_rails.textile b/railties/guides/source/contributing_to_rails.textile
index a0225b4b17..7184759610 100644
--- a/railties/guides/source/contributing_to_rails.textile
+++ b/railties/guides/source/contributing_to_rails.textile
@@ -69,7 +69,7 @@ All of the Rails tests must pass with any code you submit, otherwise you have no
 NOTE: Ensure you install bundler v1.0
 
 <shell>
-gem install -v=1.0.0 bundler
+gem install bundler
 bundle install --without db
 </shell>