Cleanup other references to myapp.yml to myapp.conf

diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index 3990f74..996ac4c 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod
@@ -716,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):
 
     ---
@@ -853,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 

diff --git a/lib/Catalyst/Manual/Tutorial/Authorization.pod b/lib/Catalyst/Manual/Tutorial/Authorization.pod
index b1c16ad..f35deb8 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Authorization.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authorization.pod
@@ -92,7 +92,7 @@ Edit C<lib/MyApp.pm> and add C<Authorization::Roles> to the list:
 
 =head2 Add Config Information for Authorization
 
-Edit C<myapp.yml> and update it to match the following (the 
+Edit C<myapp.conf> and update it to match the following (the 
 C<role_relation> and C<role_field> definitions are new):
 
     ---

diff --git a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
index e366b10..2d3ff93 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
@@ -145,7 +145,7 @@ directories and files it creates:
             View          # Directory for Views
         Hello.pm          # Base application module
     Makefile.PL           # Makefile to build application
-    hello.yml             # Application configuration file
+    hello.conf            # Application configuration file
     README                # README file
     root                  # Equiv of htdocs, dir for templates, css, javascript
         favicon.ico

diff --git a/lib/Catalyst/Manual/Tutorial/Intro.pod b/lib/Catalyst/Manual/Tutorial/Intro.pod
index 9b449ef..a11428e 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/Intro.pod
+++ b/lib/Catalyst/Manual/Tutorial/Intro.pod
@@ -130,7 +130,7 @@ Attempts to provide an example showing current (5.7XXX) Catalyst
 practices. For example, the use of 
 L<Catalyst::Action::RenderView|Catalyst::Action::RenderView>,
 DBIC, L<Catalyst::Plugin::ConfigLoader|Catalyst::Plugin::ConfigLoader> 
-with C<myapp.yml>, the use of C<lib/MyApp/Controller/Root.pm> 
+with C<myapp.conf>, the use of C<lib/MyApp/Controller/Root.pm> 
 vs. C<lib/MyApp.pm>, etc.
 
 =item * 

diff --git a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
index afb0a7b..4fb9f02 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
@@ -657,7 +657,7 @@ Your development server log output should display something like:
     [debug] Loaded dispatcher "Catalyst::Dispatcher"
     [debug] Loaded engine "Catalyst::Engine::HTTP"
     [debug] Found home "/home/me/MyApp"
-    [debug] Loaded Config "/home/me/MyApp/myapp.yml"
+    [debug] Loaded Config "/home/me/MyApp/myapp.conf"
     [debug] Loaded components:
     .-----------------------------------------------------------------+----------.
     | Class                                                           | Type     |