From: Kennedy Clark <hkclark@gmail.com>
Date: Sun, 7 Dec 2008 21:17:07 +0000 (+0000)
Subject: Remove TTSite in favor of manually created wrapper template and css
X-Git-Tag: v5.8005~248
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=1390ef0ecd30a0dcfe59f212353ed81094fdf64a

Remove TTSite in favor of manually created wrapper template and css
Update and test for Ubuntu 8.10 (Cat 5.7014, C::Devel 1.07, DBIC 0.08010, etc.)
Change flow of MoreCatalystBasics.pod (eg, use incremental build where run in smaller chunks)
Change MyApp.pm from "use Catalyst" to "__PACKAGE__->setup()"
Whitespace cleanup
Move TT Debugging section from MoreCatalystBasics.pod to Debugging.pod
Misc edits
---

diff --git a/lib/Catalyst/Manual/Tutorial/Appendices.pod b/lib/Catalyst/Manual/Tutorial/Appendices.pod
index c9c548a..6b471ed 100644
--- a/lib/Catalyst/Manual/Tutorial/Appendices.pod
+++ b/lib/Catalyst/Manual/Tutorial/Appendices.pod
@@ -457,60 +457,59 @@ Create the C<.sql> file and load the data:
 Open the C<myapp01_psql.sql> in your editor and enter:
 
 
-     --
-     -- Create a very simple database to hold book and author information
-     --
-     -- The sequence is how we get a unique id in PostgreSQL
-     --
-     CREATE SEQUENCE books_seq START 5 ;
-     SELECT nextval ('books_seq');
-
-     CREATE TABLE books (
-        id          INTEGER PRIMARY KEY DEFAULT nextval('books_seq'),
-        title       TEXT ,
-        rating      INTEGER
-        );
-
-     -- 'book_authors' is a many-to-many join table between books & authors
-     CREATE TABLE book_authors (
-        book_id     INTEGER,
-        author_id   INTEGER,
-        PRIMARY KEY (book_id, author_id)
-
-        );
-
-     CREATE SEQUENCE authors_seq START 8 ;
-     SELECT nextval ('authors_seq');
-
-     CREATE TABLE authors (
-     id          INTEGER PRIMARY KEY DEFAULT nextval('authors_seq'),
-     first_name  TEXT,
-     last_name   TEXT
-     );
-     ---
-     --- Load some sample data
-     ---
-     INSERT INTO books VALUES (1, 'CCSP SNRS Exam Certification Guide', 5);
-     INSERT INTO books VALUES (2, 'TCP/IP Illustrated, Volume 1', 5);
-     INSERT INTO books VALUES (3, 'Internetworking with TCP/IP Vol.1', 4);
-     INSERT INTO books VALUES (4, 'Perl Cookbook', 5);
-     INSERT INTO books VALUES (5, 'Designing with Web Standards', 5);
-     INSERT INTO authors VALUES (1, 'Greg', 'Bastien');
-     INSERT INTO authors VALUES (2, 'Sara', 'Nasseh');
-     INSERT INTO authors VALUES (3, 'Christian', 'Degu');
-     INSERT INTO authors VALUES (4, 'Richard', 'Stevens');
-     INSERT INTO authors VALUES (5, 'Douglas', 'Comer');
-     INSERT INTO authors VALUES (6, 'Tom', 'Christiansen');
-     INSERT INTO authors VALUES (7, 'Nathan', 'Torkington');
-     INSERT INTO authors VALUES (8, 'Jeffrey', 'Zeldman');
-     INSERT INTO book_authors VALUES (1, 1);
-     INSERT INTO book_authors VALUES (1, 2);
-     INSERT INTO book_authors VALUES (1, 3);
-     INSERT INTO book_authors VALUES (2, 4);
-     INSERT INTO book_authors VALUES (3, 5);
-     INSERT INTO book_authors VALUES (4, 6);
-     INSERT INTO book_authors VALUES (4, 7);
-     INSERT INTO book_authors VALUES (5, 8);
+    --
+    -- Create a very simple database to hold book and author information
+    --
+    -- The sequence is how we get a unique id in PostgreSQL
+    --
+    CREATE SEQUENCE books_seq START 5 ;
+    SELECT nextval ('books_seq');
+    
+    CREATE TABLE books (
+       id          INTEGER PRIMARY KEY DEFAULT nextval('books_seq'),
+       title       TEXT ,
+       rating      INTEGER
+       );
+    
+    -- 'book_authors' is a many-to-many join table between books & authors
+    CREATE TABLE book_authors (
+       book_id     INTEGER,
+       author_id   INTEGER,
+       PRIMARY KEY (book_id, author_id)
+       );
+    
+    CREATE SEQUENCE authors_seq START 8 ;
+    SELECT nextval ('authors_seq');
+    
+    CREATE TABLE authors (
+    id          INTEGER PRIMARY KEY DEFAULT nextval('authors_seq'),
+    first_name  TEXT,
+    last_name   TEXT
+    );
+    ---
+    --- Load some sample data
+    ---
+    INSERT INTO books VALUES (1, 'CCSP SNRS Exam Certification Guide', 5);
+    INSERT INTO books VALUES (2, 'TCP/IP Illustrated, Volume 1', 5);
+    INSERT INTO books VALUES (3, 'Internetworking with TCP/IP Vol.1', 4);
+    INSERT INTO books VALUES (4, 'Perl Cookbook', 5);
+    INSERT INTO books VALUES (5, 'Designing with Web Standards', 5);
+    INSERT INTO authors VALUES (1, 'Greg', 'Bastien');
+    INSERT INTO authors VALUES (2, 'Sara', 'Nasseh');
+    INSERT INTO authors VALUES (3, 'Christian', 'Degu');
+    INSERT INTO authors VALUES (4, 'Richard', 'Stevens');
+    INSERT INTO authors VALUES (5, 'Douglas', 'Comer');
+    INSERT INTO authors VALUES (6, 'Tom', 'Christiansen');
+    INSERT INTO authors VALUES (7, 'Nathan', 'Torkington');
+    INSERT INTO authors VALUES (8, 'Jeffrey', 'Zeldman');
+    INSERT INTO book_authors VALUES (1, 1);
+    INSERT INTO book_authors VALUES (1, 2);
+    INSERT INTO book_authors VALUES (1, 3);
+    INSERT INTO book_authors VALUES (2, 4);
+    INSERT INTO book_authors VALUES (3, 5);
+    INSERT INTO book_authors VALUES (4, 6);
+    INSERT INTO book_authors VALUES (4, 7);
+    INSERT INTO book_authors VALUES (5, 8);
 
 =item *
 
@@ -519,21 +518,21 @@ Load the data:
     $ psql -U catmyapp -W mycatapp
     Password for user catmyapp: catalyst 
     Welcome to psql 8.1.8, the PostgreSQL interactive terminal.
-
+    
     Type:  \copyright for distribution terms
            \h for help with SQL commands
            \? for help with psql commands
            \g or terminate with semicolon to execute query
            \q to quit
-
+    
     mycatapp=> \i myapp01_psql.sql
-
+    
     CREATE SEQUENCE
     nextval 
     ---------
            5
     (1 row)
-
+    
     psql:myapp01_psql.sql:11: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "books_pkey" for table "books"
     CREATE TABLE
     psql:myapp01_psql.sql:19: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "book_authors_pkey" for table 
@@ -544,7 +543,7 @@ Load the data:
     ---------
           8
     (1 row)
-
+    
     psql:myapp01_psql.sql:30: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "authors_pkey" for table "authors"
     CREATE TABLE
     INSERT 0 1
@@ -565,7 +564,7 @@ Make sure the data loaded correctly:
      public | book_authors | table | catmyapp
      public | books        | table | catmyapp
     (3 rows)
-
+    
     mycatapp=> select * from books;
      id |               title                | rating 
     ----+------------------------------------+--------
@@ -575,7 +574,7 @@ Make sure the data loaded correctly:
       4 | Perl Cookbook                      |      5
       5 | Designing with Web Standards       |      5
      (5 rows)
-
+    
     mycatapp=> \q
 
 =back
@@ -585,13 +584,13 @@ Make sure the data loaded correctly:
 After the steps where you:
 
     edit lib/MyApp.pm 
-
+    
     create lib/MyAppDB.pm 
-
+    
     create lib/MyAppDB/Book.pm
-
+    
     create lib/MyAppDB/Author.pm
-
+    
     create lib/MyAppDB/BookAuthor.pm 
 
 
@@ -619,10 +618,10 @@ Open C<myapp02_psql.sql> in your editor and enter:
     --
     -- Add users and roles tables, along with a many-to-many join table
     --
-
+    
     CREATE SEQUENCE users_seq START 3 ;
     SELECT nextval ('users_seq');
-
+    
     CREATE TABLE users (
             id            INTEGER PRIMARY KEY DEFAULT nextval('users_seq'),
             username      TEXT,
@@ -632,21 +631,21 @@ Open C<myapp02_psql.sql> in your editor and enter:
             last_name     TEXT,
             active        INTEGER
     );
-
+    
     CREATE SEQUENCE roles_seq START 2 ;
     SELECT nextval ('roles_seq');
-
+    
     CREATE TABLE roles (
             id   INTEGER PRIMARY KEY DEFAULT nextval('roles_seq'),
             role TEXT
     );
-
+    
     CREATE TABLE user_roles (
             user_id INTEGER,
             role_id INTEGER,
             PRIMARY KEY (user_id, role_id)
     );
-
+    
     --
     -- Load up some initial test data
     --
@@ -667,21 +666,21 @@ Load the data:
     $ psql -U catmyapp -W mycatapp
     Password for user catmyapp: catalyst 
     Welcome to psql 8.1.8, the PostgreSQL interactive terminal.
-
+    
     Type:  \copyright for distribution terms
            \h for help with SQL commands
            \? for help with psql commands
            \g or terminate with semicolon to execute query
            \q to quit
-
+    
     mycatapp=> \i myapp02_psql.sql
-
+    
     CREATE SEQUENCE
      nextval 
     ---------
            3
     (1 row)
-
+    
     psql:myapp02_psql.sql:16: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "users_pkey" for table "users"
     CREATE TABLE
     CREATE SEQUENCE
@@ -689,7 +688,7 @@ Load the data:
     ---------
            2
     (1 row)
-
+    
     psql:myapp02_psql.sql:24: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "roles_pkey" for table "roles"
     CREATE TABLE
     psql:myapp02_psql.sql:30: NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "user_roles_pkey" for table "user_roles"
@@ -704,7 +703,7 @@ Load the data:
     INSERT 0 1
     INSERT 0 1
     mycatapp=> 
-
+    
     mycatapp=> select * from users;
      id | username | password | email_address | first_name | last_name | active 
     ----+----------+----------+---------------+------------+-----------+--------
@@ -734,13 +733,13 @@ Load in the data
     $ psql -U catmyapp -W mycatapp
     Password for user catmyapp: 
     Welcome to psql 8.1.8, the PostgreSQL interactive terminal.
-
+    
     Type:  \copyright for distribution terms
            \h for help with SQL commands
            \? for help with psql commands
            \g or terminate with semicolon to execute query
            \q to quit
-
+    
     mycatapp=> \i myapp03_psql.sql
     UPDATE 1
     UPDATE 1
diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod
index b670e67..590a51d 100644
--- a/lib/Catalyst/Manual/Tutorial/Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod
@@ -65,7 +65,7 @@ cleartext authentication and 2) hash-based authentication.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
 
 =head1 BASIC AUTHENTICATION
 
@@ -126,6 +126,12 @@ the new tables added in the previous step, let's use the C<create=static>
 option on the DBIC model helper to do most of the work for us:
 
     $ script/myapp_create.pl model DB DBIC::Schema MyApp::Schema create=static dbi:SQLite:myapp.db
+     exists "/root/dev/MyApp/script/../lib/MyApp/Model"
+     exists "/root/dev/MyApp/script/../t"
+    Dumping manual schema for MyApp::Schema to directory /root/dev/MyApp/script/../lib ...
+    Schema dump completed.
+     exists "/root/dev/MyApp/script/../lib/MyApp/Model/DB.pm"
+    $
     $ ls lib/MyApp/Schema
     Authors.pm  BookAuthors.pm  Books.pm  Roles.pm  UserRoles.pm  Users.pm
 
@@ -136,7 +142,6 @@ files, those changes would have only been written above the C<# DO NOT
 MODIFY THIS OR ANYTHING ABOVE!> comment and your hand-editted
 enhancements would have been preserved.
 
-
 Speaking of "hand-editted enhancements," we should now add
 relationship information to the three new result source files.  Edit
 each of these files and add the following information between the C<#
@@ -147,14 +152,14 @@ C<lib/MyApp/Schema/Users.pm>:
     #
     # Set relationships:
     #
-
+    
     # has_many():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
     #     2) Name of the model class referenced by this relationship
     #     3) Column name in *foreign* table
     __PACKAGE__->has_many(map_user_role => 'MyApp::Schema::UserRoles', 'user_id');
