Update DBIX_CLASS_STORAGE_DBI_DEBUG to DBIC_TRACE.

Mention Catalyst::Devel in Installation.pod.

diff --git a/lib/Catalyst/Manual/Installation.pod b/lib/Catalyst/Manual/Installation.pod
index 565b76c..6fc70d9 100644 (file)
--- a/lib/Catalyst/Manual/Installation.pod
+++ b/lib/Catalyst/Manual/Installation.pod
@@ -96,9 +96,10 @@ variety of other installation techniques:
 CPAN
 
 The traditional way to install Catalyst is directly from CPAN using the
-C<Task::Catalyst> bundle:
+C<Task::Catalyst> bundle and C<Catalyst::Devel>:
 
        $ perl -MCPAN -e 'install Task::Catalyst'
+       $ perl -MCPAN -e 'install Catalyst::Devel'
 
 Unless you have a particularly complete set of Perl modules already
 installed, be prepared for a large number of nested dependencies.

diff --git a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
index b6d7f32..cdc8ce4 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
@@ -1036,7 +1036,11 @@ First, let's enable an environment variable option that causes
 DBIx::Class to dump the SQL statements it's using to access the database
 (this option can provide extremely helpful troubleshooting information):
 
-    $ export DBIX_CLASS_STORAGE_DBI_DEBUG=1
+    $ export DBIC_TRACE=1
+
+B<NOTE>: You can also use the older 
+C<export DBIX_CLASS_STORAGE_DBI_DEBUG=1>, that that's a lot more to
+type.
 
 This assumes you are using BASH as your shell -- adjust accordingly if
 you are using a different shell (for example, under tcsh, use

diff --git a/lib/Catalyst/Manual/Tutorial/Debugging.pod b/lib/Catalyst/Manual/Tutorial/Debugging.pod
index 5c4726d..6a958d3 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Debugging.pod
+++ b/lib/Catalyst/Manual/Tutorial/Debugging.pod
@@ -167,9 +167,8 @@ C<single-step> into methods/subroutines):
       DB<1>
 
 This takes you to the next line of code where the template name is set.
-Notice that because we enabled C<DBIX_CLASS_STORAGE_DBI_DEBUG=1>
-earlier, SQL debug output also shows up in the development server debug
-output.
+Notice that because we enabled C<DBIC_TRACE=1> earlier, SQL debug 
+output also shows up in the development server debug information.
 
 Next, list the methods available on our C<Book> model:
 

diff --git a/lib/Catalyst/Manual/Tutorial/Testing.pod b/lib/Catalyst/Manual/Tutorial/Testing.pod
index c361921..0e7911a 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Testing.pod
+++ b/lib/Catalyst/Manual/Tutorial/Testing.pod
@@ -264,9 +264,9 @@ To run the new test script, use a command such as:
 
 or
 
-    $ DBIX_CLASS_STORAGE_DBI_DEBUG=0 CATALYST_DEBUG=0 prove --lib lib -v t/live_app01.t
+    $ DBIC_TRACE=0 CATALYST_DEBUG=0 prove --lib lib -v t/live_app01.t
 
-Experiment with the C<DBIX_CLASS_STORAGE_DBI_DEBUG>, C<CATALYST_DEBUG>
+Experiment with the C<DBIC_TRACE>, C<CATALYST_DEBUG>
 and C<-v> settings.  If you find that there are errors, use the
 techniques discussed in the "Catalyst Debugging" section (Part 6) to
 isolate and fix any problems.
@@ -274,7 +274,7 @@ isolate and fix any problems.
 If you want to run the test case under the Perl interactive debugger,
 try a command such as:
 
-    $ DBIX_CLASS_STORAGE_DBI_DEBUG=0 CATALYST_DEBUG=0 perl -d -Ilib t/live_app01.t
+    $ DBIC_TRACE=0 CATALYST_DEBUG=0 perl -d -Ilib t/live_app01.t
 
 Note that although this tutorial uses a single custom test case for
 simplicity, you may wish to break your tests into different files for