Misc updates with thanks to JC Wren

diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index 0f66ebf..499aa53 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod
@@ -266,6 +266,10 @@ C<StackTrace> is new):
             Session::State::Cookie
         /);
 
+B<Note:> As discussed in MoreCatalystBasics, different versions of 
+C<Catalyst::Devel> have used a variety of methods to load the plugins. 
+You put the plugins in the C<use Catalyst> statement if you prefer.
+
 The C<Authentication> plugin supports Authentication while the
 C<Session> plugins are required to maintain state across multiple HTTP
 requests.
@@ -366,12 +370,8 @@ such matters up to you, the designer and programmer.
 Then open C<lib/MyApp/Controller/Login.pm>, locate the C<sub index
 :Path :Args(0)> method (or C<sub index : Private> if you are using an
 older version of Catalyst) that was automatically inserted by the
-helpers when we created the Login controller above, and delete this
-line:
-
-    $c->response->body('Matched MyApp::Controller::Login in Login.');
-
-Then update it to match:
+helpers when we created the Login controller above, and update the
+definition of C<sub index> to match:
 
     =head2 index
     

diff --git a/lib/Catalyst/Manual/Tutorial/Authorization.pod b/lib/Catalyst/Manual/Tutorial/Authorization.pod
index cdd9807..d0ca866 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Authorization.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authorization.pod
@@ -91,6 +91,10 @@ Edit C<lib/MyApp.pm> and add C<Authorization::Roles> to the list:
             Session::State::Cookie
         /;
 
+B<Note:> As discussed in MoreCatalystBasics, different versions of 
+C<Catalyst::Devel> have used a variety of methods to load the plugins. 
+You put the plugins in the C<use Catalyst> statement if you prefer.
+
 
 =head2 Add Config Information for Authorization
 

diff --git a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
index cc42b07..b5ac7bd 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
@@ -174,7 +174,7 @@ as images and CSS files under the development server.
 
 =back
 
-For out application, we want to add one new plugin into the mix.  To 
+For our application, we want to add one new plugin into the mix.  To 
 do this, edit C<lib/MyApp.pm> (this file is generally referred to as 
 your I<application class>) and delete the line with:
 
@@ -190,6 +190,21 @@ Then replace it with:
             StackTrace
         /);
 
+B<Note:> Recent versions of C<Catalyst::Devel> have used a variety of 
+techniques to load these plugins/flags.  If you are following along in 
+Ubuntu 8.10, you should have C<Catalyst::Devel> v1.07 and see the 
+default code shown above.  If you are using v1.08, you should see the 
+following by default:
+
+    use Catalyst qw/-Debug
+                ConfigLoader
+                Static::Simple/;
+    ...
+    __PACKAGE__->setup();
+
+Don't let these variations confuse you -- they all accomplish the same 
+result.
+
 This tells Catalyst to start using one new plugin, 
 L<Catalyst::Plugin::StackTrace|Catalyst::Plugin::StackTrace>, to add a 
 stack trace to the standard Catalyst "debug screen" (the screen