Merge remote branch 'rails/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 9b3bb1da15..561bae3be8 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -2226,7 +2226,7 @@ There's also a related idiom that uses the splat operator:
 [*object]
 </ruby>
 
-which returns +[nil]+ for +nil+, and calls to <tt>Array(object)</tt> otherwise
+which in Ruby 1.8 returns +[nil]+ for +nil+, and calls to <tt>Array(object)</tt> otherwise. (Please if you know the exact behavior in 1.9 contact fxn.)
 
 Thus, in this case the behavior is different for +nil+, and the differences with <tt>Kernel#Array</tt> explained above apply to the rest of +object+s.
 
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 65cf79a0a2..306c88c261 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -23,7 +23,7 @@ task :routes => :environment do
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end
 
-  routes.reject! { |r| r[:path] == "/rails/info/properties" } # Skip the route if it's internal info route
+  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route
 
   name_width = routes.map{ |r| r[:name] }.map(&:length).max
   verb_width = routes.map{ |r| r[:verb] }.map(&:length).max