From 2a55edc725a4272c732dc93bd6aaec9ed0aa20cc Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Mon, 16 Aug 2010 05:25:40 -0500
Subject: Debugging Guide: Improve grammar for the RJS section

---
 railties/guides/source/debugging_rails_applications.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/guides/source/debugging_rails_applications.textile')

diff --git a/railties/guides/source/debugging_rails_applications.textile b/railties/guides/source/debugging_rails_applications.textile
index 26aee82ae1..ccd538d1e8 100644
--- a/railties/guides/source/debugging_rails_applications.textile
+++ b/railties/guides/source/debugging_rails_applications.textile
@@ -98,7 +98,7 @@ Title: Rails debugging guide
 
 h4. Debugging JavaScript
 
-Rails has built-in support to debug RJS, to active it, set +ActionView::Base.debug_rjs+ to _true_, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).
+Rails has built-in support to debug RJS – to activate it, set +ActionView::Base.debug_rjs+ to _true_. This will specify that RJS responses should be wrapped in a try/catch block that displays the caught exception using +alert()+ (and then re-raises it).
 
 To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
 
@@ -106,13 +106,13 @@ To enable it, add the following in the +Rails::Initializer do |config|+ block in
 config.action_view[:debug_rjs] = true
 </ruby>
 
-Or, at any time, setting +ActionView::Base.debug_rjs+ to _true_:
+Or, at any time, set +ActionView::Base.debug_rjs+ to _true_:
 
 <ruby>
 ActionView::Base.debug_rjs = true
 </ruby>
 
-TIP: For more information on debugging javascript refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
+TIP: For more information on debugging JavaScript, refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
 
 h3. The Logger
 
-- 
cgit v1.2.3


From 9a665aa6d24e56f7c990cbdcd9a6e43188f75f94 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Mon, 16 Aug 2010 21:32:08 -0500
Subject: Debugging Guide: Highlight using config over ActionView::Base

---
 railties/guides/source/debugging_rails_applications.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/guides/source/debugging_rails_applications.textile')

diff --git a/railties/guides/source/debugging_rails_applications.textile b/railties/guides/source/debugging_rails_applications.textile
index ccd538d1e8..07c6f6b65d 100644
--- a/railties/guides/source/debugging_rails_applications.textile
+++ b/railties/guides/source/debugging_rails_applications.textile
@@ -98,20 +98,20 @@ Title: Rails debugging guide
 
 h4. Debugging JavaScript
 
-Rails has built-in support to debug RJS – to activate it, set +ActionView::Base.debug_rjs+ to _true_. This will specify that RJS responses should be wrapped in a try/catch block that displays the caught exception using +alert()+ (and then re-raises it).
-
-To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
+Rails has built-in support to debug RJS. To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
 
 <ruby>
 config.action_view[:debug_rjs] = true
 </ruby>
 
-Or, at any time, set +ActionView::Base.debug_rjs+ to _true_:
+Or, at any time, set +ActionView::Base.debug_rjs+ to true:
 
 <ruby>
 ActionView::Base.debug_rjs = true
 </ruby>
 
+This will specify that RJS responses should be wrapped in a try/catch block that displays the caught exception using +alert()+ (and then re-raises it).
+
 TIP: For more information on debugging JavaScript, refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
 
 h3. The Logger
-- 
cgit v1.2.3


From 285690143ea80fe504385a409cdc28f0d9b7ada2 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 17 Aug 2010 13:19:00 +0200
Subject: debugging guide: revises the section on debugging RJS

---
 railties/guides/source/debugging_rails_applications.textile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'railties/guides/source/debugging_rails_applications.textile')

diff --git a/railties/guides/source/debugging_rails_applications.textile b/railties/guides/source/debugging_rails_applications.textile
index 07c6f6b65d..35069f33ad 100644
--- a/railties/guides/source/debugging_rails_applications.textile
+++ b/railties/guides/source/debugging_rails_applications.textile
@@ -96,21 +96,23 @@ Will be rendered as follows:
 Title: Rails debugging guide
 </pre>
 
-h4. Debugging JavaScript
+h4. Debugging RJS
 
-Rails has built-in support to debug RJS. To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
+Rails has optional built-in support to debug RJS. When enabled, responses are wrapped in a try/catch block that displays the caught exception using +alert()+, and then re-raises it.
+
+The flag to enable RJS debugging in your configuration files is +config.action_view.debug_rjs+:
 
 <ruby>
-config.action_view[:debug_rjs] = true
+config.action_view.debug_rjs = true
 </ruby>
 
-Or, at any time, set +ActionView::Base.debug_rjs+ to true:
+or at any time setting +ActionView::Base.debug_rjs+:
 
 <ruby>
 ActionView::Base.debug_rjs = true
 </ruby>
 
-This will specify that RJS responses should be wrapped in a try/catch block that displays the caught exception using +alert()+ (and then re-raises it).
+It is enabled by default in development mode, and disabled in the rest.
 
 TIP: For more information on debugging JavaScript, refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
 
-- 
cgit v1.2.3

