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=d7c085142e026d6ad5412195e111496e04e67917;hp=8bae7167e8cb4286630e8839fe15b5f80b824b94;hb=5fefca357853d5b50a5d65a3ed4324396a6a005a;hpb=b411df01b40662f125aa854a7c25097bc53ad86a

diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index 8bae716..d7c0851 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>.
 
 
@@ -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>
@@ -331,9 +332,6 @@ C<myapp.conf> file and update it to match:
                     # NOTE: Omit 'MyApp::Model' here just as you would when using
                     # '$c->model("DB::Users)'
                     user_class DB::Users
-                    # This is the name of the field in your 'users' table that
-                    # contains the user's name
-                    id_field username
                 </store>
             </dbic>
         </realms>
@@ -384,7 +382,7 @@ Then update it to match:
         if ($username && $password) {
             # Attempt to log the user in
             if ($c->authenticate({ username => $username,
-                                   password => $password} )) {
+                                   password => $password  } )) {
                 # If successful, then let them use the application
                 $c->response->redirect($c->uri_for('/books/list'));
                 return;
@@ -751,9 +749,6 @@ C<password_hash_type> are new, everything else is the same):
                     # NOTE: Omit 'MyApp::Model' here just as you would when using
                     # '$c->model("DB::Users)'
                     user_class DB::Users
-                    # This is the name of the field in your 'users' table that
-                    # contains the user's name
-                    id_field username
                 </store>
             </dbic>
         </realms>