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=996ac4c37fe3c4edfde14fe710b9e9cfd47aca03;hp=cbaa0997cd2715f537426d012ad9667965edd8fa;hb=45d511e089515b7a59b6d943bb79a9fbf0ba45d4;hpb=c010ae0de590159369925f16f03dcad4732a91e6

diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index cbaa099..996ac4c 100644
--- a/lib/Catalyst/Manual/Tutorial/Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod
@@ -287,10 +287,18 @@ backed session store).
 
 Although C<__PACKAGE__-E<gt>config(name =E<gt> 'value');> is still 
 supported, newer Catalyst applications tend to place all configuration 
-information in C<myapp.yml> and automatically load this information 
+information in C<myapp.conf> and automatically load this information 
 into C<MyApp-E<gt>config> using the 
-L<ConfigLoader|Catalyst::Plugin::ConfigLoader> plugin.  Here, we need 
-to load several parameters that tell 
+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.
+
+Here, we need to load several parameters that tell 
 L<Catalyst::Plugin::Authentication|Catalyst::Plugin::Authentication> 
 where to locate information in your database.  To do this, edit the 
 C<myapp.conf> file and update it to match:
@@ -708,7 +716,7 @@ algorithms are supported.  See C<Digest> for more information.
 =head2 Enable SHA-1 Hash Passwords in
 C<Catalyst::Plugin::Authentication::Store::DBIC>
 
-Edit C<myapp.yml> and update it to match (the C<password_type> and
+Edit C<myapp.conf> and update it to match (the C<password_type> and
 C<password_hash_type> are new, everything else is the same):
 
     ---
@@ -845,10 +853,11 @@ C<__PACKAGE__-E<gt>config> setting to something like:
             session => {flash_to_stash => 1}
         );
 
-B<or> add the following to C<myapp.yml>:
+B<or> add the following to C<myapp.conf>:
 
-    session:
-        flash_to_stash: 1
+    <session>
+        flash_to_stash   1
+    </session>
 
 The C<__PACKAGE__-E<gt>config> option is probably preferable here 
 since it's not something you will want to change at runtime without it