-
+    
     # many_to_many():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
@@ -169,7 +174,7 @@ C<lib/MyApp/Schema/Roles.pm>:
     #
     # Set relationships:
     #
-
+    
     # has_many():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
@@ -183,14 +188,14 @@ C<lib/MyApp/Schema/UserRoles.pm>:
     #
     # Set relationships:
     #
-
+    
     # belongs_to():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
     #     2) Name of the model class referenced by this relationship
     #     3) Column name in *this* table
     __PACKAGE__->belongs_to(user => 'MyApp::Schema::Users', 'user_id');
-
+    
     # belongs_to():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
@@ -247,19 +252,19 @@ by Catalyst under C<MyApp::Model>.
 Edit C<lib/MyApp.pm> and update it as follows (everything below
 C<StackTrace> is new):
 
-    use Catalyst qw/
+    __PACKAGE__->setup(qw/
             -Debug
             ConfigLoader
             Static::Simple
-
+    
             StackTrace
-
+    
             Authentication
-
+    
             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
@@ -304,6 +309,8 @@ 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:
 
+    # rename this file to MyApp.yml and put a : in front of "name" if
+    # you want to use yaml like in old versions of Catalyst
     name MyApp
     <authentication>
         default_realm dbic
@@ -343,6 +350,7 @@ Note that you can use many other config file formats with catalyst.
 See L<Catalyst::Plugin::ConfigLoader|Catalyst::Plugin::ConfigLoader>
 for details.
 
+
 =head2 Add Login and Logout Controllers
 
 Use the Catalyst create script to create two stub controller files:
@@ -366,18 +374,18 @@ line:
 Then update it to match:
 
     =head2 index
-
+    
     Login logic
-
+    
     =cut
-
+    
     sub index :Path :Args(0) {
         my ($self, $c) = @_;
-
+    
         # Get the username and password from form
         my $username = $c->request->params->{username} || "";
         my $password = $c->request->params->{password} || "";
-
+    
         # If the username and password values were found in form
         if ($username && $password) {
             # Attempt to log the user in
@@ -391,7 +399,7 @@ Then update it to match:
                 $c->stash->{error_msg} = "Bad username or password.";
             }
         }
-
+    
         # If either of above don't work out, send to the login page
         $c->stash->{template} = 'login.tt2';
     }
@@ -403,10 +411,10 @@ will stay at the login page and receive an error message.  If the
 C<username> and C<password> values are not present in the form, the
 user will be taken to the empty login form.
 
-Note that we could have used something like C<sub default :Path>,
-however partly for historical reasons, and partly for code clarity it
-is generally recommended only to use C<default> in
-C<MyApp::Controller::Root>, and then mainly to generate the 404 not
+Note that we could have used something like C<sub default :Path>, 
+however, it is generally recommended (partly for historical reasons, 
+and partly for code clarity) only to use C<default> in 
+C<MyApp::Controller::Root>, and then mainly to generate the 404 not 
 found page for the application.
 
 Instead, we are using C<sub base :Path :Args(0) {...}> here to
@@ -424,17 +432,17 @@ Next, update the corresponding method in
 C<lib/MyApp/Controller/Logout.pm> to match:
 
     =head2 index
-
+    
     Logout logic
-
+    
     =cut
-
+    
     sub index :Path :Args(0) {
         my ($self, $c) = @_;
-
+    
         # Clear the user's state
         $c->logout;
-
+    
         # Send the user to the starting point
         $c->response->redirect($c->uri_for('/'));
     }
@@ -449,7 +457,7 @@ line of the C<sub index>.
 Create a login form by opening C<root/src/login.tt2> and inserting:
 
     [% META title = 'Login' %]
-
+    
     <!-- Login form -->
     <form method="post" action="[% c.uri_for('/login') %]">
       <table>
@@ -481,17 +489,17 @@ Edit the existing C<lib/MyApp/Controller/Root.pm> class file and insert
 the following method:
 
     =head2 auto
-
+    
     Check if there is a user and, if not, forward to login page
-
+    
     =cut
-
+    
     # Note that 'auto' runs after 'begin' but before your actions and that
     # 'auto's "chain" (all from application path to most specific class are run)
     # See the 'Actions' section of 'Catalyst::Manual::Intro' for more info.
     sub auto : Private {
         my ($self, $c) = @_;
-
+    
         # Allow unauthenticated users to reach the login page.  This
         # allows anauthenticated users to reach any action in the Login
         # controller.  To lock it down to a single action, we could use:
@@ -501,7 +509,7 @@ the following method:
         if ($c->controller eq $c->controller('Login')) {
             return 1;
         }
-
+    
         # If a user doesn't exist, force login
         if (!$c->user_exists) {
             # Dump a log message to the development server debug output
@@ -511,7 +519,7 @@ the following method:
             # Return 0 to cancel 'post-auto' processing and prevent use of application
             return 0;
         }
-
+    
         # User found, so return 1 to continue with processing after this 'auto'
         return 1;
     }
@@ -616,21 +624,25 @@ running) and restart it:
 
     $ script/myapp_server.pl
 
-B<IMPORTANT NOTE:> If you are having issues with authentication on
-Internet Explorer, be sure to check the system clocks on both your
-server and client machines.  Internet Explorer is very picky about
-timestamps for cookies.  Note that you can quickly sync an Ubuntu
+B<IMPORTANT NOTE:> If you are having issues with authentication on 
+Internet Explorer, be sure to check the system clocks on both your 
+server and client machines.  Internet Explorer is very picky about 
+timestamps for cookies.  Note that you can quickly sync an Ubuntu 
 system with the following command:
 
     sudo ntpdate ntp.ubuntu.com
 
-Now trying going to L<http://localhost:3000/books/list> and you should
-be redirected to the login page, hitting Shift+Reload if necessary (the
-"You are already logged in" message should I<not> appear -- if it does,
-click the C<logout> button and try again). Note the C<***Root::auto User
-not found...> debug message in the development server output.  Enter
-username C<test01> and password C<mypass>, and you should be taken to
-the Book List page.
+Or possibly try C<sudo ntpdate -u ntp.ubuntu.com> (to us an 
+unpriviledged port) or C<sudo ntpdate pool.ntp.org> (to try a 
+different server in case the Ubuntu NTP server is down).
+
+Now trying going to L<http://localhost:3000/books/list> and you should 
+be redirected to the login page, hitting Shift+Reload or Ctrl+Reload 
+if necessary (the "You are already logged in" message should I<not> 
+appear -- if it does, click the C<logout> button and try again). Note 
+the C<***Root::auto User not found...> debug message in the 
+development server output.  Enter username C<test01> and password 
+C<mypass>, and you should be taken to the Book List page.
 
 Open C<root/src/books/list.tt2> and add the following lines to the
 bottom (below the closing </table> tag):
@@ -709,7 +721,7 @@ Then use the following command to update the SQLite database:
 
     $ sqlite3 myapp.db < myapp03.sql
 
-B<Note:> We are using SHA-1 hashes here, but many other hashing
+B<Note:> We are using SHA-1 hashes here, but many other hashing 
 algorithms are supported.  See C<Digest> for more information.
 
 
@@ -719,6 +731,8 @@ C<Catalyst::Plugin::Authentication::Store::DBIC>
 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):
 
+    # rename this file to MyApp.yml and put a : in front of "name" if
+    # you want to use yaml like in old versions of Catalyst
     name MyApp
     <authentication>
         default_realm dbic
@@ -754,6 +768,7 @@ C<password_hash_type> are new, everything else is the same):
         </realms>
     </authentication>
 
