aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-09-02 07:30:42 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-09-02 07:30:42 -0700
commitebc50c505d3c49b0fac7eccf85da6df751d4023c (patch)
tree4c6afe04522e7238cce218eb05a256b92bcfde90 /guides/source
parent1180e0c0e52c11a056f7a1bdfdb8e84c354e6f2a (diff)
parent593fa0b950153cfb02bef6ded3cec165ed30d658 (diff)
downloadrails-ebc50c505d3c49b0fac7eccf85da6df751d4023c.tar.gz
rails-ebc50c505d3c49b0fac7eccf85da6df751d4023c.tar.bz2
rails-ebc50c505d3c49b0fac7eccf85da6df751d4023c.zip
Merge pull request #7502 from xoen/fixed-upgrading-guide-markup
Fixed markup in Upgrading RoR guide [ci skip]
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/upgrading_ruby_on_rails.textile14
1 files changed, 12 insertions, 2 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile
index cdf7306264..70d4dabfe2 100644
--- a/guides/source/upgrading_ruby_on_rails.textile
+++ b/guides/source/upgrading_ruby_on_rails.textile
@@ -54,11 +54,21 @@ h4(#action_pack4_0). Action Pack
Rails 4.0 changed how <tt>assert_generates</tt>, <tt>assert_recognizes</tt>, and <tt>assert_routing</tt> work. Now all these assertions raise <tt>Assertion</tt> instead of <tt>ActionController::RoutingError</tt>.
-Rails 4.0 also changed the way unicode character routes are drawn. Now you can draw unicode character routes directly. If you already draw such routes, you must change them, e.g. <tt>get Rack::Utils.escape('こんにちは'), :controller => 'welcome', :action => 'index'</tt> to <tt>get 'こんにちは', :controller => 'welcome', :action => 'index'</tt>.
+Rails 4.0 also changed the way unicode character routes are drawn. Now you can draw unicode character routes directly. If you already draw such routes, you must change them, for example:
+
+<ruby>
+get Rack::Utils.escape('こんにちは'), :controller => 'welcome', :action => 'index'
+</ruby>
+
+becomes
+
+<ruby>
+get 'こんにちは', :controller => 'welcome', :action => 'index'
+</ruby>
h4(#active_support4_0). Active Support
-Rails 4.0 Removed the `j` alias for `ERB::Util#json_escape` since `j` is already used for `ActionView::Helpers::JavaScriptHelper#escape_javascript`.
+Rails 4.0 Removed the <tt>j</tt> alias for <tt>ERB::Util#json_escape</tt> since <tt>j</tt> is already used for <tt>ActionView::Helpers::JavaScriptHelper#escape_javascript</tt>.
h4(#helpers_order). Helpers Loading Order