X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2FAuthentication.pod;h=2e7016fe9d22344993b428b179e2afe3b23815e5;hp=f32e05ba1d47a2f0276f953240cdfe4342da8d32;hb=79a529cc16c64fa115eddce5ca038e2f41545ac8;hpb=8a7c51514fe8828c25ecd353ad2e9dc3b456ac9a

diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index f32e05b..2e7016f 100644
--- a/lib/Catalyst/Manual/Tutorial/Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod
@@ -205,7 +205,7 @@ classes created in Part 3.
 
 Note that we do not need to make any change to the
 C<lib/MyApp/Schema.pm> schema file.  It simply tells DBIC to
-load all of the result source files it finds in below the
+load all of the result class files it finds in below the
 C<lib/MyApp/Schema> directory, so it will automatically pick
 up our new table information.
 
@@ -238,7 +238,7 @@ Look for the three new model objects in the startup debug output:
     '-------------------------------------------------------------------+----------'
     ...
 
-Again, notice that your "result source" classes have been "re-loaded"
+Again, notice that your "result class" classes have been "re-loaded"
 by Catalyst under C<MyApp::Model>.
 
 
@@ -247,7 +247,7 @@ by Catalyst under C<MyApp::Model>.
 Edit C<lib/MyApp.pm> and update it as follows (everything below
 C<StackTrace> is new):
 
-    __PACKAGE__->setup(qw/
+    use Catalyst qw/
             -Debug
             ConfigLoader
             Static::Simple
@@ -259,7 +259,7 @@ C<StackTrace> is new):
             Session
             Session::Store::FastMmap
             Session::State::Cookie
-            /);
+            /;
 
 The C<Authentication> plugin supports Authentication while the
 C<Session> plugins are required to maintain state across multiple HTTP
@@ -293,10 +293,11 @@ L<ConfigLoader|Catalyst::Plugin::ConfigLoader> plugin.
 
 First, as noted in Part 3 of the tutorial, Catalyst has recently
 switched from a default config file format of YAML to
-C<Config::General> (an apache-like format).  In case you are using
-a version of Catalyst earlier than v5.7014, delete the C<myapp.yml>
-file and simply follow the directions below to create a new
-C<myapp.conf> file.
+C<Config::General> (an apache-like format).  In case you are using a
+version of Catalyst earlier than v5.7014, delete the C<myapp.yml>, or
+convert it to .conf format using the TIP in
+L<Catalyst::Manual::MoreCatalystBasics>; then simply follow the
+directions below to create a new C<myapp.conf> file.
 
 Here, we need to load several parameters that tell
 L<Catalyst::Plugin::Authentication|Catalyst::Plugin::Authentication>