+
 =head2 Try Out the Hashed Passwords
 
 Press C<Ctrl-C> to kill the previous server instance (if it's still
@@ -783,37 +798,42 @@ to match the following (everything after the model search line of code
 has changed):
 
     =head2 delete
-
+    
     Delete a book
-
+    
     =cut
-
+    
     sub delete : Local {
         # $id = primary key of book to delete
         my ($self, $c, $id) = @_;
-
+    
         # Search for the book and then delete it
         $c->model('DB::Books')->search({id => $id})->delete_all;
-
+    
         # Use 'flash' to save information across requests until it's read
         $c->flash->{status_msg} = "Book deleted";
-
+    
         # Redirect the user back to the list page
         $c->response->redirect($c->uri_for('/books/list'));
     }
 
-Next, open C<root/lib/site/layout> and update the TT code to pull from
+Next, open C<root/src/wrapper.tt2> and update the TT code to pull from
 flash vs. the C<status_msg> query parameter:
 
-    <div id="header">[% PROCESS site/header %]</div>
-
+    ...
     <div id="content">
-    <span class="message">[% status_msg || c.flash.status_msg %]</span>
-    <span class="error">[% error_msg %]</span>
-    [% content %]
-    </div>
+        [%# Status and error messages %]
+        <span class="message">[% status_msg || c.flash.status_msg %]</span>
+        <span class="error">[% error_msg %]</span>
+        [%# This is where TT will stick all of your template's contents. -%]
+        [% content %]
+    </div><!-- end content -->
+    ...
 
-    <div id="footer">[% PROCESS site/footer %]</div>
+Although the sample above only shows the C<content> div, leave the 
+rest of the file intact -- the only change we made to the C<wrapper.tt2>
+was to add "C<|| c.request.params.status_msg>" to the 
+C<E<lt>span class="message"E<gt>> line.
 
 
 =head2 Try Out Flash
@@ -832,13 +852,14 @@ after that first time (unless you reset it).  Please refer to
 L<Catalyst::Plugin::Session|Catalyst::Plugin::Session> for additional
 information.
 
+
 =head2 Switch To Flash-To-Stash
 
 Although the a use of flash above is certainly an improvement over the
-C<status_msg> we employed in Part 4 of the tutorial, the C<status_msg
-|| c.flash.status_msg> statement is a little ugly. A nice
+C<status_msg> we employed in Part 4 of the tutorial, the 
+C<status_msg || c.flash.status_msg> statement is a little ugly. A nice
 alternative is to use the C<flash_to_stash> feature that automatically
-copies the content of flash to stash.  This makes your code controller
+copies the content of flash to stash.  This makes your controller
 and template code work regardless of where it was directly access, a
 forward, or a redirect. To enable C<flash_to_stash>, you can either
 set the value in C<lib/MyApp.pm> by changing the default
@@ -859,8 +880,8 @@ 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
 possibly breaking some of your code.
 
-Then edit C<root/lib/site/layout> and change the C<status_msg> line
-to look like the following:
+Then edit C<root/src/wrapper.tt2> and change the C<status_msg> line
+to match the following:
 
     <span class="message">[% status_msg %]</span>
 
diff --git a/lib/Catalyst/Manual/Tutorial/Authorization.pod b/lib/Catalyst/Manual/Tutorial/Authorization.pod
index 331325b..66ada75 100644
--- a/lib/Catalyst/Manual/Tutorial/Authorization.pod
+++ b/lib/Catalyst/Manual/Tutorial/Authorization.pod
@@ -64,30 +64,32 @@ at how the ACL authorization plugin can simplify your code.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
+
 
 =head1 BASIC AUTHORIZATION
 
 In this section you learn how to manually configure authorization.
 
+
 =head2 Update Plugins to Include Support for Authorization
 
 Edit C<lib/MyApp.pm> and add C<Authorization::Roles> to the list:
 
-    use Catalyst qw/
+    __PACKAGE__->setup(qw/
             -Debug
             ConfigLoader
             Static::Simple
-
+    
             StackTrace
-
+    
             Authentication
             Authorization::Roles
-
+    
             Session
             Session::Store::FastMmap
             Session::State::Cookie
-            /;
+        /;
 
 
 =head2 Add Config Information for Authorization
@@ -95,6 +97,8 @@ Edit C<lib/MyApp.pm> and add C<Authorization::Roles> to the list:
 Edit C<myapp.conf> and update it to match the following (the
 C<role_relation> and C<role_field> definitions are new):
 
+    # rename this file to MyApp.yml and put a : in front of "name" if
+    # you want to use yaml like in old versions of Catalyst
     name MyApp
     <authentication>
         default_realm dbic
@@ -143,12 +147,12 @@ Open C<root/src/books/list.tt2> in your editor and add the following
 lines to the bottom of the file:
 
     <p>Hello [% c.user.username %], you have the following roles:</p>
-
+    
     <ul>
       [% # Dump list of roles -%]
       [% FOR role = c.user.roles %]<li>[% role %]</li>[% END %]
     </ul>
-
+    
     <p>
     [% # Add some simple role-specific logic to template %]
     [% # Use $c->check_user_roles() to check authz -%]
@@ -156,7 +160,7 @@ lines to the bottom of the file:
       [% # Give normal users a link for 'logout' %]
       <a href="[% c.uri_for('/logout') %]">Logout</a>
     [% END %]
-
+    
     [% # Can also use $c->user->check_roles() to check authz -%]
     [% IF c.check_user_roles('admin') %]
       [% # Give admin users a link for 'create' %]
@@ -167,6 +171,7 @@ lines to the bottom of the file:
 This code displays a different combination of links depending on the
 roles assigned to the user.
 
+
 =head2 Limit C<Books::add> to C<admin> Users
 
 C<IF> statements in TT templates simply control the output that is sent
@@ -180,18 +185,18 @@ admin-level users by editing C<lib/MyApp/Controller/Books.pm> and
 updating C<url_create> to match the following code:
 
     =head2 url_create
-
+    
     Create a book with the supplied title and rating,
     with manual authorization
-
+    
     =cut
-
+    
     sub url_create : Local {
         # In addition to self & context, get the title, rating & author_id args
         # from the URL.  Note that Catalyst automatically puts extra information
         # after the "/<controller_name>/<action_name/" into @_
         my ($self, $c, $title, $rating, $author_id) = @_;
-
+    
         # Check the user's roles
         if ($c->check_user_roles('admin')) {
             # Call create() on the book model object. Pass the table
@@ -200,16 +205,16 @@ updating C<url_create> to match the following code:
                     title   => $title,
                     rating  => $rating
                 });
-
+    
             # Add a record to the join table for this book, mapping to
             # appropriate author
             $book->add_to_book_authors({author_id => $author_id});
             # Note: Above is a shortcut for this:
             # $book->create_related('book_authors', {author_id => $author_id});
-
+    
             # Assign the Book object to the stash for display in the view
             $c->stash->{book} = $book;
-
+    
             # This is a hack to disable XSUB processing in Data::Dumper
             # (it's used in the view).  This is a work-around for a bug in
             # the interaction of some versions or Perl, Data::Dumper & DBIC.
@@ -217,7 +222,7 @@ updating C<url_create> to match the following code:
             # you are running DBIC 0.06001 or greater), but adding it doesn't
             # hurt anything either.
             $Data::Dumper::Useperl = 1;
-
+    
             # Set the TT template to use
             $c->stash->{template} = 'books/create_done.tt2';
         } else {
@@ -242,6 +247,7 @@ create a new copy and comment out the original by making it look like a
 Pod comment.  For example, put something like C<=begin> before C<sub add
 : Local {> and C<=end> after the closing C<}>.
 
+
 =head2 Try Out Authentication And Authorization
 
 Press C<Ctrl-C> to kill the previous server instance (if it's still
@@ -249,13 +255,13 @@ running) and restart it:
 
     $ script/myapp_server.pl
 
-Now trying going to L<http://localhost:3000/books/list> and you should
-be taken to the login page (you might have to C<Shift+Reload> your
-browser and/or click the "Logout" link on the book list page).  Try
-logging in with both C<test01> and C<test02> (both use a password
-of C<mypass>) and notice how the roles information updates at the
-bottom of the "Book List" page. Also try the C<Logout> link on the
-book list page.
+Now trying going to L<http://localhost:3000/books/list> and you should 
+be taken to the login page (you might have to C<Shift+Reload> or 
+C<Ctrl+Reload> your browser and/or click the "Logout" link on the book 
+list page).  Try logging in with both C<test01> and C<test02> (both 
+use a password of C<mypass>) and notice how the roles information 
+updates at the bottom of the "Book List" page. Also try the C<Logout> 
+link on the book list page.
 
 Now the "url_create" URL will work if you are already logged in as user
 C<test01>, but receive an authorization failure if you are logged in as
@@ -263,8 +269,8 @@ C<test02>.  Try:
 
     http://localhost:3000/books/url_create/test/1/6
 
-while logged in as each user.  Use one of the 'Logout' links (or go to
-L<http://localhost:3000/logout> in your browser directly) when you are
+while logged in as each user.  Use one of the 'Logout' links (or go to 
+L<http://localhost:3000/logout> in your browser directly) when you are 
 done.
 
 
@@ -275,20 +281,22 @@ L<Catalyst::Plugin::Authorization::ACL|Catalyst::Plugin::Authorization::ACL>
 plugin can automate much of the work required to perform role-based
 authorization in a Catalyst application.
 
+
 =head2 Add the C<Catalyst::Plugin::Authorization::ACL> Plugin
 
 Open C<lib/MyApp.pm> in your editor and add the following plugin to the
-C<use Catalyst> statement:
+C<__PACKAGE__-E<gt>setup> statement:
 
     Authorization::ACL
 
 Note that the remaining C<use Catalyst> plugins from earlier sections
 are not shown here, but they should still be included.
 
+
 =head2 Add ACL Rules to the Application Class
 
 Open C<lib/MyApp.pm> in your editor and add the following B<BELOW> the
-C<__PACKAGE__-E<gt>setup;> statement:
+C<__PACKAGE__-E<gt>setup> statement:
 
     # Authorization::ACL Rules
     __PACKAGE__->deny_access_unless(
@@ -358,6 +366,7 @@ C<lib\MyApp.pm> B<after> the C<__PACKAGE__-E<gt>setup;> line.
 
 =back
 
+
 =head2 Add a Method to Handle Access Violations
 
 By default,
@@ -372,17 +381,17 @@ Open C<lib/MyApp/Controller/Books.pm> in your editor and add the
 following method:
 
     =head2 access_denied
-
+    
     Handle Catalyst::Plugin::Authorization::ACL access denied exceptions
-
+    
     =cut
-
+    
     sub access_denied : Private {
         my ($self, $c) = @_;
-
+    
         # Set the error message
         $c->stash->{error_msg} = 'Unauthorized!';
-
+    
         # Display the list
         $c->forward('list');
     }
diff --git a/lib/Catalyst/Manual/Tutorial/BasicCRUD.pod b/lib/Catalyst/Manual/Tutorial/BasicCRUD.pod
index bc96f3d..fa5a5a9 100644
--- a/lib/Catalyst/Manual/Tutorial/BasicCRUD.pod
+++ b/lib/Catalyst/Manual/Tutorial/BasicCRUD.pod
@@ -66,9 +66,17 @@ focus on the Create and Delete aspects of CRUD.  More advanced
 capabilities, including full Update functionality, will be addressed in
 Part 9.
 
+Although this part of the tutorial will show you how to build CRUD 
+functionality yourself, another option is to use a "CRUD builder" type 
+of tool to automate the process.  You get less control, but it's quick 
+and easy.  For example, see 
+L<CatalystX::ListFramework::Builder|CatalystX::ListFramework::Builder>,
+L<CatalystX::CRUD|CatalystX::CRUD>, and 
+L<CatalystX::CRUD:YUI|CatalystX::CRUD:YUI>.
+
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
 
 
 =head1 FORMLESS SUBMISSION
@@ -172,22 +180,20 @@ Edit C<root/src/books/create_done.tt2> and then enter:
     [% Dumper.dump(book) %]
     </pre>
 
-The TT C<USE> directive allows access to a variety of plugin modules (TT
-plugins, that is, not Catalyst plugins) to add extra functionality to
-the base TT capabilities.  Here, the plugin allows L<Data::Dumper>
-"pretty printing" of objects and variables.  Other than that, the rest
-of the code should be familiar from the examples in Part 3.
+The TT C<USE> directive allows access to a variety of plugin modules 
+(TT plugins, that is, not Catalyst plugins) to add extra functionality 
+to the base TT capabilities.  Here, the plugin allows 
+L<Data::Dumper|Data::Dumper> "pretty printing" of objects and 
+variables.  Other than that, the rest of the code should be familiar 
+from the examples in Part 3.
 
-B<IMPORTANT NOTE> As mentioned earlier, the C<MyApp::View::TT.pm> view
-class created by TTSite redefines the name used to access the Catalyst
-context object in TT templates from the usual C<c> to C<Catalyst>.
 
 =head2 Try the C<url_create> Feature
 
 If the application is still running from before, use C<Ctrl-C> to kill
 it. Then restart the server:
 
-    $ script/myapp_server.pl
+    $ DBIC_TRACE=1 script/myapp_server.pl
 
 Note that new path for C</books/url_create> appears in the startup debug
 output.
@@ -218,9 +224,9 @@ The C<INSERT> statements are obviously adding the book and linking it to
 the existing record for Richard Stevens.  The C<SELECT> statement results
 from DBIC automatically fetching the book for the C<Dumper.dump(book)>.
 
-If you then click the "Return to list" link, you should find that there
-are now six books shown (if necessary, Shift-Reload your browser at the
-C</books/list> page).
+If you then click the "Return to list" link, you should find that 
+there are now six books shown (if necessary, Shift+Reload or 
+Ctrl+Reload your browser at the C</books/list> page).
 
 Then I<add 2 more copies of the same book> so that we have some extras for
 our delete logic that will be coming up soon.  Enter the same URL above
@@ -260,6 +266,7 @@ Edit C<lib/MyApp/Controller/Books.pm> and add the following method:
 
 This action simply invokes a view containing a book creation form.
 
+
 =head2 Add a Template for the Form
 
 Open C<root/src/books/form_create.tt2> in your editor and enter:
@@ -278,6 +285,7 @@ Open C<root/src/books/form_create.tt2> in your editor and enter:
 Note that we have specified the target of the form data as
 C<form_create_do>, the method created in the section that follows.
 
+
 =head2 Add a Method to Process Form Values and Update Database
 
 Edit C<lib/MyApp/Controller/Books.pm> and add the following method to
@@ -326,7 +334,7 @@ it.  Then restart the server:
 
 Point your browser to L<http://localhost:3000/books/form_create> and
 enter "TCP/IP Illustrated, Vol 3" for the title, a rating of 5, and an
-author ID of 4.  You should then be forwarded to the same
+author ID of 4.  You should then see the output of the same
 C<create_done.tt2> template seen in earlier examples.  Finally, click
 "Return to list" to view the full list of books.
 
@@ -390,12 +398,13 @@ The additional code is obviously designed to add a new column to the
 right side of the table with a C<Delete> "button" (for simplicity, links
 will be used instead of full HTML buttons).
 
+
 =head2 Add a Delete Action to the Controller
 
 Open C<lib/MyApp/Controller/Books.pm> in your editor and add the
 following method:
 
-    =head2 delete 
+    =head2 delete
     
     Delete a book
         
@@ -530,18 +539,23 @@ C<sub delete> method to match the following:
 
 This modification simply leverages the ability of C<uri_for> to include
 an arbitrary number of name/value pairs in a hash reference.  Next, we 
-need to update C<root/lib/site/layout> to handle C<status_msg> as a 
+need to update C<root/src/wrapper> to handle C<status_msg> as a 
 query parameter:
 
-    <div id="header">[% PROCESS site/header %]</div>
-    
+    ...
     <div id="content">
-    <span class="message">[% status_msg || c.request.params.status_msg %]</span>
-    <span class="error">[% error_msg %]</span>
-    [% content %]
-    </div>
-    
-    <div id="footer">[% PROCESS site/footer %]</div>
+        [%# Status and error messages %]
+        <span class="message">[% status_msg || c.request.params.status_msg %]</span>
+        <span class="error">[% error_msg %]</span>
+        [%# This is where TT will stick all of your template's contents. -%]
+        [% content %]
+    </div><!-- end content -->
+    ...
+
+Although the sample above only shows the C<content> div, leave the 
+rest of the file intact -- the only change we made to the C<wrapper.tt2>
+was to add "C<|| c.request.params.status_msg>" to the 
+C<E<lt>span class="message"E<gt>> line.
 
 
 =head2 Try the Delete and Redirect With Query Param Logic
diff --git a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
index 094813a..5ad7702 100644
--- a/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/CatalystBasics.pod
@@ -108,7 +108,7 @@ to persist and restore objects to/from a relational database.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
 
 
 =head1 CREATE A CATALYST PROJECT
diff --git a/lib/Catalyst/Manual/Tutorial/Debugging.pod b/lib/Catalyst/Manual/Tutorial/Debugging.pod
index 125bc3d..5cf5b6a 100644
--- a/lib/Catalyst/Manual/Tutorial/Debugging.pod
+++ b/lib/Catalyst/Manual/Tutorial/Debugging.pod
@@ -76,19 +76,20 @@ Fans of interactive debuggers.
 
 Catalyst is able to easily accommodate both styles of debugging.
 
+
 =head1 LOG STATEMENTS
 
-Folks in the former group can use Catalyst's C<$c-E<gt>log> facility.
-(See L<Catalyst::Log> for more detail.) For example, if you add the
-following code to a controller action method:
+Folks in the former group can use Catalyst's C<$c-E<gt>log> facility. 
+(See L<Catalyst::Log|Catalyst::Log> for more detail.) For example, if 
+you add the following code to a controller action method:
 
     $c->log->info("Starting the foreach loop here");
 
     $c->log->debug("Value of \$id is: ".$id);
 
 Then the Catalyst development server will display your message along
-with the other debug output. To accomplish the same thing in a TTSite
-view use:
+with the other debug output. To accomplish the same thing in a TT
+template view use:
 
     [% c.log.debug("This is a test log message") %]
 
@@ -96,6 +97,7 @@ You can also use L<Data::Dumper|Data::Dumper> in both Catalyst code
 (C<use Data::Dumper; $c-E<gt>log-E<gt>debug("\$var is: ".Dumper($var));)>) 
 and TT templates (C<[% Dumper.dump(book) %]>.
 
+
 =head1 RUNNING CATALYST UNDER THE PERL DEBUGGER
 
 Members of the interactive-debugger fan club will also be at home with
@@ -279,7 +281,7 @@ debugging:
 
 Check the version of an installed module:
 
-    perl -MModule::Name -e 'print $Module::Name::VERSION;'
+    perl -ME<lt>mod_nameE<gt> -e '"print $E<lt>mod_nameE<gt>::VERSION\n"'
 
 For example:
 
@@ -305,6 +307,30 @@ Otherwise, it returns undef and nothing will be printed.
 =back
 
 
+=head1 TT DEBUGGING
+
+If you run into issues during the rendering of your template, it might 
+be helpful to enable TT C<DEBUG> options.  You can do this in a Catalyst 
+environment by adding a C<DEBUG> line to the C<__PACKAGE__->config> 
+declaration in C<lib/MyApp/View/TT.pm>:
+
+    __PACKAGE__->config({
+        TEMPLATE_EXTENSION => '.tt2',
+        DEBUG              => 'undef',
+    });
+
+There are a variety of options you can use, such as 'undef', 'all', 
+'service', 'context', 'parser' and 'provider'.  See 
+L<Template::Constants|Template::Constants> for more information 
+(remove the C<DEBUG_> portion of the name shown in the TT docs and 
+convert to lower case for use inside Catalyst).
+
+B<NOTE:> B<Please be sure to disable TT debug options before continuing 
+with the tutorial> (especially the 'undef' option -- leaving this 
+enabled will conflict with several of the conventions used by this 
+tutorial to leave some variables undefined on purpose).
+
+
 =head1 AUTHOR
 
 Kennedy Clark, C<hkclark@gmail.com>
@@ -314,4 +340,4 @@ most recent version of the Catalyst Tutorial can be found at
 L<http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Manual/lib/Catalyst/Manual/Tutorial/>.
 
 Copyright 2006-2008, Kennedy Clark, under Creative Commons License
-(L<http://creativecommons.org/licenses/by-nc-sa/2.5/>).
+(L<http://creativecommons.org/licenses/by-sa/3.0/us/>).
diff --git a/lib/Catalyst/Manual/Tutorial/Intro.pod b/lib/Catalyst/Manual/Tutorial/Intro.pod
index e863853..0892981 100644
--- a/lib/Catalyst/Manual/Tutorial/Intro.pod
+++ b/lib/Catalyst/Manual/Tutorial/Intro.pod
@@ -135,9 +135,7 @@ vs. C<lib/MyApp.pm>, etc.
 
 =item * 
 
-The use of Template Toolkit (TT) and the
-L<Catalyst::Helper::View::TTSite|Catalyst::Helper::View::TTSite> 
-view helper.
+The use of Template Toolkit (TT).
 
 =item * 
 
@@ -178,6 +176,7 @@ through the Catalyst web site and at
 L<http://dev.catalyst.perl.org/wiki/UserIntroductions> and
 L<http://dev.catalyst.perl.org/>.
 
+
 =head1 VERSIONS AND CONVENTIONS USED IN THIS TUTORIAL
 
 This tutorial was built using the following resources. Please note that
@@ -271,14 +270,17 @@ will need to update the URL you use accordingly.
 
 =item * 
 
-Depending on the web browser you are using, you might need to hit
-C<Shift+Reload> to pull a fresh page when testing your application at
-various points.  Also, the C<-k> keepalive option to the development
-server can be necessary with some browsers (especially Internet
-Explorer).
+Depending on the web browser you are using, you might need to hit 
+C<Shift+Reload> or C<Ctrl+Reload> to pull a fresh page when testing 
+your application at various points (see 
+L<http://en.wikipedia.org/wiki/Bypass_your_cache> for a comprehensive
+list of options for each browser).  Also, the C<-k> keepalive option 
+to the development server can be necessary with some browsers 
+(especially Internet Explorer).
 
 =back
 
+
 =head1 CATALYST INSTALLATION
 
 While the rough edges of Catalyst installation have been a problem in
@@ -393,6 +395,7 @@ Using these instructions, you should be able to build a complete CentOS
 4.X server with Catalyst and all the plugins required to run this
 tutorial.
 
+
 =head1 DATABASES
 
 This tutorial will primarily focus on SQLite because of its simplicity
@@ -405,6 +408,7 @@ notice that only the C<.sql> files used to initialize the database
 change between database systems: the Catalyst code generally remains the
 same.
 
+
 =head1 WHERE TO GET WORKING CODE
 
 Each part of the tutorial has complete code available in the main
diff --git a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
index 3cc95de..5af6537 100644
--- a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
@@ -56,25 +56,25 @@ L<Appendices|Catalyst::Manual::Tutorial::Appendices>
 
 =head1 DESCRIPTION
 
-This part of the tutorial builds on the work done in Part 2 to explore 
-some features that are more typical of "real world" web applications. 
-From this part of the tutorial onward, we will be building a simple 
-book database application.  Although the application will be too 
-limited to be of use to anyone, it should provide a basic environment 
-where we can explore a variety of features used in virtually all web 
+This part of the tutorial builds on the work done in Part 2 to explore
+some features that are more typical of "real world" web applications.
+From this part of the tutorial onward, we will be building a simple
+book database application.  Although the application will be too
+limited to be of use to anyone, it should provide a basic environment
+where we can explore a variety of features used in virtually all web
 applications.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
 
 
 =head1 CREATE A NEW APPLICATION
 
-The remainder of the tutorial will build an application call C<MyApp>. 
-Use the Catalyst C<catalyst.pl> script to initialize the framework for 
-an application called C<MyApp> (make sure you aren't still inside the 
-directory of the C<Hello> application from the previous part of the 
+The remainder of the tutorial will build an application called C<MyApp>.
+First use the Catalyst C<catalyst.pl> script to initialize the framework
+for the C<MyApp> application (make sure you aren't still inside the
+directory of the C<Hello> application from the previous part of the
 tutorial):
 
     $ catalyst.pl MyApp
@@ -86,25 +86,25 @@ tutorial):
     created "MyApp/script/myapp_create.pl"
     $ cd MyApp
 
-This creates a similar skeletal structure to what we saw in Part 2 of 
-the tutorial, except with C<MyApp> and C<myapp> substituted for 
+This creates a similar skeletal structure to what we saw in Part 2 of
+the tutorial, except with C<MyApp> and C<myapp> substituted for
 C<Hello> and C<hello>.
 
 
 =head1 EDIT THE LIST OF CATALYST PLUGINS
 
 One of the greatest benefits of Catalyst is that it has such a large
-library of plugins available.  Plugins are used to seamlessly integrate
-existing Perl modules into the overall Catalyst framework.  In general,
-they do this by adding additional methods to the C<context> object
-(generally written as C<$c>) that Catalyst passes to every component
-throughout the framework.
+library of plugins and base classes available.  Plugins are used to
+seamlessly integrate existing Perl modules into the overall Catalyst
+framework.  In general, they do this by adding additional methods to the
+C<context> object (generally written as C<$c>) that Catalyst passes to
+every component throughout the framework.
 
 By default, Catalyst enables three plugins/flags:
 
 =over 4
 
-=item * 
+=item *
 
 C<-Debug> Flag
 
@@ -112,12 +112,12 @@ Enables the Catalyst debug output you saw when we started the
 C<script/myapp_server.pl> development server earlier.  You can remove
 this item when you place your application into production.
 
-As you may have noticed, C<-Debug> is not a plugin, but a I<flag>.
-Although most of the items specified on the C<use Catalyst> line of your
-application class will be plugins, Catalyst supports a limited number of
-flag options (of these, C<-Debug> is the most common).  See the
-documentation for C<Catalyst.pm> to get details on other flags 
-(currently C<-Engine>, C<-Home>, and C<-Log>).
+As you may have noticed, C<-Debug> is not a plugin, but a I<flag>. 
+Although most of the items specified on the C<__PACKAGE__-E<gt>setup> 
+line of your application class will be plugins, Catalyst supports a 
+limited number of flag options (of these, C<-Debug> is the most 
+common).  See the documentation for C<Catalyst.pm> to get details on 
+other flags (currently C<-Engine>, C<-Home>, and C<-Log>).
 
 If you prefer, you can use the C<$c-E<gt>debug> method to enable debug
 messages.
@@ -125,7 +125,7 @@ messages.
 B<TIP>: Depending on your needs, it can be helpful to permanently
 remove C<-Debug> from C<lib/MyApp.pm> and then use the C<-d> option
 to C<script/myapp_server.pl> to re-enable it just for the development
-server.  We will not be using that approach in the tutorial, but feel 
+server.  We will not be using that approach in the tutorial, but feel
 free to make use of it in your own projects.
 
 =item *
@@ -140,28 +140,25 @@ very similar to Apache configuration files.  We will see how to use
 this feature of Catalyst during the authentication and authorization
 sections (Part 5 and Part 6).
 
-B<IMPORTANT NOTE:> If you are following along in Ubuntu 8.04 or
-otherwise using a version of L<Catalyst::Devel|Catalyst::Devel> prior
-to version 1.06, you need to be aware that Catalyst changed from a
-default format of YAML to the more straightforward C<Config::General>
-format.  Because Catalyst has long supported both formats, this
-tutorial will simply use a configuration file called C<myapp.conf>
-instead of C<myapp.yml> and Catalyst will automatically use the new
-format.  Just be aware that earlier versions of Catalyst will still
-create the C<myapp.yml> file and that you will need to B<remove
-C<myapp.yml>> and create a new C<myapp.conf> file by hand, but
-otherwise this transition is very painless.  The default contents of
-C<myapp.conf> should only consist of one line: C<name MyApp>.  Also be
-aware that you can continue to use any format supported by
+B<IMPORTANT NOTE:> If you are using a version of
+L<Catalyst::Devel|Catalyst::Devel> prior to version 1.06, you need to
+be aware that Catalyst changed from a default format of YAML to the
+more straightforward C<Config::General> format.  This tutorial use the
+newer C<myapp.conf> configuration file for C<Config::General> instead
+of C<myapp.yml> for YAML. However, Catalyst has long supported both
+formats and Catalyst will automatically use either C<myapp.conf> or
+C<myapp.yml> (or any other format supported by
 L<Catalyst::Plugin::ConfigLoader|Catalyst::Plugin::ConfigLoader> and
-L<Config::Any|Config::Any>, including YAML -- Catalyst will
-automatically look for any of the supported configuration file
-formats.
+L<Config::Any|Config::Any>).  If you are using a versions of
+Catalyst::Devel prior to 1.06, you can convert to the newer format by
+simply creating the C<myapp.yml> file manually and deleting
+C<myapp.yml>.  The default contents of C<myapp.conf> should only
+consist of one line: C<name MyApp>.
 
-B<TIP>: This script can be useful for converting between configuration 
+B<TIP>: This script can be useful for converting between configuration
 formats:
 
-    perl -Ilib -e 'use MyApp; use Config::General; 
+    perl -Ilib -e 'use MyApp; use Config::General;
         Config::General->new->save_file("myapp.conf", MyApp->config);'
 
 B<NOTE:> The default C<myapp.conf> should look like:
@@ -177,53 +174,60 @@ as images and CSS files under the development server.
 
 =back
 
-To modify the list of plugins, edit C<lib/MyApp.pm> (this file is
-generally referred to as your I<application class>) and delete the line
-with:
-
-    use Catalyst qw/-Debug ConfigLoader Static::Simple/;
+For out 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:
 
-Replace it with:
+    __PACKAGE__->setup(qw/-Debug ConfigLoader Static::Simple/);
 
-    use Catalyst qw/
-                   -Debug
-                   ConfigLoader
-                   Static::Simple
+Then replace it with:
 
-                   StackTrace
-                  /;
+    __PACKAGE__->setup(qw/
+            -Debug
+            ConfigLoader
+            Static::Simple
+    
+            StackTrace
+        /);
+
+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 
+Catalyst sends to your browser when an error occurs). Be aware that 
+L<StackTrace|Catalyst::Plugin::StackTrace> output appears in your 
+browser, not in the console window from which you're running your 
+application, which is where logging output usually goes.
 
-This tells Catalyst to start using one new plugin:
+B<Notes:> 
 
 =over 4
 
-=item * 
+=item *
+
+C<__PACKAGE__> is just a shorthand way of referencing the name of the 
+package where it is used.  Therefore, in C<MyApp.pm>, C<__PACKAGE__> 
+is equivalent to C<MyApp>.
 
-L<Catalyst::Plugin::StackTrace|Catalyst::Plugin::StackTrace>
+=item *
 
-Adds a stack trace to the standard Catalyst "debug screen" (this is the
-screen Catalyst sends to your browser when an error occurs).
+You will want to disable L<StackTrace|Catalyst::Plugin::StackTrace> 
+before you put your application into production, but it can be helpful 
+during development.
 
-Note: L<StackTrace|Catalyst::Plugin::StackTrace> output appears in your
-browser, not in the console window from which you're running your
-application, which is where logging output usually goes.
+=item *
 
-B<Note:> You will want to disable 
-L<StackTrace|Catalyst::Plugin::StackTrace> before you put your 
-application into production, but it can be helpful during development.
+When specifying plugins on the C<__PACKAGE__-E<gt>setup> line, you can 
+omit C<Catalyst::Plugin::> from the name.  Additionally, you can 
+spread the plugin names across multiple lines as shown here, or place 
+them all on one (or more) lines as with the default configuration.
 
 =back
 
-Note that when specifying plugins on the C<use Catalyst> line, you can
-omit C<Catalyst::Plugin::> from the name.  Additionally, you can spread
-the plugin names across multiple lines as shown here, or place them all
-on one (or more) lines as with the default configuration.
-
 
 =head1 CREATE A CATALYST CONTROLLER
 
-As discussed earlier, controllers are where you write methods that 
-interact with user input.  Typically, controller methods respond to 
+As discussed earlier, controllers are where you write methods that
+interact with user input.  Typically, controller methods respond to
 C<GET> and C<POST> messages from the user's web browser.
 
 Use the Catalyst C<create> script to add a controller for book-related
@@ -235,15 +239,17 @@ actions:
     created "/home/me/MyApp/script/../lib/MyApp/Controller/Books.pm"
     created "/home/me/MyApp/script/../t/controller_Books.t"
 
-Then edit C<lib/MyApp/Controller/Books.pm> and add the following method
-to the controller:
+Then edit C<lib/MyApp/Controller/Books.pm> (as discussed in Part 2 of
+the Tutorial, Catalyst has a separate directory under C<lib/MyApp> for
+each of the three parts of MVC: C<Model>, C<View>, and C<Controller>)
+and add the following method to the controller:
 
     =head2 list
     
     Fetch all book objects and pass to books/list.tt2 in stash to be displayed
     
     =cut
-     
+    
     sub list : Local {
         # Retrieve the usual Perl OO '$self' for this object. $c is the Catalyst
         # 'Context' that's used to 'glue together' the various components
@@ -252,66 +258,66 @@ to the controller:
     
         # Retrieve all of the book records as book model objects and store in the
         # stash where they can be accessed by the TT template
-        $c->stash->{books} = [$c->model('DB::Books')->all];
-        
+        # $c->stash->{books} = [$c->model('DB::Books')->all];
+        # But, for now, use this code until we create the model later
+        $c->stash->{books} = '';
+    
         # Set the TT template to use.  You will almost always want to do this
         # in your action methods (action methods respond to user input in
         # your controllers).
         $c->stash->{template} = 'books/list.tt2';
     }
 
-B<Note:> This won't actually work yet since you haven't set up your 
-model yet.  We will be covering the model soon.
-
-B<Note:> Programmers experienced with object-oriented Perl should 
-recognize C<$self> as a reference to the object where this method was 
-called.  On the other hand, C<$c> will be new to many Perl programmers 
-who have not used Catalyst before (it's sometimes written as 
-C<$context>).  The Context object is automatically passed to all 
-Catalyst components.  It is used to pass information between 
-components and provide access to Catalyst and plugin functionality.
+B<TIP>: See Appendix 1 for tips on removing the leading spaces when
+cutting and pasting example code from POD-based documents.
 
-B<TIP>: You may see the C<$c-E<gt>model('DB::Book')> used above
-written as C<$c-E<gt>model('DB')-E<gt>resultset('Book')>.  The two
-are equivalent.
+Programmers experienced with object-oriented Perl should recognize 
+C<$self> as a reference to the object where this method was called. 
+On the other hand, C<$c> will be new to many Perl programmers who have 
+not used Catalyst before (it's sometimes written as C<$context>).  The 
+Context object is automatically passed to all Catalyst components.  It 
+is used to pass information between components and provide access to 
+Catalyst and plugin functionality.
 
 B<Note:> Catalyst actions are regular Perl methods, but they make use 
-of Nicholas Clark's C<attributes> module (that's the C<: Local> next 
+of Nicholas Clark's C<attributes> module (that's the "C<: Local>" next 
 to the C<sub list> in the code above) to provide additional 
 information to the Catalyst dispatcher logic.  Many newer Catalyst 
 applications are switching to the use of "Literal" C<:Path> actions 
 and C<Args> attribute in lieu of C<: Local> and C<: Private>.  For 
-example, C<sub any_method :Path :Args(0)> can be used instead of 
-C<sub index :Private> (because no path was supplied to C<Path> it 
-matches the "empty" URL in the namespace of that module... the same 
-thing C<sub index> would do) or C<sub list :Path('list') :Args(0)> 
-could be used instead of the C<sub list : Local> above (the C<list> 
-argument to C<Path> would make it match on the URL C<list> under 
-C<books>, the namespace of the current module).  See "Action Types" in 
+example, C<sub any_method :Path :Args(0)> can be used instead of C<sub 
+index :Private> (because no path was supplied to C<Path> it matches 
+the "empty" URL in the namespace of that module... the same thing 
+C<sub index> would do) or C<sub list :Path('list') :Args(0)> could be 
+used instead of the C<sub list : Local> above (the C<list> argument to 
+C<Path> would make it match on the URL C<list> under C<books>, the 
+namespace of the current module).  See "Action Types" in 
 L<Catalyst::Manual::Intro|Catalyst::Manual::Intro> as well as Part 5 
 of this tutorial (Authentication) for additional information.  Another 
 popular but more advanced feature is C<Chained> actions that allow a 
 single URL to "chain together" multiple action method calls, each with 
-an appropriate number of arguments (see
-L<Catalyst::DispatchType::Chained|Catalyst::DispatchType::Chained>
-for details).
+an appropriate number of arguments (see 
+L<Catalyst::DispatchType::Chained|Catalyst::DispatchType::Chained> for 
+details).
 
 
 =head1 CATALYST VIEWS
 
 As mentioned in Part 2 of the tutorial, views are where you render 
-output, typically for display in the user's web browser, but also 
-possibly using other display output- generation systems.  As with 
-virtually every aspect of Catalyst, options abound when it comes to 
-the specific view technology you adopt inside your application. 
-However, most Catalyst applications use the Template Toolkit, known as 
-TT (for more information on TT, see 
-L<http://www.template-toolkit.org>). Other popular view technologies 
-include Mason (L<http://www.masonhq.com> and 
-L<http://www.masonbook.com>) and L<HTML::Template> 
-(L<http://html-template.sourceforge.net>).
-
-=head2 Create a Catalyst View Using C<TTSite>
+output, typically for display in the user's web browser (but also 
+possibly using other display output-generation systems).  The code in 
+C<lib/MyApp/View> selects the I<type> of view to use, with the actual 
+rendering template found in the C<root> directory.  As with virtually 
+every aspect of Catalyst, options abound when it comes to the specific 
+view technology you adopt inside your application. However, most 
+Catalyst applications use the Template Toolkit, known as TT (for more 
+information on TT, see L<http://www.template-toolkit.org>). Other 
+somewhat popular view technologies include Mason 
+(L<http://www.masonhq.com> and L<http://www.masonbook.com>) and 
+L<HTML::Template> (L<http://html-template.sourceforge.net>).
+
+
+=head2 Create a Catalyst View
 
 When using TT for the Catalyst view, there are two main helper scripts:
 
@@ -330,105 +336,63 @@ L<Catalyst::Helper::View::TTSite|Catalyst::Helper::View::TTSite>
 Both are similar, but C<TT> merely creates the C<lib/MyApp/View/TT.pm>
 file and leaves the creation of any hierarchical template organization
 entirely up to you. (It also creates a C<t/view_TT.t> file for testing;
-test cases will be discussed in Part 8). The C<TTSite> helper creates a
-modular and hierarchical view layout with separate Template Toolkit (TT)
-files for common header and footer information, configuration values, a
-CSS stylesheet, and more.
-
-While TTSite is useful to bootstrap a project, we recommend that
-unless you know what you're doing or want to pretty much use the
-supplied templates as is, that you use the plain Template Toolkit view
-when starting a project from scratch.  This is because TTSite can be
-tricky to customize.  Additionally TT contains constructs that you
-need to learn yourself if you're going to be a serious user of TT.
-Our experience suggests that you're better off learning these from
-scratch.  We use TTSite here precisely because it is useful for
-bootstrap/prototype purposes.
-
-Enter the following command to enable the C<TTSite> style of view
+test cases will be discussed in Part 8.) On the other hand, the
+C<TTSite> helper creates a modular and hierarchical view layout with
+separate Template Toolkit (TT) files for common header and footer
+information, configuration values, a CSS stylesheet, and more.
+
+While TTSite is useful to bootstrap a project, most in the Catalyst 
+community recommend that it's easier to learn both Catalyst and 
+Tempalte Toolkit if you use the more basic TT approach.  Consequently, 
+this tutorial will use "plain old TT."
+
+Enter the following command to enable the C<TT> style of view
 rendering for this tutorial:
 
-    $ script/myapp_create.pl view TT TTSite
+    $ script/myapp_create.pl view TT TT
      exists "/home/me/MyApp/script/../lib/MyApp/View"
      exists "/home/me/MyApp/script/../t"
-    created "/home/me/MyApp/script/../lib/MyApp/View/TT.pm"
-    created "/home/me/MyApp/script/../root/lib"
-    ...
-    created "/home/me/MyApp/script/../root/src/ttsite.css"
-
-This puts a number of files in the C<root/lib> and C<root/src>
-directories that can be used to customize the look and feel of your
-application.  Also take a look at C<lib/MyApp/View/TT.pm> for config
-values set by the C<TTSite> helper.
-
-B<TIP>: When troubleshooting TT it can be helpful to enable variable
-C<DEBUG> options.  You can do this in a Catalyst environment by adding
-a C<DEBUG> line to the C<__PACKAGE__->config> declaration in 
-C<lib/MyApp/View/TT.pm>:
-
-    __PACKAGE__->config({
-        ...
-        DEBUG        => 'undef',
-        ...
-    });
-
-B<Note:> C<__PACKAGE__> is just a shorthand way of referencing the name
-of the package where it is used.  Therefore, in C<TT.pm>,
-C<__PACKAGE__> is equivalent to C<TT>.
-
-There are a variety of options you can use, such as 'undef', 'all', 
-'service', 'context', 'parser' and 'provider'.  See
-L<Template::Constants> for more information (remove the C<DEBUG_>
-portion of the name shown in the TT docs and convert to lower case
-for use inside Catalyst).
-
-B<NOTE:> B<Please be sure to disable TT debug options before 
-continuing the tutorial> (especially the 'undef' option -- leaving
-this enabled will conflict with several of the conventions used
-by this tutorial and TTSite to leave some variables undefined
-on purpose).
-
-
-=head2 Globally Customize Every View
-
-When using TTSite, files in the subdirectories of C<root/lib> can be
-used to make changes that will appear in every view.  For example, to
-display optional status and error messages in every view, edit
-C<root/lib/site/layout>, updating it to match the following (the two HTML
-C<span> elements are new):
-
-    <div id="header">[% PROCESS site/header %]</div>
-    
-    <div id="content">
-    <span class="message">[% status_msg %]</span>
-    <span class="error">[% error_msg %]</span>
-    [% content %]
-    </div>
-    
-    <div id="footer">[% PROCESS site/footer %]</div>
+     created "/home/me/MyApp/script/../lib/MyApp/View/TT.pm"
+     created "/home/me/MyApp/script/../t/view_TT.t"
 
-If we set either message in the Catalyst stash (e.g.,
-C<$c-E<gt>stash-E<gt>{status_msg} = 'Request was successful!'>) it will
-be displayed whenever any view used by that request is rendered.  The
-C<message> and C<error> CSS styles are automatically defined in
-C<root/src/ttsite.css> and can be customized to suit your needs.
+This simply creates a view called C<TT> (the second 'TT' argument) in 
+a file called C<TT.pm> (the first 'TT' argument). It is now up to you 
+to decide how you want to structure your view layout.  For the 
+tutorial, we will start with a very simple TT template to initially 
+demonstrate the concepts, but quickly migrate to a more typical 
+"wrapper page" type of configuration (where the "wrapper" controls the 
+overall "look and feel" of your site from a single file or set of 
+files).
 
-B<Note:> The Catalyst stash only lasts for a single HTTP request.  If
-you need to retain information across requests you can use
-L<Catalyst::Plugin::Session|Catalyst::Plugin::Session> (we will use
-Catalyst sessions in the Authentication part of the tutorial).
+Edit C<lib/MyApp/View/TT.pm> and you should see that the default
+contents contains something similar to the following:
 
+    __PACKAGE__->config(TEMPLATE_EXTENSION => '.tt');
 
-=head2 Create a TT Template Page
+And update it to match:
+
+    __PACKAGE__->config(
+        # Change default TT extension
+        TEMPLATE_EXTENSION => '.tt2',
+        # Set the location for TT files
+        INCLUDE_PATH => [
+                MyApp->path_to( 'root/src' ),
+            ],
+    );
 
-To add a new page of content to the TTSite view hierarchy, just create a
-new C<.tt2> file in C<root/src>.  Only include HTML markup that goes
-inside the HTML <body> and </body> tags, TTSite will use the contents of
-C<root/lib/site> to add the top and bottom.
+B<NOTE:> Make sure to add a comma after '.tt2' outside the single
+quote.
+
+This changes the default extenstion for Template Toolkit from '.tt' to
+'.tt2' and changes the base directory for your template files from
+C<root> to C<root/src>.
+
+
+=head2 Create a TT Template Page
 
 First create a directory for book-related TT templates:
 
-    $ mkdir root/src/books
+    $ mkdir -p root/src/books
 
 Then create C<root/src/books/list.tt2> in your editor and enter:
 
@@ -437,7 +401,7 @@ Then create C<root/src/books/list.tt2> in your editor and enter:
     [% # it WILL eliminate a blank line if you view the HTML source.  It's purely   -%]
     [%- # optional, but both the beginning and the ending TT tags support chomping. -%]
     
-    [% # Provide a title to root/lib/site/header -%]
+    [% # Provide a title -%]
     [% META title = 'Book List' -%]
     
     <table>
@@ -452,9 +416,9 @@ Then create C<root/src/books/list.tt2> in your editor and enter:
     </table>
 
 As indicated by the inline comments above, the C<META title> line uses
-TT's META feature to provide a title to C<root/lib/site/header>.
-Meanwhile, the C<FOREACH> loop iterates through each C<book> model
-object and prints the C<title> and C<rating> fields.
+TT's META feature to provide a title to the "wrapper" that we will
+create later. Meanwhile, the C<FOREACH> loop iterates through each
+C<book> model object and prints the C<title> and C<rating> fields.
 
 If you are new to TT, the C<[%> and C<%]> tags are used to delimit TT
 code.  TT supports a wide variety of directives for "calling" other
@@ -467,20 +431,41 @@ for details and examples).  In addition to the usual C<Template> module
 Pod documentation, you can access the TT manual at
 L<http://search.cpan.org/perldoc?Template::Manual>.
 
-B<NOTE:> The C<TTSite> helper creates several TT files using an
-extension of C<.tt2>. Most other Catalyst and TT examples use an
-extension of C<.tt>.  You can use either extension (or no extension at
-all) with TTSite and TT, just be sure to use the appropriate extension
-for both the file itself I<and> the C<$c-E<gt>stash-E<gt>{template} =
-...> line in your controller.  This document will use C<.tt2> for
-consistency with the files already created by the C<TTSite> helper.
+B<TIP:> While you can build all sorts of complex logic into your TT
+templates, you should in general keep the "code" part of your templates
+as simple as possible.  If you need more complex logic, create helper
+methods in your model that abstract out a set of code into a single call
+from your TT template.  (Note that the same is true of your controller
+logic as well -- complex sections of code in your controllers should
+often be pulled out and placed into your model objects.)
+
+
+=head2 Test Run The Application
+
+To test your work so far, first start the development server:
+
+    $ script/myapp_server.pl
+
+Then point your browser to L<http://localhost:3000> and you should
+still get the Catalyst welcome page.  Next, change the URL in your
+browser to L<http://localhost:3000/books/list>.  If you have
+everything working so far, you should see a web page that displays
+nothing other than our column headers for "Title", "Rating", and
+"Author(s)" -- we will not see any books until we get the database and
+model working below.
+
+If you run into problems getting your application to run correctly, it
+might be helpful to refer to some of the debugging techniques covered in
+the L<Debugging|Catalyst::Manual::Tutorial::Debugging> part of the
+tutorial.
 
 
 =head1 CREATE A SQLITE DATABASE
 
 In this step, we make a text file with the required SQL commands to
-create a database table and load some sample data.  Open C<myapp01.sql>
-in your editor and enter:
+create a database table and load some sample data.  We will use SQLite,
+a popular database that is lightweight and easy to use.  Open
+C<myapp01.sql> in your editor and enter:
 
     --
     -- Create a very simple database to hold book and author information
@@ -526,16 +511,13 @@ in your editor and enter:
     INSERT INTO book_authors VALUES (4, 7);
     INSERT INTO book_authors VALUES (5, 8);
 
-B<TIP>: See Appendix 1 for tips on removing the leading spaces when
-cutting and pasting example code from POD-based documents.
-
 Then use the following command to build a C<myapp.db> SQLite database:
 
     $ sqlite3 myapp.db < myapp01.sql
 
 If you need to create the database more than once, you probably want to
 issue the C<rm myapp.db> command to delete the database before you use
-the C<sqlite3 myapp.db < myapp01.sql> command.
+the C<sqlite3 myapp.db E<lt> myapp01.sql> command.
 
 Once the C<myapp.db> database file has been created and initialized, you
 can use the SQLite command line environment to do a quick dump of the
@@ -572,41 +554,41 @@ your OS command prompt.
 =head1 DATABASE ACCESS WITH C<DBIx::Class>
 
 Catalyst can be used with virtually any form of persistent datastore
-available via Perl.  For example, 
+available via Perl.  For example,
 L<Catalyst::Model::DBI|Catalyst::Model::DBI> can be used to
 easily access databases through the traditional Perl C<DBI> interface.
 However, most Catalyst applications use some form of ORM technology to
 automatically create and save model objects as they are used.  Although
-Tony Bowden's L<Class::DBI|Class::DBI> has been a popular choice 
-in the past, Matt Trout's L<DBIx::Class|DBIx::Class> (abbreviated 
-as "DBIC") has rapidly emerged as the Perl-based ORM technology of choice.  
+Tony Bowden's L<Class::DBI|Class::DBI> has been a popular choice
+in the past, Matt Trout's L<DBIx::Class|DBIx::Class> (abbreviated
+as "DBIC") has rapidly emerged as the Perl-based ORM technology of choice.
 Most new Catalyst applications rely on DBIC, as will this tutorial.
 
-=head2 Create a dynamic DBIC Model
 
-Use the C<create=dynamic> model helper option to build a model that 
+=head2 Create a Dynamic DBIC Model
+
+Use the C<create=dynamic> model helper option to build a model that
 dynamically reads your database structure every time the application
 starts:
 
     $ script/myapp_create.pl model DB DBIC::Schema MyApp::Schema create=dynamic dbi:SQLite:myapp.db
-     exists "/home/kclark/dev/MyApp/script/../lib/MyApp/Model"
-     exists "/home/kclark/dev/MyApp/script/../t"
-     exists "/home/kclark/dev/MyApp/script/../lib/MyApp"
-    created "/home/kclark/dev/MyApp/script/../lib/MyApp/Schema.pm"
-    created "/home/kclark/dev/MyApp/script/../lib/MyApp/Model/DB.pm"
-    created "/home/kclark/dev/MyApp/script/../t/model_DB.t"
+     exists "/home/me/MyApp/script/../lib/MyApp/Model"
+     exists "/home/me/MyApp/script/../t"
+     exists "/home/me/MyApp/script/../lib/MyApp"
+    created "/home/me/MyApp/script/../lib/MyApp/Schema.pm"
+    created "/home/me/MyApp/script/../lib/MyApp/Model/DB.pm"
+    created "/home/me/MyApp/script/../t/model_DB.t"
 
 
 C<DB> is the name of the model class to be created by the helper in 
-C<lib/MyApp/Model> (Catalyst has a separate directory under C<lib/MyApp> 
-for each of the three parts of MVC: C<Model>, C<View>, and C<Controller>).  
-C<DBIC::Schema> is the type of the model to create. 
-C<MyApp::Schema> is the name of the DBIC schema file written to 
-C<lib/MyApp/Schema.pm>.  Because we specified C<create=dynamic> 
-to the helper, it use L<DBIx::Class::Schema::Loader> to dynamically load 
-the schema information from the database every time the application 
-starts.  And finally, C<dbi:SQLite:myapp.db> is the standard DBI connect 
-string for use with SQLite.
+C<lib/MyApp/Model>.  C<DBIC::Schema> is the type of the model to 
+create. C<MyApp::Schema> is the name of the DBIC schema file written 
+to C<lib/MyApp/Schema.pm>.  Because we specified C<create=dynamic> to 
+the helper, it use 
+L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> to 
+dynamically load the schema information from the database every time 
+the application starts. And finally, C<dbi:SQLite:myapp.db> is the 
+standard DBI connect string for use with SQLite.
 
 B<NOTE:> Although the C<create=dynamic> option to the DBIC helper
 makes for a nifty demonstration, is only really suitable for very
@@ -614,7 +596,40 @@ small applications. After this demonstration, you should almost always
 use the C<create=static> option that we switch to below.
 
 
-=head1 RUN THE APPLICATION
+=head1 ENABLE THE MODEL IN THE CONTROLLER
+
+Open C<lib/MyApp/Controller/Books.pm> and uncomment the model code we
+left disabled earlier (uncomment the line containing
+C<[$c-E<gt>model('DB::Books')-E<gt>all]> and delete the next 2 lines):
+
+    =head2 list
+    
+    Fetch all book objects and pass to books/list.tt2 in stash to be displayed
+    
+    =cut
+    
+    sub list : Local {
+        # Retrieve the usual Perl OO '$self' for this object. $c is the Catalyst
+        # 'Context' that's used to 'glue together' the various components
+        # that make up the application
+        my ($self, $c) = @_;
+    
+        # Retrieve all of the book records as book model objects and store in the
+        # stash where they can be accessed by the TT template
+        $c->stash->{books} = [$c->model('DB::Books')->all];
+    
+        # Set the TT template to use.  You will almost always want to do this
+        # in your action methods (action methods respond to user input in
+        # your controllers).
+        $c->stash->{template} = 'books/list.tt2';
+    }
+
+B<TIP>: You may see the C<$c-E<gt>model('DB::Book')> uncommented above
+written as C<$c-E<gt>model('DB')-E<gt>resultset('Book')>.  The two
+are equivalent.
+
+
+=head2 Test Run The Application
 
 First, let's enable an environment variable option that causes
 DBIx::Class to dump the SQL statements it's using to access the database
@@ -632,18 +647,16 @@ L<DBIx::Class::Manual::Troubleshooting> for details (including options
 to log to file instead of displaying to the Catalyst development server
 log).
 
-Then run the Catalyst "demo server" script:    
-
-    $ script/myapp_server.pl
-
-Your development server log output should display something like:
+Then launch the Catalyst development server.  The log output should
+display something like:
 
     $script/myapp_server.pl
     [debug] Debug messages enabled
+    [debug] Statistics enabled
     [debug] Loaded plugins:
     .----------------------------------------------------------------------------.
-    | Catalyst::Plugin::ConfigLoader  0.17                                       |
-    | Catalyst::Plugin::StackTrace  0.06                                         |
+    | Catalyst::Plugin::ConfigLoader  0.20                                       |
+    | Catalyst::Plugin::StackTrace  0.08                                         |
     | Catalyst::Plugin::Static::Simple  0.20                                     |
     '----------------------------------------------------------------------------'
     
@@ -670,6 +683,7 @@ Your development server log output should display something like:
     +----------------------+--------------------------------------+--------------+
     | /default             | MyApp::Controller::Root              | default      |
     | /end                 | MyApp::Controller::Root              | end          |
+    | /index               | MyApp::Controller::Root              | index        |
     | /books/index         | MyApp::Controller::Books             | index        |
     | /books/list          | MyApp::Controller::Books             | list         |
     '----------------------+--------------------------------------+--------------'
@@ -678,31 +692,34 @@ Your development server log output should display something like:
     .-------------------------------------+--------------------------------------.
     | Path                                | Private                              |
     +-------------------------------------+--------------------------------------+
+    | /                                   | /default                             |
+    | /                                   | /index                               |
+    | /books                              | /books/index                         |
     | /books/list                         | /books/list                          |
     '-------------------------------------+--------------------------------------'
     
-    [info] MyApp powered by Catalyst 5.7011
+    [info] MyApp powered by Catalyst 5.7014
     You can connect to your server at http://localhost:3000
 
-B<NOTE:> Be sure you run the C<script/myapp_server.pl> command from 
-the 'base' directory of your application, not inside the C<script> 
-directory itself or it will not be able to locate the C<myapp.db> 
-database file.  You can use a fully qualified or a relative path to 
-locate the database file, but we did not specify that when we ran the 
+B<NOTE:> Be sure you run the C<script/myapp_server.pl> command from
+the 'base' directory of your application, not inside the C<script>
+directory itself or it will not be able to locate the C<myapp.db>
+database file.  You can use a fully qualified or a relative path to
+locate the database file, but we did not specify that when we ran the
 model helper earlier.
 
 Some things you should note in the output above:
 
 =over 4
 
-=item * 
+=item *
 
-Catalyst::Model::DBIC::Schema dynamically created three model classes, 
-one to represent each of the three tables in our database 
+Catalyst::Model::DBIC::Schema dynamically created three model classes,
+one to represent each of the three tables in our database
 (C<MyApp::Model::DB::Authors>, C<MyApp::Model::DB::BookAuthors>,
 and C<MyApp::Model::DB::Books>).
 
-=item * 
+=item *
 
 The "list" action in our Books controller showed up with a path of
 C</books/list>.
@@ -714,9 +731,9 @@ the Catalyst welcome page.
 
 Next, to view the book list, change the URL in your browser to
 L<http://localhost:3000/books/list>. You should get a list of the five
-books loaded by the C<myapp01.sql> script above, with TTSite providing
-the formatting for the very simple output we generated in our template.
-The rating for each book should appear on each row.
+books loaded by the C<myapp01.sql> script above without any formatting.
+The rating for each book should appear on each row, but the "Author(s)"
+column will sitll be blank (we will fill that in later).
 
 Also notice in the output of the C<script/myapp_server.pl> that DBIC
 used the following SQL to retrieve the data:
@@ -730,21 +747,196 @@ Continue on to future sections and we will develop the application
 more fully.
 
 
+=head1 CREATE A WRAPPER FOR THE VIEW
+
+When using TT, you can (and should!) create a wrapper that will
+literally wrap content around each of your templates.  This is
+certainly useful as you have one main source for changing things that
+will appear across your entire site/application instead of having to
+edit many individual files.
+
+
+=head2 Configure TT.pm For The Wrapper
+
+In order to create a wrapper, you must first edit your TT view and
+tell it where to find your wrapper file. Your TT view is located in
+C<lib/MyApp/View/TT.pm>.
+
+Edit C<lib/MyApp/View/TT.pm> and change it to match the following:
+
+    __PACKAGE__->config(
+        # Change default TT extension
+        TEMPLATE_EXTENSION => '.tt2',
+        # Set the location for TT files
+        INCLUDE_PATH => [
+                MyApp->path_to( 'root/src' ),
+            ],
+        # Set to 1 for detailed timer stats in your HTML as comments
+        TIMER              => 0,
+        # This is your wrapper template located in the 'root/src'
+        WRAPPER => 'wrapper.tt2',
+    );
+
+
+=head2 Create the Wrapper Template File and Stylesheet
+
+Next you need to set up your wrapper template.  Basically, you'll want
+to take the overall layout of your site and put it into this file.
+For the tutorial, open C<root/src/wrapper.tt2> and input the following:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head>
+    <title>[% template.title or "My Catalyst App!" %]</title>
+    <link rel="stylesheet" href="[% c.uri_for('/static/css/main.css') %]" />
+    </head>
+    
+    <body>
+    <div id="outer">
+    <div id="header">
+        [%# Your logo could go here -%]
+        <img src="[% c.uri_for('/static/images/btn_88x31_powered.png') %]" />
+        [%# Insert the page title -%]
+        <h1>[% template.title or site.title %]</h1>
+    </div>
+    
+    <div id="bodyblock">
+    <div id="menu">
+        Navigation:
+        <ul>
+            <li><a href="[% c.uri_for('/books/list') %]">Home</a></li>
+            <li><a href="[% c.uri_for('/') %]" title="Catalyst Welcome Page">Welcome</a></li>
+            <li><a href="mailto:nobody@nowhere.com" title="Contact Us">Contact Us</a></li>
+        </ul>
+    </div><!-- end menu -->
+    
+    <div id="content">
+        [%# Status and error messages %]
+        <span class="message">[% status_msg %]</span>
+        <span class="error">[% error_msg %]</span>
+        [%# This is where TT will stick all of your template's contents. -%]
+        [% content %]
+    </div><!-- end content -->
+    </div><!-- end bodyblock -->
+    
+    <div id="footer">Copyright (c) your name goes here</div>
+    </div><!-- end outter -->
+    
+    </body>
+    </html>
+
+Notice the status and error message sections in the code above:
+
+    <span class="status">[% status_msg %]</span>
+    <span class="error">[% error_msg %]</span>
+
+If we set either message in the Catalyst stash (e.g.,
+C<$c-E<gt>stash-E<gt>{status_msg} = 'Request was successful!'>) it
+will be displayed whenever any view used by that request is rendered.
+The C<message> and C<error> CSS styles can be customized to suit your
+needs in the C<root/static/css/main.css> file we create below.
+
+B<Notes:> 
+
+=over 4
+
+=item *
+
+The Catalyst stash only lasts for a single HTTP request.  If
+you need to retain information across requests you can use
+L<Catalyst::Plugin::Session|Catalyst::Plugin::Session> (we will use
+Catalyst sessions in the Authentication part of the tutorial).
+
+=item *
+
+Although it is beyond the scope of this tutorial, you may wish to use
+a JavaScript or AJAX tool such as jQuery (L<http://www.jquery.com>) or
+Dojo (L<http://www.dojotoolkit.org>).
+
+=back
+
+
+=head3 Create A Basic Stylesheet
+
+First create a central location for stylesheets under the static
+directory:
+
+    $ mkdir root/static/css
+
+Then open the file C<root/static/css/main.css> (the file referenced in
+the stylesheet href link of our wrapper above) and add the following
+content:
+
+    #header {
+        text-align: center;
+    }
+    #header h1 {
+        margin: 0;
+    }
+    #header img {
+        float: right;
+    }
+    #footer {
+        text-align: center;
+        font-style: italic;
+        padding-top: 20px;
+    }
+    #menu {
+        font-weight: bold;
+        background-color: #ddd;
+    }
+    #menu ul {
+        list-style: none;
+        float: left;
+        margin: 0;
+        padding: 0 0 50% 5px;
+        font-weight: normal;
+        background-color: #ddd;
+        width: 100px;
+    }
+    #content {
+        margin-left: 120px;
+    }
+    .message {
+        color: #390;
+    }
+    .error {
+        color: #f00;
+    }
+
+You may wish to check out a "CSS Framework" like Emastic
+(L<http://code.google.com/p/emastic/>) as a way to quickly
+provide lots of high-quality CSS functionality.
+
+
+=head2 Test Run The Application
+
+Restart the development server and hit "Reload" in your web browser
+and you should now see a formatted version of our basic book list.
+Although our wrapper and stylesheet are obviously very simple, you
+should see how it allows us to control the overall look of an entire
+website from two central files.  To add new pages to the site, just
+provide a template that fills in the C<content> section of our wrapper
+template -- the wrapper will provide the overall feel of the page.
+
+
 =head1 A STATIC DATABASE MODEL WITH C<DBIx::Class>
 
 =head2 Create Static DBIC Schema Files
 
-Unlike the previous section where we had DBIC automatically discover the 
-structure of the database every time the application started, here we 
-will use static schema files for more control.  This is typical of most 
-"real world" applications.
+Unlike the previous DBIC section where we had C<create=dynamic>
+automatically discover the structure of the database every time the
+application started, here we will use static schema files for more
+control.  This is typical of most "real world" applications.
 
-One option would be to create a separate schema file for each table in
-the database, however, lets use the same L<DBIx::Class::Schema::Loader>
-used earlier with C<create=dynamic> to build the static files for us.
+One option would be to manually create a separate schema file for each 
+table in the database, however, lets use the same 
+L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> used 
+earlier with C<create=dynamic> to build the static files for us. 
 First, lets remove the schema file created earlier:
 
-    $ rm lib/MyApp/Schema.pm 
+    $ rm lib/MyApp/Schema.pm
 
 Now regenerate the schema using the C<create=static> option:
 
@@ -755,53 +947,55 @@ Now regenerate the schema using the C<create=static> option:
     Schema dump completed.
      exists "/home/kclark/dev/MyApp/script/../lib/MyApp/Model/DB.pm"
 
-We could have also deleted C<lib/MyApp/Model/DB.pm>, but it would 
+We could have also deleted C<lib/MyApp/Model/DB.pm>, but it would
 have regenerated the same file (note the C<exists> in the output above).
 If you take a look at C<lib/MyApp/Model/DB.pm>, it simply contains
 a reference to the actual schema file in C<lib/MyApp/Schema.pm>
 along with the database connect string.
 
-If you look in the C<lib/MyApp/Schema> directory, you will find that 
-C<DB.pm> is no longer using L<DBIx::Class::Schema::Loader> as its 
-base class (L<DBIx::Class::Schema::Loader> is only being used by the 
-helper to load the schema once and then create the static files for us) 
-and that it only contains a call to the C<load_classes> method.  You 
-will also find that C<lib/MyApp/Schema> contains a C<Schema> 
-subdirectory, with one file inside this directory for each of the tables 
-in our simple database (C<Authors.pm>, C<BookAuthors.pm>, and 
-C<Books.pm>).  These three files were created based on the information
-found by L<DBIx::Class::Schema::Loader> as the helper ran.
-
-The idea with all of the files created under C<lib/MyApp/Schema> by the 
-C<create=static> option is to only edit the files below the C<# DO NOT 
-MODIFY THIS OR ANYTHING ABOVE!> warning.  If you place all of your 
+If you look in the C<lib/MyApp/Schema.pm> file, you will find that it 
+is no longer using 
+L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> as its base 
+class (L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> is 
+only being used by the helper to load the schema once and then create 
+the static files for us) and C<Schema.pm> only contains a call to the 
+C<load_classes> method.  You will also find that C<lib/MyApp/Schema> 
+contains a C<Schema> subdirectory, with one file inside this directory 
+for each of the tables in our simple database (C<Authors.pm>, 
+C<BookAuthors.pm>, and C<Books.pm>).  These three files were created 
+based on the information found by 
+L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> as the 
+helper ran.
+
+The idea with all of the files created under C<lib/MyApp/Schema> by 
+the C<create=static> option is to only edit the files below the C<# DO 
+NOT MODIFY THIS OR ANYTHING ABOVE!> warning.  If you place all of your 
 changes below that point in the file, you can regenerate the 
-auto-generated information at the top of each file should your database 
-structure get updated.
+automatically created information at the top of each file should your 
+database structure get updated.
 
-Also note the "flow" of the model information across the various files 
-and directories.  Catalyst will initially load the model from 
+Also note the "flow" of the model information across the various files
+and directories.  Catalyst will initially load the model from
 C<lib/MyApp/Model/DB.pm>.  This file contains a reference to
 C<lib/MyApp/Schema.pm>, so that file is loaded next.  Finally,
-the call to C<load_classes> in that file will load each of the 
+the call to C<load_classes> in C<Schema.pm> will load each of the
 table-specific "results source" files from the C<lib/MyApp/Schema>
-subdirectory.  These three table-specific DBIC schema files will then be 
-used to create three table-specific Catalyst models every time the 
+subdirectory.  These three table-specific DBIC schema files will then be
+used to create three table-specific Catalyst models every time the
 application starts (you can see these three model files listed in
 the debug output generated when you launch the application).
 
 
 =head2 Updating the Generated DBIC Schema Files
 
-
 Let's manually add some relationship information to the auto-generated
 schema files.  First edit C<lib/MyApp/Schema/Books.pm> and
-add the following text below the C<# You can replace this text...> 
+add the following text below the C<# You can replace this text...>
 comment:
 
     #
     # Set relationships:
-    #   
+    #
     
     # has_many():
     #   args:
@@ -813,8 +1007,8 @@ comment:
     # many_to_many():
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
-    #     2) Name of has_many() relationship this many_to_many() is shortcut for 
-    #     3) Name of belongs_to() relationship in model class of has_many() above 
+    #     2) Name of has_many() relationship this many_to_many() is shortcut for
+    #     3) Name of belongs_to() relationship in model class of has_many() above
     #   You must already have the has_many() defined to use a many_to_many().
     __PACKAGE__->many_to_many(authors => 'book_authors', 'author');
 
@@ -824,17 +1018,18 @@ file.  As with any Perl package, we need to end the last line with
 a statement that evaluates to C<true>.  This is customarily done with
 C<1;> on a line by itself.
 
-This code defines both a C<has_many> and a C<many_to_many> relationship. 
-The C<many_to_many> relationship is optional, but it makes it easier to 
-map a book to its collection of authors.  Without it, we would have to 
-"walk" though the C<book_authors> table as in C<$book-E<gt>book_authors-
-E<gt>first-E<gt>author-E<gt>last_name> (we will see examples on how to 
-use DBIC objects in your code soon, but note that because C<$book-
-E<gt>book_authors> can return multiple authors, we have to use C<first> 
-to display a single author). C<many_to_many> allows us to use the 
-shorter C<$book-E<gt>authors-E<gt>first-E<gt>last_name>. Note that you 
-cannot define a C<many_to_many> relationship without also having the 
-C<has_many> relationship in place.
+This code defines both a C<has_many> and a C<many_to_many> relationship.
+The C<many_to_many> relationship is optional, but it makes it easier to
+map a book to its collection of authors.  Without it, we would have to
+"walk" though the C<book_authors> table as in 
+C<$book-E<gt>book_authors-E<gt>first-E<gt>author-E<gt>last_name> 
+(we will see examples on how to use DBIC objects in your code soon, 
+but note that because C<$book-E<gt>book_authors> can return multiple 
+authors, we have to use C<first> to display a single author). 
+C<many_to_many> allows us to use the shorter 
+C<$book-E<gt>authors-E<gt>first-E<gt>last_name>. 
+Note that you cannot define a C<many_to_many> relationship without 
+also having the C<has_many> relationship in place.
 
 Then edit C<lib/MyApp/Schema/Authors.pm> and add relationship
 information as follows (again, be careful to put in above the C<1;> but
@@ -855,11 +1050,11 @@ below the C<# DO NOT MODIFY THIS OR ANYTHING ABOVE!> comment):
     #   args:
     #     1) Name of relationship, DBIC will create accessor with this name
     #     2) Name of has_many() relationship this many_to_many() is shortcut for
-    #     3) Name of belongs_to() relationship in model class of has_many() above 
+    #     3) Name of belongs_to() relationship in model class of has_many() above
     #   You must already have the has_many() defined to use a many_to_many().
     __PACKAGE__->many_to_many(books => 'book_author', 'book');
 
-Finally, do the same for the "join table," 
+Finally, do the same for the "join table,"
 C<lib/MyApp/Schema/BookAuthors.pm>:
 
     #
@@ -881,7 +1076,7 @@ C<lib/MyApp/Schema/BookAuthors.pm>:
     __PACKAGE__->belongs_to(author => 'MyApp::Schema::Authors', 'author_id');
 
 
-=head1 RUN THE APPLICATION
+=head2 Run The Application
 
 Run the Catalyst "demo server" script with the C<DBIC_TRACE> option
 (it might still be enabled from earlier in the tutorial, but here
@@ -889,29 +1084,15 @@ is an alternate way to specify the option just in case):
 
     $ DBIC_TRACE=1 script/myapp_server.pl
 
-Make sure that the application loads correctly and that you see the 
-three dynamically created model class (one for each of the 
+Make sure that the application loads correctly and that you see the
+three dynamically created model class (one for each of the
 table-specific schema classes we created).
 
 Then hit the URL L<http://localhost:3000/books/list> and be sure that
 the book list is displayed.
 
-
-=head1 RUNNING THE APPLICATION FROM THE COMMAND LINE
-
-In some situations, it can be useful to run your application and 
-display a page without using a browser.  Catalyst lets you do this 
-using the C<scripts/myapp_test.pl> script.  Just supply the URL you 
-wish to display and it will run that request through the normal 
-controller dispatch logic and use the appropriate view to render the 
-output (obviously, complex pages may dump a lot of text to your 
-terminal window).  For example, if you type:
-
-    $ script/myapp_test.pl "/books/list"
-
-You should get the same text as if you visited 
-L<http://localhost:3000/books/list> with the normal development server 
-and asked your browser to view the page source.
+You can leave the development server running for the next step if you
+wish.
 
 
 =head1 UPDATING THE VIEW
@@ -920,7 +1101,7 @@ Let's add a new column to our book list page that takes advantage of
 the relationship information we manually added to our schema files
 in the previous section.  Edit C<root/src/books/list.tt2> add add the
 following code below the existing table cell that contains
-C<book.rating> (IOW, add a new table cell below the existing two 
+C<book.rating> (IOW, add a new table cell below the existing two
 C<td> cells):
 
     <td>
@@ -940,44 +1121,66 @@ C<td> cells):
       [% tt_authors.join(', ') | html %]
     </td>
 
-Then hit C<Ctrl+R> in your browser (note that you don't need to reload 
+Then hit "Reload" in your browser (note that you don't need to reload 
 the development server or use the C<-r> option when updating TT 
-templates) and you should now see the number of authors each book has
-along with a comma-separated list of the authors' last names.  
-
-If you are still running the development server with C<DBIC_TRACE> 
-enabled, you should also now see five more C<SELECT> statements in the 
-debug output (one for each book as the authors are being retrieved by 
+templates) and you should now see the number of authors each book has 
+along with a comma-separated list of the authors' last names.  (If you 
+didn't leave the development server running from the previous step, 
+you will obviously need to start it before you can refresh your 
+browser window.)
+
+If you are still running the development server with C<DBIC_TRACE>
+enabled, you should also now see five more C<SELECT> statements in the
+debug output (one for each book as the authors are being retrieved by
 DBIC).
 
-Also note that we are using "| html", a type of TT filter, to escape 
+Also note that we are using "| html", a type of TT filter, to escape
 characters such as E<lt> and E<gt> to &lt; and &gt; and avoid various
-types of dangerous hacks against your application.  In a real 
-application, you would probably want to put "| html" at the end of 
-every field where a user has control over the information that can 
+types of dangerous hacks against your application.  In a real
+application, you would probably want to put "| html" at the end of
+every field where a user has control over the information that can
 appear in that field (and can therefore inject markup or code if you
 don't "neutralize" those fields).  In addition to "| html", Template
 Toolkit has a variety of other useful filters that can found in the
 documentation for L<Template::Filters|Template::Filters>.
 
 
-=head2 Using C<RenderView> for the Default View
+=head1 RUNNING THE APPLICATION FROM THE COMMAND LINE
+
+In some situations, it can be useful to run your application and
+display a page without using a browser.  Catalyst lets you do this
+using the C<scripts/myapp_test.pl> script.  Just supply the URL you
+wish to display and it will run that request through the normal
+controller dispatch logic and use the appropriate view to render the
+output (obviously, complex pages may dump a lot of text to your
+terminal window).  For example, if you type:
+
+    $ script/myapp_test.pl "/books/list"
+
+You should get the same text as if you visited
+L<http://localhost:3000/books/list> with the normal development server
+and asked your browser to view the page source.
 
-B<NOTE: The rest of this part of the tutorial is optional.  You can 
-skip to Part 4, L<Basic CRUD|Catalyst::Manual::Tutorial::BasicCRUD>, 
+
+=head1 OPTIONAL INFORMATION
+
+B<NOTE: The rest of this part of the tutorial is optional.  You can
+skip to Part 4, L<Basic CRUD|Catalyst::Manual::Tutorial::BasicCRUD>,
 if you wish.>
 
-Once your controller logic has processed the request from a user, it 
-forwards processing to your view in order to generate the appropriate 
+=head2 Using C<RenderView> for the Default View
+
+Once your controller logic has processed the request from a user, it
+forwards processing to your view in order to generate the appropriate
 response output.  Catalyst uses
-L<Catalyst::Action::RenderView|Catalyst::Action::RenderView> by 
-default to automatically performs this operation.  If you look in 
-C<lib/MyApp/Controller/Root.pm>, you should see the empty 
+L<Catalyst::Action::RenderView|Catalyst::Action::RenderView> by
+default to automatically performs this operation.  If you look in
+C<lib/MyApp/Controller/Root.pm>, you should see the empty
 definition for the C<sub end> method:
 
     sub end : ActionClass('RenderView') {}
 
-The following bullet points provide a quick overview of the 
+The following bullet points provide a quick overview of the
 C<RenderView> process:
 
 =over 4
@@ -988,10 +1191,10 @@ C<Root.pm> is designed to hold application-wide logic.
 
 =item *
 
-At the end of a given user request, Catalyst will call the most specific 
-C<end> method that's appropriate.  For example, if the controller for a 
-request has an C<end> method defined, it will be called.  However, if 
-the controller does not define a controller-specific C<end> method, the 
+At the end of a given user request, Catalyst will call the most specific
+C<end> method that's appropriate.  For example, if the controller for a
+request has an C<end> method defined, it will be called.  However, if
+the controller does not define a controller-specific C<end> method, the
 "global" C<end> method in C<Root.pm> will be called.
 
 =item *
@@ -1004,12 +1207,12 @@ for more information on C<ActionClass>.
 
 =item *
 
-Because C<sub end> is empty, this effectively just runs the default 
-logic in C<RenderView>.  However, you can easily extend the 
-C<RenderView> logic by adding your own code inside the empty method body 
-(C<{}>) created by the Catalyst Helpers when we first ran the 
-C<catalyst.pl> to initialize our application.  See 
-L<Catalyst::Action::RenderView|Catalyst::Action::RenderView> for more 
+Because C<sub end> is empty, this effectively just runs the default
+logic in C<RenderView>.  However, you can easily extend the
+C<RenderView> logic by adding your own code inside the empty method body
+(C<{}>) created by the Catalyst Helpers when we first ran the
+C<catalyst.pl> to initialize our application.  See
+L<Catalyst::Action::RenderView|Catalyst::Action::RenderView> for more
 detailed information on how to extended C<RenderView> in C<sub end>.
 
 =back
@@ -1017,12 +1220,12 @@ detailed information on how to extended C<RenderView> in C<sub end>.
 
 =head2 Using The Default Template Name
 
-By default, C<Catalyst::View::TT> will look for a template that uses the 
-same name as your controller action, allowing you to save the step of 
-manually specifying the template name in each action.  For example, this 
-would allow us to remove the 
-C<$c-E<gt>stash-E<gt>{template} = 'books/list.tt2';> line of our 
-C<list> action in the Books controller.  Open 
+By default, C<Catalyst::View::TT> will look for a template that uses the
+same name as your controller action, allowing you to save the step of
+manually specifying the template name in each action.  For example, this
+would allow us to remove the
+C<$c-E<gt>stash-E<gt>{template} = 'books/list.tt2';> line of our
+C<list> action in the Books controller.  Open
 C<lib/MyApp/Controller/Books.pm> in your editor and comment out this line
 to match the following (only the C<$c-E<gt>stash-E<gt>{template}> line
 has changed):
@@ -1049,31 +1252,14 @@ has changed):
         #$c->stash->{template} = 'books/list.tt2';
     }
 
-C<Catalyst::View::TT> defaults to looking for a template with no 
-extension.  In our case, we need to override this to look for an 
-extension of C<.tt2>.  Open C<lib/MyApp/View/TT.pm> and add the 
-C<TEMPLATE_EXTENSION> definition as follows:
 
-    __PACKAGE__->config({
-        CATALYST_VAR => 'Catalyst',
-        INCLUDE_PATH => [
-            MyApp->path_to( 'root', 'src' ),
-            MyApp->path_to( 'root', 'lib' )
-        ],
-        PRE_PROCESS  => 'config/main',
-        WRAPPER      => 'site/wrapper',
-        ERROR        => 'error.tt2',
-        TIMER        => 0,
-        TEMPLATE_EXTENSION => '.tt2',
-    });
-
-You should now be able to restart the development server as per the 
+You should now be able to restart the development server as per the
 previous section and access the L<http://localhost:3000/books/list>
 as before.
 
 B<NOTE:> Please note that if you use the default template technique,
 you will B<not> be able to use either the C<$c-E<gt>forward> or
-the C<$c-E<gt>detach> mechanisms (these are discussed in Part 2 and 
+the C<$c-E<gt>detach> mechanisms (these are discussed in Part 2 and
 Part 9 of the Tutorial).
 
 
@@ -1085,10 +1271,10 @@ statement in C<sub list> in C<lib/MyApp/Controller/Books.pm>:
 
     $c->stash->{template} = 'books/list.tt2';
 
-Then delete the C<TEMPLATE_EXTENSION> line in  
+Then delete the C<TEMPLATE_EXTENSION> line in
 C<lib/MyApp/View/TT.pm>.
 
-You should then be able to restart the development server and 
+You should then be able to restart the development server and
 access L<http://localhost:3000/books/list> in the same manner as
 with earlier sections.
 
@@ -1103,4 +1289,3 @@ L<http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Manual/lib/Catalyst
 
 Copyright 2006-2008, Kennedy Clark, under Creative Commons License
 (L<http://creativecommons.org/licenses/by-sa/3.0/us/>).
-
diff --git a/lib/Catalyst/Manual/Tutorial/Testing.pod b/lib/Catalyst/Manual/Tutorial/Testing.pod
index 4313cfb..d2ca5be 100644
--- a/lib/Catalyst/Manual/Tutorial/Testing.pod
+++ b/lib/Catalyst/Manual/Tutorial/Testing.pod
@@ -65,7 +65,8 @@ pieces of your application over time.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::Intro>
+L<Catalyst::Manual::Tutorial::Intro|Catalyst::Manual::Tutorial::Intro>.
+
 
 =head1 RUNNING THE "CANNED" CATALYST TESTS