aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorAldo "xoen" Giambelluca <xoen@xoen.org>2012-09-02 15:28:08 +0200
committerAldo "xoen" Giambelluca <xoen@xoen.org>2012-09-02 15:28:08 +0200
commit593fa0b950153cfb02bef6ded3cec165ed30d658 (patch)
treefe147d4332cbce12aeace454cd5e4f5f1231c5a3 /guides
parentabd47c15b870ea3cdbe610a02df03e9425870417 (diff)
downloadrails-593fa0b950153cfb02bef6ded3cec165ed30d658.tar.gz
rails-593fa0b950153cfb02bef6ded3cec165ed30d658.tar.bz2
rails-593fa0b950153cfb02bef6ded3cec165ed30d658.zip
Fixed markup in Upgrading RoR guide [ci skip]
There are two changes: - Using <ruby> syntax for unicode character routes example instead of <tt> since it causes single quotes to be transformed into inverted commas. This makes this required change more eye-catching. - Using <tt> for the j alias and related helpers as written in the documentation guidelines.
Diffstat (limited to 'guides')
-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