X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FCookbook.pod;h=1800657599c22cfa384df09b0a38e3e7dd7b5849;hp=104ab7426d44145b609b7ae005abb904dfa086ac;hb=e8200f38d465b85ad84eb11718db1e61230ce73b;hpb=a7b39a0c23a77dc84a30ca259156ca31f8921857

diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod
index 104ab74..1800657 100644
--- a/lib/Catalyst/Manual/Cookbook.pod
+++ b/lib/Catalyst/Manual/Cookbook.pod
@@ -1,3 +1,5 @@
+=encoding utf8
+
 =head1 NAME
 
 Catalyst::Manual::Cookbook - Cooking with Catalyst
@@ -33,9 +35,12 @@ to go into this C<end> method; see L<Catalyst::Plugin::FillInForm>).
 
         if ( scalar @{ $c->error } ) {
             $c->stash->{errors}   = $c->error;
+            for my $error ( @{ $c->error } ) {
+                $c->log->error($error);
+            }
             $c->stash->{template} = 'errors.tt';
             $c->forward('MyApp::View::TT');
-            $c->error(0);
+            $c->clear_errors;
         }
 
         return 1 if $c->response->status =~ /^3\d\d$/;
@@ -65,7 +70,7 @@ Normally you enable the debugging info by adding the C<-Debug> flag to
 your C<use Catalyst> statement . However, you can also enable it using
 environment variable, so you can (for example) get debug info without
 modifying your application scripts. Just set C<CATALYST_DEBUG> or
-C<E<lt>MYAPPE<gt>_DEBUG> to a true value.
+C<< <MYAPP>_DEBUG >> to a true value.
 
 =head2 Sessions
 
@@ -107,61 +112,59 @@ retrieve the user data for you.
 =head3 Using a session
 
 Once the session modules are loaded, the session is available as C<<
-$c->session >>, and can be writen to and read from as a simple hash
+$c->session >>, and can be written to and read from as a simple hash
 reference.
 
 =head3 EXAMPLE
 
-  package MyApp;
-  use Moose;
-  use namespace::autoclean;
-
-  use Catalyst  qw/
-                         Session
-                         Session::Store::FastMmap
-                         Session::State::Cookie
-                   /;
-  extends 'Catalyst';
-  __PACKAGE__->setup;
-
-  package MyApp::Controller::Foo;
-  use Moose;
-  use namespace::autoclean;
-  BEGIN { extends 'Catalyst::Controller' };
-  ## Write data into the session
-
-  sub add_item : Local {
-     my ( $self, $c ) = @_;
-
-     my $item_id = $c->req->param("item");
-
-     push @{ $c->session->{items} }, $item_id;
+    package MyApp;
+    use Moose;
+    use namespace::autoclean;
+
+    use Catalyst  qw/
+                        Session
+                        Session::Store::FastMmap
+                        Session::State::Cookie
+                    /;
+    extends 'Catalyst';
+    __PACKAGE__->setup;
+
+    package MyApp::Controller::Foo;
+    use Moose;
+    use namespace::autoclean;
+    BEGIN { extends 'Catalyst::Controller' };
+    ## Write data into the session
+
+    sub add_item : Local {
+        my ( $self, $c ) = @_;
 
-  }
+        my $item_id = $c->req->params->{item};
 
-  ## A page later we retrieve the data from the session:
+        push @{ $c->session->{items} }, $item_id;
+    }
 
-  sub get_items : Local {
-     my ( $self, $c ) = @_;
+    ## A page later we retrieve the data from the session:
 
-     $c->stash->{items_to_display} = $c->session->{items};
+    sub get_items : Local {
+        my ( $self, $c ) = @_;
 
-  }
+        $c->stash->{items_to_display} = $c->session->{items};
+    }
 
 
 =head3 More information
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session>
+L<Catalyst::Plugin::Session>
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie>
+L<Catalyst::Plugin::Session::State::Cookie>
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session-State-URI>
+L<Catalyst::Plugin::Session::State::URI>
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-FastMmap>
+L<Catalyst::Plugin::Session::Store::FastMmap>
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-File>
+L<Catalyst::Plugin::Session::Store::File>
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-DBI>
+L<Catalyst::Plugin::Session::Store::DBI>
 
 =head2 Configure your application
 
@@ -171,11 +174,11 @@ separate configuration file.
 
 =head3 Using Config::General
 
-L<Config::General|Config::General> is a method for creating flexible
+L<Config::General> is a method for creating flexible
 and readable configuration files. It's a great way to keep your
 Catalyst application configuration in one easy-to-understand location.
 
-Now create C<myapp.conf> in your application home:
+Now create F<myapp.conf> in your application home:
 
   name     MyApp
 
@@ -196,24 +199,32 @@ This is equivalent to:
   # configure base package
   __PACKAGE__->config( name => MyApp );
   # configure authentication
-  __PACKAGE__->config->{authentication} = {
-    user_class => 'MyApp::Model::MyDB::Customer',
-    ...
-  };
+  __PACKAGE__->config(
+        'Plugin::Authentication' => {
+            user_class => 'MyApp::Model::MyDB::Customer',
+            ...
+        },
+  _;
   # configure sessions
-  __PACKAGE__->config->{session} = {
-    expires => 3600,
-    ...
-  };
+  __PACKAGE__->config(
+    session => {
+        expires => 3600,
+        ...
+    },
+  );
   # configure email sending
-  __PACKAGE__->config->{email} = [qw/SMTP localhost/];
+  __PACKAGE__->config( email => [qw/SMTP localhost/] );
+
+L<Catalyst> explains precedence of multiple sources for configuration
+values, how to access the values in your components, and many 'base'
+config variables used internally.
 
-See also L<Config::General|Config::General>.
+See also L<Config::General>.
 
 =head1 Skipping your VCS's directories
 
-Catalyst uses Module::Pluggable to load Models, Views, and Controllers.
-Module::Pluggable will scan through all directories and load modules
+Catalyst uses L<Module::Pluggable> to load Models, Views, and Controllers.
+L<Module::Pluggable> will scan through all directories and load modules
 it finds.  Sometimes you might want to skip some of these directories,
 for example when your version control system makes a subdirectory with
 meta-information in every version-controlled directory.  While
@@ -229,7 +240,7 @@ You can make Catalyst skip these directories using the Catalyst config:
       setup_components => { except => qr/SCCS/ },
   );
 
-See the Module::Pluggable manual page for more information on B<except>
+See the L<Module::Pluggable> manual page for more information on B<except>
 and other options.
 
 =head1 Users and Access Control
@@ -243,7 +254,7 @@ this.
 
 This is extensively covered in other documentation; see in particular
 L<Catalyst::Plugin::Authentication> and the Authentication chapter
-of the Tutorial at L<Catalyst::Manual::Tutorial::Authorization>.
+of the Tutorial at L<Catalyst::Manual::Tutorial::06_Authorization>.
 
 =head2 Pass-through login (and other actions)
 
@@ -297,9 +308,9 @@ C<< $c->user >> call.
 
 Examples:
 
- Password - Simple username/password checking.
- HTTPD    - Checks using basic HTTP auth.
- TypeKey  - Check using the typekey system.
+    Password - Simple username/password checking.
+    HTTPD    - Checks using basic HTTP auth.
+    TypeKey  - Check using the typekey system.
 
 =head3 Storage backends
 
@@ -309,8 +320,8 @@ within this system; you will need to do it yourself.
 
 Examples:
 
- DBIC     - Storage using a database via DBIx::Class.
- Minimal  - Storage using a simple hash (for testing).
+    DBIC     - Storage using a database via DBIx::Class.
+    Minimal  - Storage using a simple hash (for testing).
 
 =head3 User objects
 
@@ -319,7 +330,7 @@ credential verifier, and is filled with the retrieved user information.
 
 Examples:
 
- Hash     - A simple hash of keys and values.
+    Hash     - A simple hash of keys and values.
 
 =head3 ACL authorization
 
@@ -348,67 +359,67 @@ the user is a member.
 
 =head3 EXAMPLE
 
-  package MyApp;
-  use Moose;
-  use namespace::autoclean;
-  extends qw/Catalyst/;
-  use Catalyst qw/
-    Authentication
-    Authorization::Roles
-  /;
+    package MyApp;
+    use Moose;
+    use namespace::autoclean;
+    extends qw/Catalyst/;
+    use Catalyst qw/
+        Authentication
+        Authorization::Roles
+    /;
 
-  __PACKAGE__->config(
-     authentication => {
-         default_realm => 'test',
-         realms => {
-             test => {
-                 credential => {
-                     class          => 'Password',
-                     password_field => 'password',
-                     password_type  => 'self_check',
-                 },
-                 store => {
-                     class => 'Htpasswd',
-                     file => 'htpasswd',
-                 },
-             },
-         },
-     },   
-  );
+    __PACKAGE__->config(
+        authentication => {
+            default_realm => 'test',
+            realms => {
+                test => {
+                    credential => {
+                        class          => 'Password',
+                        password_field => 'password',
+                        password_type  => 'self_check',
+                    },
+                    store => {
+                        class => 'Htpasswd',
+                        file => 'htpasswd',
+                    },
+                },
+            },
+        },
+    );
+
+    package MyApp::Controller::Root;
+    use Moose;
+    use namespace::autoclean;
+
+    BEGIN { extends 'Catalyst::Controller' }
+
+    __PACKAGE__->config(namespace => '');
+
+    sub login : Local {
+        my ($self, $c) = @_;
+
+        if ( my $user = $c->req->params->{user}
+            and my $password = $c->req->param->{password} )
+        {
+            if ( $c->authenticate( username => $user, password => $password ) ) {
+                $c->res->body( "hello " . $c->user->name );
+            } else {
+                # login incorrect
+            }
+        }
+        else {
+            # invalid form input
+        }
+    }
+
+    sub restricted : Local {
+        my ( $self, $c ) = @_;
 
-  package MyApp::Controller::Root;
-  use Moose;
-  use namespace::autoclean;
-  
-  BEGIN { extends 'Catalyst::Controller' }
-  
-  __PACKAGE__->config(namespace => '');
-  
-  sub login : Local {
-     my ($self, $c) = @_;
-
-     if (    my $user = $c->req->param("user")
-         and my $password = $c->req->param("password") )
-     {
-         if ( $c->authenticate( username => $user, password => $password ) ) {
-              $c->res->body( "hello " . $c->user->name );
-         } else {
-            # login incorrect
-         }
-     }
-     else {
-         # invalid form input
-     }
-  }
-
-  sub restricted : Local {
-     my ( $self, $c ) = @_;
-
-     $c->detach("unauthorized")
-       unless $c->check_user_roles( "admin" );
-
-     # do something restricted here
-  }
+        $c->detach("unauthorized")
+            unless $c->check_user_roles( "admin" );
+
+        # do something restricted here
+    }
 
 =head3 Using authentication in a testing environment
 
@@ -446,7 +457,7 @@ determines what this user is allowed to do.
 
 Under role based access control each user is allowed to perform any
 number of roles. For example, at a zoo no one but specially trained
-personnel can enter the moose cage (Mynd you, møøse bites kan be
+personnel can enter the moose cage (Mynd you, møøse bites kan be
 pretty nasti!). For example:
 
     package Zoo::Controller::MooseCage;
@@ -454,7 +465,7 @@ pretty nasti!). For example:
     sub feed_moose : Local {
         my ( $self, $c ) = @_;
 
-        $c->model( "Moose" )->eat( $c->req->param("food") );
+        $c->model( "Moose" )->eat( $c->req->params->{food} );
     }
 
 With this action, anyone can just come into the moose cage and feed
@@ -476,7 +487,7 @@ And now our action should look like this:
         my ( $self, $c ) = @_;
 
         if ( $c->check_roles( "moose_feeder" ) ) {
-            $c->model( "Moose" )->eat( $c->req->param("food") );
+            $c->model( "Moose" )->eat( $c->req->params->{food} );
         } else {
             $c->stash->{error} = "unauthorized";
         }
@@ -562,14 +573,14 @@ clean up in your C<end> private action instead.
 Also, it's important to note that if you restrict access to "/" then
 C<end>, C<default>, etc. will also be restricted.
 
-   MyApp->acl_allow_root_internals;
+    MyApp->acl_allow_root_internals;
 
 will create rules that permit access to C<end>, C<begin>, and C<auto> in the
 root of your app (but not in any other controller).
 
 =head1 Models
 
-Models are where application data belongs.  Catalyst is exteremely
+Models are where application data belongs.  Catalyst is extremely
 flexible with the kind of models that it can use.  The recipes here
 are just the start.
 
@@ -586,7 +597,7 @@ write a simple component in Catalyst that slurps in an outside Model:
 
     __PACKAGE__->config(
         schema_class => 'Some::DBIC::Schema',
-        connect_info => ['dbi:SQLite:foo.db', '', '', {AutoCommit=>1}];
+        connect_info => ['dbi:SQLite:foo.db', '', '', {AutoCommit=>1}],
     );
 
     1;
@@ -674,25 +685,37 @@ Response:
 
 Now follow these few steps to implement the application:
 
-1. Install Catalyst (5.61 or later), Catalyst::Plugin::XMLRPC (0.06 or
-later) and SOAP::Lite (for XMLRPCsh.pl).
+=over 4
+
+=item 1.
+
+Install L<Catalyst> (5.61 or later), L<Catalyst::Plugin::XMLRPC> (0.06 or
+later) and L<SOAP::Lite> (for F<XMLRPCsh.pl>).
 
-2. Create an application framework:
+=item 2.
+
+Create an application framework:
 
     % catalyst.pl MyApp
     ...
     % cd MyApp
 
-3. Add the XMLRPC plugin to MyApp.pm
+=item 3.
+
+Add the XMLRPC plugin to MyApp.pm
 
     use Catalyst qw/-Debug Static::Simple XMLRPC/;
 
-4. Add an API controller
+=item 4.
+
+Add an API controller
 
     % ./script/myapp_create.pl controller API
 
-5. Add a XMLRPC redispatch method and an add method with Remote
-attribute to lib/MyApp/Controller/API.pm
+=item 5.
+
+Add a XMLRPC redispatch method and an add method with Remote
+attribute to F<lib/MyApp/Controller/API.pm>
 
     sub default :Path {
         my ( $self, $c ) = @_;
@@ -711,8 +734,10 @@ class.
 The C<add> method is not a traditional action; it has no private or
 public path. Only the XMLRPC dispatcher knows it exists.
 
-6. That's it! You have built your first web service. Let's test it with
-XMLRPCsh.pl (part of SOAP::Lite):
+=item 6.
+
+That's it! You have built your first web service. Let's test it with
+F<XMLRPCsh.pl> (part of L<SOAP::Lite>):
 
     % ./script/myapp_server.pl
     ...
@@ -737,7 +762,7 @@ enforce a specific one.
 Views pertain to the display of your application.  As with models,
 Catalyst is uncommonly flexible.  The recipes below are just a start.
 
-=head2 Catalyst::View::TT
+=head2 L<Catalyst::View::TT>
 
 One of the first things you probably want to do when starting a new
 Catalyst application is set up your View. Catalyst doesn't care how you
@@ -745,17 +770,17 @@ display your data; you can choose to generate HTML, PDF files, or plain
 text if you wanted.
 
 Most Catalyst applications use a template system to generate their HTML,
-and though there are several template systems available, Template
-Toolkit is probably the most popular.
+and though there are several template systems available,
+L<Template Toolkit|Template> is probably the most popular.
 
 Once again, the Catalyst developers have done all the hard work, and
-made things easy for the rest of us. Catalyst::View::TT provides the
+made things easy for the rest of us. L<Catalyst::View::TT> provides the
 interface to Template Toolkit, and provides Helpers which let us set it
 up that much more easily.
 
 =head3 Creating your View
 
-Catalyst::View::TT provides two different helpers for us to use: TT and
+L<Catalyst::View::TT> provides two different helpers for us to use: TT and
 TTSite.
 
 =head4 TT
@@ -764,7 +789,7 @@ Create a basic Template Toolkit View using the provided helper script:
 
     script/myapp_create.pl view TT TT
 
-This will create lib/MyApp/View/MyView.pm, which is going to be pretty
+This will create F<lib/MyApp/View/MyView.pm>, which is going to be pretty
 empty to start. However, it sets everything up that you need to get
 started. You can now define which template you want and forward to your
 view. For instance:
@@ -808,19 +833,19 @@ This time, the helper sets several options for us in the generated View.
 
 =over
 
-=item
+=item *
 
-INCLUDE_PATH defines the directories that Template Toolkit should search
+C<INCLUDE_PATH> defines the directories that Template Toolkit should search
 for the template files.
 
-=item
+=item *
 
-PRE_PROCESS is used to process configuration options which are common to
+C<PRE_PROCESS> is used to process configuration options which are common to
 every template file.
 
-=item
+=item *
 
-WRAPPER is a file which is processed with each template, usually used to
+C<WRAPPER> is a file which is processed with each template, usually used to
 easily provide a common header and footer for every page.
 
 =back
@@ -829,21 +854,21 @@ In addition to setting these options, the TTSite helper also created the
 template and config files for us! In the 'root' directory, you'll notice
 two new directories: src and lib.
 
-Several configuration files in root/lib/config are called by PRE_PROCESS.
+Several configuration files in F<root/lib/config> are called by C<PRE_PROCESS>.
 
-The files in root/lib/site are the site-wide templates, called by
-WRAPPER, and display the html framework, control the layout, and provide
+The files in F<root/lib/site> are the site-wide templates, called by
+C<WRAPPER>, and display the html framework, control the layout, and provide
 the templates for the header and footer of your page. Using the template
 organization provided makes it much easier to standardize pages and make
 changes when they are (inevitably) needed.
 
 The template files that you will create for your application will go
-into root/src, and you don't need to worry about putting the the <html>
-or <head> sections; just put in the content. The WRAPPER will the rest
+into root/src, and you don't need to worry about putting the C<< <html> >>
+or C<< <head> >> sections; just put in the content. The C<WRAPPER> will the rest
 of the page around your template for you.
 
 
-=head3 $c->stash
+=head3 C<< $c->stash >>
 
 Of course, having the template system include the header and footer for
 you isn't all that we want our templates to do. We need to be able to
@@ -863,7 +888,7 @@ from the template. For instance:
         $c->forward( $c->view('TT') );
     }
 
-Then, in hello.tt:
+Then, in F<hello.tt>:
 
     <strong>Hello, [% name %]!</strong>
 
@@ -898,18 +923,18 @@ This is the most basic usage, but Template Toolkit is quite powerful,
 and allows you to truly keep your presentation logic separate from the
 rest of your application.
 
-=head3 $c->uri_for()
+=head3 C<< $c->uri_for() >>
 
 One of my favorite things about Catalyst is the ability to move an
 application around without having to worry that everything is going to
 break. One of the areas that used to be a problem was with the http
 links in your template files. For example, suppose you have an
-application installed at http://www.domain.com/Calendar. The links point
-to "/Calendar", "/Calendar/2005", "/Calendar/2005/10", etc.  If you move
-the application to be at http://www.mydomain.com/Tools/Calendar, then
+application installed at C<http://www.domain.com/Calendar>. The links point
+to "C</Calendar>", "C</Calendar/2005>", "C</Calendar/2005/10>", etc.  If you move
+the application to be at C<http://www.mydomain.com/Tools/Calendar>, then
 all of those links will suddenly break.
 
-That's where $c->uri_for() comes in. This function will merge its
+That's where C<< $c->uri_for() >> comes in. This function will merge its
 parameters with either the base location for the app, or its current
 namespace. Let's take a look at a couple of examples.
 
@@ -920,8 +945,8 @@ In your template, you can use the following:
 Although the parameter starts with a forward slash, this is relative
 to the application root, not the webserver root. This is important to
 remember. So, if your application is installed at
-http://www.domain.com/Calendar, then the link would be
-http://www.mydomain.com/Calendar/Login. If you move your application
+C<http://www.domain.com/Calendar>, then the link would be
+C<http://www.mydomain.com/Calendar/Login>. If you move your application
 to a different domain or path, then that link will still be correct.
 
 Likewise,
@@ -930,18 +955,18 @@ Likewise,
 
 The first parameter does NOT have a forward slash, and so it will be
 relative to the current namespace. If the application is installed at
-http://www.domain.com/Calendar. and if the template is called from
-MyApp::Controller::Display, then the link would become
-http://www.domain.com/Calendar/Display/2005/10/24.
+C<http://www.domain.com/Calendar>. and if the template is called from
+C<MyApp::Controller::Display>, then the link would become
+C<http://www.domain.com/Calendar/Display/2005/10/24>.
 
 If you want to link to a parent uri of your current namespace you can
-prefix the arguments with multiple '../':
+prefix the arguments with multiple 'C<../>':
 
     <a href="[% c.uri_for('../../view', stashed_object.id) %]">User view</a>
 
 Once again, this allows you to move your application around without
 having to worry about broken links. But there's something else, as
-well. Since the links are generated by uri_for, you can use the same
+well. Since the links are generated by C<uri_for>, you can use the same
 template file by several different controllers, and each controller
 will get the links that its supposed to. Since we believe in Don't
 Repeat Yourself, this is particularly helpful if you have common
@@ -949,57 +974,23 @@ elements in your site that you want to keep in one file.
 
 Further Reading:
 
-L<http://search.cpan.org/perldoc?Catalyst>
+L<Catalyst>
 
-L<http://search.cpan.org/perldoc?Catalyst%3A%3AView%3A%3ATT>
+L<Catalyst::View::TT>
 
-L<http://search.cpan.org/perldoc?Template>
+L<Template>
 
 =head2 Adding RSS feeds
 
 Adding RSS feeds to your Catalyst applications is simple. We'll see two
-different aproaches here, but the basic premise is that you forward to
+different approaches here, but the basic premise is that you forward to
 the normal view action first to get the objects, then handle the output
 differently.
 
-=head3 Using TT templates
+=head3 Using L<XML::Feed>
 
-This is the aproach used in Agave (L<http://dev.rawmode.org/>).
-
-    sub rss : Local {
-        my ($self,$c) = @_;
-        $c->forward('view');
-        $c->stash->{template}='rss.tt';
-    }
-
-Then you need a template. Here's the one from Agave:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-      <channel>
-	<title>[ [% blog.name || c.config.name || "Agave" %] ] RSS Feed</title>
-        <link>[% base %]</link>
-        <description>Recent posts</description>
-        <language>en-us</language>
-        <ttl>40</ttl>
-     [% WHILE (post = posts.next) %]
-      <item>
-        <title>[% post.title %]</title>
-        <description>[% post.formatted_teaser|html%]</description>
-        <pubDate>[% post.pub_date %]</pubDate>
-        <guid>[% post.full_uri %]</guid>
-        <link>[% post.full_uri %]</link>
-        <dc:creator>[% post.author.screenname %]</dc:creator>
-      </item>
-    [% END %]
-      </channel>
-    </rss>
-
-=head3 Using XML::Feed
-
-A more robust solution is to use XML::Feed, as was done in the Catalyst
-Advent Calendar. Assuming we have a C<view> action that populates
-'entries' with some DBIx::Class iterator, the code would look something
+Assuming we have a C<view> action that populates
+'entries' with some L<DBIx::Class> iterator, the code would look something
 like this:
 
     sub rss : Local {
@@ -1022,10 +1013,10 @@ like this:
         $c->res->body( $feed->as_xml );
    }
 
-A little more code in the controller, but with this approach you're
+With this approach you're
 pretty sure to get something that validates.
 
-Note that for both of the above aproaches, you'll need to set the
+Note that for both of the above approaches, you'll need to set the
 content type like this:
 
     $c->res->content_type('application/rss+xml');
@@ -1071,7 +1062,7 @@ Note the use of quotes around the filename; this ensures that any
 spaces in the filename are handled by the browser.
 
 Put this right before calling C<< $c->res->body >> and your browser
-will download a file named C<Important Orders.csv> instead of
+will download a file named F<Important Orders.csv> instead of
 C<export>.
 
 You can also use this to have the browser download content which it
@@ -1084,36 +1075,6 @@ set the appropriate content type and disposition.
 Controllers are the main point of communication between the web server
 and your application.  Here we explore some aspects of how they work.
 
-=head2 Extending RenderView (formerly DefaultEnd)
-
-The recommended approach for an C<end> action is to use
-L<Catalyst::Action::RenderView> (taking the place of
-L<Catalyst::Plugin::DefaultEnd>), which does what you usually need.
-However there are times when you need to add a bit to it, but don't want
-to write your own C<end> action.
-
-You can extend it like this:
-
-To add something to an C<end> action that is called before rendering
-(this is likely to be what you want), simply place it in the C<end>
-method:
-
-    sub end : ActionClass('RenderView') {
-      my ( $self, $c ) = @_;
-      # do stuff here; the RenderView action is called afterwards
-    }
-
-To add things to an C<end> action that are called I<after> rendering,
-you can set it up like this:
-
-    sub render : ActionClass('RenderView') { }
-
-    sub end : Private {
-      my ( $self, $c ) = @_;
-      $c->forward('render');
-      # do stuff here
-    }
-
 =head2 Action Types
 
 =head3 Introduction
@@ -1134,7 +1095,7 @@ attached. These can be one of several types.
 
 Assume our Controller module starts with the following package declaration:
 
- package MyApp::Controller::Buckets;
+    package MyApp::Controller::Buckets;
 
 and we are running our application on localhost, port 3000 (the test
 server default).
@@ -1148,19 +1109,19 @@ or an absolute path. A relative path will be relative to the
 controller namespace, an absolute path will represent an exact
 matching URL.
 
- sub my_handles : Path('handles') { .. }
+    sub my_handles : Path('handles') { .. }
 
 becomes
 
- http://localhost:3000/buckets/handles
+    http://localhost:3000/buckets/handles
 
 and
 
- sub my_handles : Path('/handles') { .. }
+    sub my_handles : Path('/handles') { .. }
 
 becomes
 
- http://localhost:3000/handles
+    http://localhost:3000/handles
 
 See also: L<Catalyst::DispatchType::Path>
 
@@ -1170,22 +1131,22 @@ When using a Local attribute, no parameters are needed, instead, the
 name of the action is matched in the URL. The namespaces created by
 the name of the controller package is always part of the URL.
 
- sub my_handles : Local { .. }
+    sub my_handles : Local { .. }
 
 becomes
 
- http://localhost:3000/buckets/my_handles
+    http://localhost:3000/buckets/my_handles
 
 =item Global
 
 A Global attribute is similar to a Local attribute, except that the
 namespace of the controller is ignored, and matching starts at root.
 
- sub my_handles : Global { .. }
+    sub my_handles : Global { .. }
 
 becomes
 
- http://localhost:3000/my_handles
+    http://localhost:3000/my_handles
 
 =item Regex
 
@@ -1193,15 +1154,15 @@ By now you should have figured that a Regex attribute is just what it
 sounds like. This one takes a regular expression, and matches starting
 from root. These differ from the rest as they can match multiple URLs.
 
- sub my_handles : Regex('^handles') { .. }
+    sub my_handles : Regex('^handles') { .. }
 
 matches
 
- http://localhost:3000/handles
+    http://localhost:3000/handles
 
 and
 
- http://localhost:3000/handles_and_other_parts
+    http://localhost:3000/handles_and_other_parts
 
 etc.
 
@@ -1212,15 +1173,15 @@ See also: L<Catalyst::DispatchType::Regex>
 A LocalRegex is similar to a Regex, except it only matches below the current
 controller namespace.
 
- sub my_handles : LocalRegex(^handles') { .. }
+    sub my_handles : LocalRegex(^handles') { .. }
 
 matches
 
- http://localhost:3000/buckets/handles
+    http://localhost:3000/buckets/handles
 
 and
 
- http://localhost:3000/buckets/handles_and_other_parts
+    http://localhost:3000/buckets/handles_and_other_parts
 
 etc.
 
@@ -1235,7 +1196,7 @@ Last but not least, there is the Private attribute, which allows you
 to create your own internal actions, which can be forwarded to, but
 won't be matched as URLs.
 
- sub my_handles : Private { .. }
+    sub my_handles : Private { .. }
 
 becomes nothing at all..
 
@@ -1252,7 +1213,7 @@ part of your namespace, you'll get an error page instead. If you want
 to find out where it was the user was trying to go, you can look in
 the request object using C<< $c->req->path >>.
 
- sub default :Path { .. }
+    sub default :Path { .. }
 
 works for all unknown URLs, in this controller namespace, or every one
 if put directly into MyApp.pm.
@@ -1264,11 +1225,11 @@ namespace of your controller. If index, default and matching Path
 actions are defined, then index will be used instead of default and
 Path.
 
- sub index :Path :Args(0) { .. }
+    sub index :Path :Args(0) { .. }
 
 becomes
 
- http://localhost:3000/buckets
+    http://localhost:3000/buckets
 
 =item begin
 
@@ -1278,11 +1239,11 @@ can be used to set up variables/data for this particular part of your
 app. A single begin action is called, its always the one most relevant
 to the current namespace.
 
- sub begin : Private { .. }
+    sub begin : Private { .. }
 
 is called once when
 
- http://localhost:3000/bucket/(anything)?
+    http://localhost:3000/bucket/(anything)?
 
 is visited.
 
@@ -1294,11 +1255,11 @@ processing to the View component. A single end action is called, its
 always the one most relevant to the current namespace.
 
 
- sub end : Private { .. }
+    sub end : Private { .. }
 
 is called once after any actions when
 
- http://localhost:3000/bucket/(anything)?
+    http://localhost:3000/bucket/(anything)?
 
 is visited.
 
@@ -1309,8 +1270,8 @@ chain of paths up to and including the ending namespace, will be
 called. (In contrast, only one of the begin/end/default actions will
 be called, the relevant one).
 
- package MyApp::Controller::Root;
- sub auto : Private { .. }
+    package MyApp::Controller::Root;
+    sub auto : Private { .. }
 
 and
 
@@ -1318,7 +1279,7 @@ and
 
 will both be called when visiting
 
- http://localhost:3000/bucket/(anything)?
+    http://localhost:3000/bucket/(anything)?
 
 =back
 
@@ -1326,26 +1287,27 @@ will both be called when visiting
 
 =head3 A word of warning
 
-You can put root actions in your main MyApp.pm file, but this is deprecated,
+You can put root actions in your main F<MyApp.pm> file, but this is deprecated,
 please put your actions into your Root controller.
 
-=head3 More Information
+=head3 Flowchart
 
-L<http://dev.catalyst.perl.org/wiki/FlowChart>
+A graphical flowchart of how the dispatcher works can be found on the wiki at
+L<http://dev.catalyst.perl.org/attachment/wiki/WikiStart/catalyst-flow.png>.
 
-=head2 DRY Controllers with Chained actions.
+=head2 DRY Controllers with Chained actions
 
 Imagine that you would like the following paths in your application:
 
 =over
 
-=item B</cd/<ID>/track/<ID>>
+=item B<< /cd/<ID>/track/<ID> >>
 
 Displays info on a particular track.
 
 In the case of a multi-volume CD, this is the track sequence.
 
-=item B</cd/<ID>/volume/<ID>/track/<ID>>
+=item B<< /cd/<ID>/volume/<ID>/track/<ID> >>
 
 Displays info on a track on a specific volume.
 
@@ -1395,7 +1357,7 @@ even though there are two different methods of looking up a track.
 
 This technique can be expanded as needed to fulfil your requirements - for example,
 if you inherit the first action of a chain from a base class, then mixing in a
-different base class can be used to duplicate an entire URL hieratchy at a different
+different base class can be used to duplicate an entire URL hierarchy at a different
 point within your application.
 
 =head2 Component-based Subrequests
@@ -1410,9 +1372,9 @@ To implement uploads in Catalyst, you need to have a HTML form similar to
 this:
 
     <form action="/upload" method="post" enctype="multipart/form-data">
-      <input type="hidden" name="form_submit" value="yes">
-      <input type="file" name="my_file">
-      <input type="submit" value="Send">
+        <input type="hidden" name="form_submit" value="yes">
+        <input type="file" name="my_file">
+        <input type="submit" value="Send">
     </form>
 
 It's very important not to forget C<enctype="multipart/form-data"> in
@@ -1446,11 +1408,11 @@ Code for uploading multiple files from one form needs a few changes:
 The form should have this basic structure:
 
     <form action="/upload" method="post" enctype="multipart/form-data">
-      <input type="hidden" name="form_submit" value="yes">
-      <input type="file" name="file1" size="50"><br>
-      <input type="file" name="file2" size="50"><br>
-      <input type="file" name="file3" size="50"><br>
-      <input type="submit" value="Send">
+        <input type="hidden" name="form_submit" value="yes">
+        <input type="file" name="file1" size="50"><br>
+        <input type="file" name="file2" size="50"><br>
+        <input type="file" name="file3" size="50"><br>
+        <input type="submit" value="Send">
     </form>
 
 And in the controller:
@@ -1475,13 +1437,13 @@ And in the controller:
         $c->stash->{template} = 'file_upload.html';
     }
 
-C<for my $field ($c-E<gt>req->upload)> loops automatically over all file
+C<< for my $field ($c->req->upload) >> loops automatically over all file
 input fields and gets input names. After that is basic file saving code,
 just like in single file upload.
 
 Notice: C<die>ing might not be what you want to do, when an error
 occurs, but it works as an example. A better idea would be to store
-error C<$!> in $c->stash->{error} and show a custom error template
+error C<$!> in C<< $c->stash->{error} >> and show a custom error template
 displaying this message.
 
 For more information about uploads and usable methods look at
@@ -1494,475 +1456,53 @@ action. As of version 5.30, arguments can be passed in the call to
 C<forward>; in earlier versions, you can manually set the arguments in
 the Catalyst Request object:
 
-  # version 5.30 and later:
-  $c->forward('/wherever', [qw/arg1 arg2 arg3/]);
+    # version 5.30 and later:
+    $c->forward('/wherever', [qw/arg1 arg2 arg3/]);
 
-  # pre-5.30
-  $c->req->args([qw/arg1 arg2 arg3/]);
-  $c->forward('/wherever');
+    # pre-5.30
+    $c->req->args([qw/arg1 arg2 arg3/]);
+    $c->forward('/wherever');
 
 (See the L<Catalyst::Manual::Intro> Flow_Control section for more
 information on passing arguments via C<forward>.)
 
 =head2 Chained dispatch using base classes, and inner packages.
 
-  package MyApp::Controller::Base;
-  use base qw/Catalyst::Controller/;
-
-  sub key1 : Chained('/')
-
-=head1 Deployment
-
-The recipes below describe aspects of the deployment process,
-including web server engines and tips to improve application efficiency.
-
-=head2 mod_perl Deployment
-
-mod_perl is the best solution for many applications, but we'll list some pros
-and cons so you can decide for yourself.  The other production deployment
-option is FastCGI, for which see below.
-
-=head3 Pros
-
-=head4 Speed
-
-mod_perl is very fast and your app will benefit from being loaded in memory
-within each Apache process.
-
-=head4 Shared memory for multiple apps
-
-If you need to run several Catalyst apps on the same server, mod_perl will
-share the memory for common modules.
-
-=head3 Cons
-
-=head4 Memory usage
-
-Since your application is fully loaded in memory, every Apache process will
-be rather large.  This means a large Apache process will be tied up while
-serving static files, large files, or dealing with slow clients.  For this
-reason, it is best to run a two-tiered web architecture with a lightweight
-frontend server passing dynamic requests to a large backend mod_perl
-server.
-
-=head4 Reloading
-
-Any changes made to the core code of your app require a full Apache restart.
-Catalyst does not support Apache::Reload or StatINC.  This is another good
-reason to run a frontend web server where you can set up an
-C<ErrorDocument 502> page to report that your app is down for maintenance.
-
-=head4 Cannot run multiple versions of the same app
-
-It is not possible to run two different versions of the same application in
-the same Apache instance because the namespaces will collide.
-
-=head4 Setup
-
-Now that we have that out of the way, let's talk about setting up mod_perl
-to run a Catalyst app.
-
-=head4 1. Install Catalyst::Engine::Apache
-
-You should install the latest versions of both Catalyst and
-Catalyst::Engine::Apache.  The Apache engines were separated from the
-Catalyst core in version 5.50 to allow for updates to the engine without
-requiring a new Catalyst release.
-
-=head4 2. Install Apache with mod_perl
-
-Both Apache 1.3 and Apache 2 are supported, although Apache 2 is highly
-recommended.  With Apache 2, make sure you are using the prefork MPM and not
-the worker MPM.  The reason for this is that many Perl modules are not
-thread-safe and may have problems running within the threaded worker
-environment.  Catalyst is thread-safe however, so if you know what you're
-doing, you may be able to run using worker.
-
-In Debian, the following commands should get you going.
-
-    apt-get install apache2-mpm-prefork
-    apt-get install libapache2-mod-perl2
-
-=head4 3. Configure your application
-
-Every Catalyst application will automagically become a mod_perl handler
-when run within mod_perl.  This makes the configuration extremely easy.
-Here is a basic Apache 2 configuration.
-
-    PerlSwitches -I/var/www/MyApp/lib
-    PerlModule MyApp
-
-    <Location />
-        SetHandler          modperl
-        PerlResponseHandler MyApp
-    </Location>
-
-The most important line here is C<PerlModule MyApp>.  This causes mod_perl
-to preload your entire application into shared memory, including all of your
-controller, model, and view classes and configuration.  If you have -Debug
-mode enabled, you will see the startup output scroll by when you first
-start Apache.
-
-For an example Apache 1.3 configuration, please see the documentation for
-L<Catalyst::Engine::Apache::MP13>.
-
-=head3 Test It
-
-That's it, your app is now a full-fledged mod_perl application!  Try it out
-by going to http://your.server.com/.
-
-=head3 Other Options
-
-=head4 Non-root location
-
-You may not always want to run your app at the root of your server or virtual
-host.  In this case, it's a simple change to run at any non-root location
-of your choice.
+    package MyApp::Controller::Base;
+    use base qw/Catalyst::Controller/;
 
-    <Location /myapp>
-        SetHandler          modperl
-        PerlResponseHandler MyApp
-    </Location>
+    sub key1 : Chained('/')
 
-When running this way, it is best to make use of the C<uri_for> method in
-Catalyst for constructing correct links.
+=head2 Extending RenderView (formerly DefaultEnd)
 
-=head4 Static file handling
+The recommended approach for an C<end> action is to use
+L<Catalyst::Action::RenderView> (taking the place of
+L<Catalyst::Plugin::DefaultEnd>), which does what you usually need.
+However there are times when you need to add a bit to it, but don't want
+to write your own C<end> action.
 
-Static files can be served directly by Apache for a performance boost.
+You can extend it like this:
 
-    DocumentRoot /var/www/MyApp/root
-    <Location /static>
-        SetHandler default-handler
-    </Location>
+To add something to an C<end> action that is called before rendering
+(this is likely to be what you want), simply place it in the C<end>
+method:
 
-This will let all files within root/static be handled directly by Apache.  In
-a two-tiered setup, the frontend server should handle static files.
-The configuration to do this on the frontend will vary.
-
-The same is accomplished in lighttpd with the following snippet:
-
-   $HTTP["url"] !~ "^/(?:img/|static/|css/|favicon.ico$)" {
-         fastcgi.server = (
-             "" => (
-                 "MyApp" => (
-                     "socket"       => "/tmp/myapp.socket",
-                     "check-local"  => "disable",
-                 )
-             )
-         )
+    sub end : ActionClass('RenderView') {
+        my ( $self, $c ) = @_;
+        # do stuff here; the RenderView action is called afterwards
     }
 
-Which serves everything in the img, static, css directories
-statically, as well as the favicon file.
-
-Note the path of the application needs to be stated explicitly in the
-web server configuration for both these recipes.
-
-=head2 Catalyst on shared hosting
-
-So, you want to put your Catalyst app out there for the whole world to
-see, but you don't want to break the bank. There is an answer - if you
-can get shared hosting with FastCGI and a shell, you can install your
-Catalyst app in a local directory on your shared host. First, run
-
-    perl -MCPAN -e shell
-
-and go through the standard CPAN configuration process. Then exit out
-without installing anything. Next, open your .bashrc and add
-
-    export PATH=$HOME/local/bin:$HOME/local/script:$PATH
-    perlversion=`perl -v | grep 'built for' | awk '{print $4}' | sed -e 's/v//;'`
-    export PERL5LIB=$HOME/local/share/perl/$perlversion:$HOME/local/lib/perl/$perlversion:$HOME/local/lib:$PERL5LIB
-
-and log out, then back in again (or run C<". .bashrc"> if you
-prefer). Finally, edit C<.cpan/CPAN/MyConfig.pm> and add
-
-    'make_install_arg' => qq[SITEPREFIX=$ENV{HOME}/local],
-    'makepl_arg' => qq[INSTALLDIRS=site install_base=$ENV{HOME}/local],
-
-Now you can install the modules you need using CPAN as normal; they
-will be installed into your local directory, and perl will pick them
-up. Finally, change directory into the root of your virtual host and
-symlink your application's script directory in:
-
-    cd path/to/mydomain.com
-    ln -s ~/lib/MyApp/script script
-
-And add the following lines to your .htaccess file (assuming the server
-is setup to handle .pl as fcgi - you may need to rename the script to
-myapp_fastcgi.fcgi and/or use a SetHandler directive):
-
-  RewriteEngine On
-  RewriteCond %{REQUEST_URI} !^/?script/myapp_fastcgi.pl
-  RewriteRule ^(.*)$ script/myapp_fastcgi.pl/$1 [PT,L]
-
-Now C<http://mydomain.com/> should now Just Work. Congratulations, now
-you can tell your friends about your new website (or in our case, tell
-the client it's time to pay the invoice :) )
-
-=head2 FastCGI Deployment
-
-FastCGI is a high-performance extension to CGI. It is suitable
-for production environments.
-
-=head3 Pros
-
-=head4 Speed
-
-FastCGI performs equally as well as mod_perl.  Don't let the 'CGI' fool you;
-your app runs as multiple persistent processes ready to receive connections
-from the web server.
-
-=head4 App Server
-
-When using external FastCGI servers, your application runs as a standalone
-application server.  It may be restarted independently from the web server.
-This allows for a more robust environment and faster reload times when
-pushing new app changes.  The frontend server can even be configured to
-display a friendly "down for maintenance" page while the application is
-restarting.
-
-=head4 Load-balancing
-
-You can launch your application on multiple backend servers and allow the
-frontend web server to load-balance between all of them.  And of course, if
-one goes down, your app continues to run fine.
-
-=head4 Multiple versions of the same app
-
-Each FastCGI application is a separate process, so you can run different
-versions of the same app on a single server.
-
-=head4 Can run with threaded Apache
-
-Since your app is not running inside of Apache, the faster mpm_worker module
-can be used without worrying about the thread safety of your application.
-
-=head3 Cons
-
-You may have to disable mod_deflate.  If you experience page hangs with
-mod_fastcgi then remove deflate.load and deflate.conf from mods-enabled/
-
-=head4 More complex environment
-
-With FastCGI, there are more things to monitor and more processes running
-than when using mod_perl.
-
-=head3 Setup
-
-=head4 1. Install Apache with mod_fastcgi
-
-mod_fastcgi for Apache is a third party module, and can be found at
-L<http://www.fastcgi.com/>.  It is also packaged in many distributions,
-for example, libapache2-mod-fastcgi in Debian.
-
-=head4 2. Configure your application
-
-    # Serve static content directly
-    DocumentRoot  /var/www/MyApp/root
-    Alias /static /var/www/MyApp/root/static
-
-    FastCgiServer /var/www/MyApp/script/myapp_fastcgi.pl -processes 3
-    Alias /myapp/ /var/www/MyApp/script/myapp_fastcgi.pl/
-
-    # Or, run at the root
-    Alias / /var/www/MyApp/script/myapp_fastcgi.pl/
-
-The above commands will launch 3 app processes and make the app available at
-/myapp/
-
-=head3 Standalone server mode
-
-While not as easy as the previous method, running your app as an external
-server gives you much more flexibility.
-
-First, launch your app as a standalone server listening on a socket.
-
-    script/myapp_fastcgi.pl -l /tmp/myapp.socket -n 5 -p /tmp/myapp.pid -d
-
-You can also listen on a TCP port if your web server is not on the same
-machine.
-
-    script/myapp_fastcgi.pl -l :8080 -n 5 -p /tmp/myapp.pid -d
-
-You will probably want to write an init script to handle starting/stopping
-of the app using the pid file.
-
-Now, we simply configure Apache to connect to the running server.
-
-    # 502 is a Bad Gateway error, and will occur if the backend server is down
-    # This allows us to display a friendly static page that says "down for
-    # maintenance"
-    Alias /_errors /var/www/MyApp/root/error-pages
-    ErrorDocument 502 /_errors/502.html
-
-    FastCgiExternalServer /tmp/myapp.fcgi -socket /tmp/myapp.socket
-    Alias /myapp/ /tmp/myapp.fcgi/
-
-    # Or, run at the root
-    Alias / /tmp/myapp.fcgi/
-
-=head3 More Info
-
-L<Catalyst::Engine::FastCGI>.
-
-=head2 Development server deployment
-
-The development server is a mini web server written in perl.  If you
-expect a low number of hits or you don't need mod_perl/FastCGI speed,
-you could use the development server as the application server with a
-lightweight proxy web server at the front.  However, consider using
-L<Catalyst::Engine::HTTP::Prefork> for this kind of deployment instead, since
-it can better handle multiple concurrent requests without forking, or can
-prefork a set number of servers for improved performance.
-
-=head3 Pros
-
-As this is an application server setup, the pros are the same as
-FastCGI (with the exception of speed).
-It is also:
-
-=head4 Simple
-
-The development server is what you create your code on, so if it works
-here, it should work in production!
-
-=head3 Cons
-
-=head4 Speed
-
-Not as fast as mod_perl or FastCGI. Needs to fork for each request
-that comes in - make sure static files are served by the web server to
-save forking.
-
-=head3 Setup
-
-=head4 Start up the development server
-
-   script/myapp_server.pl -p 8080 -k  -f -pidfile=/tmp/myapp.pid
-
-You will probably want to write an init script to handle stop/starting
-the app using the pid file.
-
-=head4 Configuring Apache
-
-Make sure mod_proxy is enabled and add:
-
-    # Serve static content directly
-    DocumentRoot /var/www/MyApp/root
-    Alias /static /var/www/MyApp/root/static
-
-    ProxyRequests Off
-    <Proxy *>
-        Order deny,allow
-        Allow from all
-    </Proxy>
-
-    # Need to specifically stop these paths from being passed to proxy
-    ProxyPass /static !
-    ProxyPass /favicon.ico !
-
-    ProxyPass / http://localhost:8080/
-    ProxyPassReverse / http://localhost:8080/
-
-    # This is optional if you'd like to show a custom error page
-    # if the proxy is not available
-    ErrorDocument 502 /static/error_pages/http502.html
-
-You can wrap the above within a VirtualHost container if you want
-different apps served on the same host.
-
-=head2 Quick deployment: Building PAR Packages
-
-You have an application running on your development box, but then you
-have to quickly move it to another one for
-demonstration/deployment/testing...
-
-PAR packages can save you from a lot of trouble here. They are usual Zip
-files that contain a blib tree; you can even include all prereqs and a
-perl interpreter by setting a few flags!
-
-=head3 Follow these few points to try it out!
-
-1. Install Catalyst and PAR 0.89 (or later)
-
-    % perl -MCPAN -e 'install Catalyst'
-    ...
-    % perl -MCPAN -e 'install PAR'
-    ...
-
-2. Create a application
-
-    % catalyst.pl MyApp
-    ...
-    % cd MyApp
-
-Recent versions of Catalyst (5.62 and up) include
-L<Module::Install::Catalyst>, which simplifies the process greatly.  From the shell in your application directory:
-
-    % perl Makefile.PL
-    % make catalyst_par
-
-You can customise the PAR creation process by special "catalyst_par_*" commands
-available from L<Module::Install::Catalyst>. You can add these commands in your
-Makefile.PL just before the line containing "catalyst;"
-
-    #Makefile.PL example with extra PAR options
-    use inc::Module::Install;
-
-    name 'MyApp';
-    all_from 'lib\MyApp.pm';
-
-    requires 'Catalyst::Runtime' => '5.80005';
-    <snip>
-    ...
-    <snip>
-
-    catalyst_par_core(1);      # bundle perl core modules in the resulting PAR
-    catalyst_par_multiarch(1); # build a multi-architecture PAR file
-    catalyst_par_classes(qw/
-      Some::Additional::Module
-      Some::Other::Module
-    /);          # specify additional modules you want to be included into PAR
-    catalyst;
-
-    install_script glob('script/*.pl');
-    auto_install;
-    WriteAll;
-
-Congratulations! Your package "myapp.par" is ready, the following
-steps are just optional.
-
-3. Test your PAR package with "parl" (no typo)
-
-    % parl myapp.par
-    Usage:
-        [parl] myapp[.par] [script] [arguments]
-
-      Examples:
-        parl myapp.par myapp_server.pl -r
-        myapp myapp_cgi.pl
-
-      Available scripts:
-        myapp_cgi.pl
-        myapp_create.pl
-        myapp_fastcgi.pl
-        myapp_server.pl
-        myapp_test.pl
-
-    % parl myapp.par myapp_server.pl
-    You can connect to your server at http://localhost:3000
+To add things to an C<end> action that are called I<after> rendering,
+you can set it up like this:
 
-Yes, this nifty little starter application gets automatically included.
-You can also use "catalyst_par_script('myapp_server.pl')" to set a
-default script to execute.
+    sub render : ActionClass('RenderView') { }
 
-6. Want to create a binary that includes the Perl interpreter?
+    sub end : Private {
+        my ( $self, $c ) = @_;
+        $c->forward('render');
+        # do stuff here
+    }
 
-    % pp -o myapp myapp.par
-    % ./myapp myapp_server.pl
-    You can connect to your server at http://localhost:3000
 
 =head2 Serving static content
 
@@ -1977,26 +1517,26 @@ production environment.
 Static::Simple is a plugin that will help to serve static content for your
 application. By default, it will serve most types of files, excluding some
 standard Template Toolkit extensions, out of your B<root> file directory. All
-files are served by path, so if B<images/me.jpg> is requested, then
-B<root/images/me.jpg> is found and served.
+files are served by path, so if F<images/me.jpg> is requested, then
+F<root/images/me.jpg> is found and served.
 
 =head3 Usage
 
 Using the plugin is as simple as setting your use line in MyApp.pm to include:
 
- use Catalyst qw/Static::Simple/;
+    use Catalyst qw/Static::Simple/;
 
 and already files will be served.
 
 =head3 Configuring
 
 Static content is best served from a single directory within your root
-directory. Having many different directories such as C<root/css> and
-C<root/images> requires more code to manage, because you must separately
-identify each static directory--if you decide to add a C<root/js>
+directory. Having many different directories such as F<root/css> and
+F<root/images> requires more code to manage, because you must separately
+identify each static directory--if you decide to add a F<root/js>
 directory, you'll need to change your code to account for it. In
 contrast, keeping all static directories as subdirectories of a main
-C<root/static> directory makes things much easier to manage. Here's an
+F<root/static> directory makes things much easier to manage. Here's an
 example of a typical root directory structure:
 
     root/
@@ -2009,7 +1549,7 @@ example of a typical root directory structure:
     root/static/js/code.js
 
 
-All static content lives under C<root/static>, with everything else being
+All static content lives under F<root/static>, with everything else being
 Template Toolkit files.
 
 =over 4
@@ -2019,10 +1559,14 @@ Template Toolkit files.
 You may of course want to change the default locations, and make
 Static::Simple look somewhere else, this is as easy as:
 
- MyApp->config->{static}->{include_path} = [
-  MyApp->config->{root},
-  '/path/to/my/files'
- ];
+    MyApp->config(
+        static => {
+            include_path => [
+                MyApp->path_to('/'),
+                '/path/to/my/files',
+            ],
+        },
+    );
 
 When you override include_path, it will not automatically append the
 normal root path, so you need to add it yourself if you still want
@@ -2034,10 +1578,14 @@ served.
 If you want to force some directories to be only static, you can set
 them using paths relative to the root dir, or regular expressions:
 
- MyApp->config->{static}->{dirs} = [
-   'static',
-   qr/^(images|css)/,
- ];
+    MyApp->config(
+        static => {
+            dirs => [
+                'static',
+                qr/^(images|css)/,
+            ],
+        },
+    );
 
 =item File extensions
 
@@ -2045,22 +1593,28 @@ By default, the following extensions are not served (that is, they will
 be processed by Catalyst): B<tmpl, tt, tt2, html, xhtml>. This list can
 be replaced easily:
 
- MyApp->config->{static}->{ignore_extensions} = [
-    qw/tmpl tt tt2 html xhtml/
- ];
+    MyApp->config(
+        static => {
+            ignore_extensions => [
+                qw/tmpl tt tt2 html xhtml/
+            ],
+        },
+    );
 
 =item Ignoring directories
 
 Entire directories can be ignored. If used with include_path,
 directories relative to the include_path dirs will also be ignored:
 
- MyApp->config->{static}->{ignore_dirs} = [ qw/tmpl css/ ];
+    MyApp->config( static => {
+        ignore_dirs => [ qw/tmpl css/ ],
+    });
 
 =back
 
 =head3 More information
 
-L<http://search.cpan.org/dist/Catalyst-Plugin-Static-Simple/>
+L<Catalyst::Plugin::Static::Simple>
 
 =head3 Serving manually with the Static plugin with HTTP::Daemon (myapp_server.pl)
 
@@ -2078,16 +1632,16 @@ static content to the view, perhaps like this:
         my ( $self, $c ) = @_;
 
         $c->forward( 'MyApp::View::TT' )
-          unless ( $c->res->body || !$c->stash->{template} );
+            unless ( $c->res->body || !$c->stash->{template} );
     }
 
 This code will only forward to the view if a template has been
 previously defined by a controller and if there is not already data in
-C<$c-E<gt>res-E<gt>body>.
+C<< $c->res->body >>.
 
 Next, create a controller to handle requests for the /static path. Use
 the Helper to save time. This command will create a stub controller as
-C<lib/MyApp/Controller/Static.pm>.
+F<lib/MyApp/Controller/Static.pm>.
 
     $ script/myapp_create.pl controller Static
 
@@ -2139,7 +1693,7 @@ code in your Static controller:
 
 When using Apache, you can bypass Catalyst and any Static
 plugins/controllers controller by intercepting requests for the
-C<root/static> path at the server level. All that is required is to
+F<root/static> path at the server level. All that is required is to
 define a DocumentRoot and add a separate Location block for your static
 content. Here is a complete config for this application under mod_perl
 1.x:
@@ -2212,7 +1766,7 @@ allows old entries to be automatically expired when they are no longer needed.
 =head3 Page Caching
 
 Another method of caching is to cache the entire HTML page.  While this is
-traditionally handled by a front-end proxy server like Squid, the Catalyst
+traditionally handled by a frontend proxy server like Squid, the Catalyst
 PageCache plugin makes it trivial to cache the entire output from
 frequently-used or slow actions.
 
@@ -2250,10 +1804,14 @@ Note that the page cache is keyed on the page URI plus all parameters, so
 requests for / and /?foo=bar will result in different cache items.  Also,
 only GET requests will be cached by the plugin.
 
-You can even get that front-end Squid proxy to help out by enabling HTTP
+You can even get that frontend Squid proxy to help out by enabling HTTP
 headers for the cached page.
 
-    MyApp->config->{page_cache}->{set_http_headers} = 1;
+    MyApp->config(
+        page_cache => {
+            set_http_headers => 1,
+        },
+    );
 
 This would now set the following headers so proxies and browsers may cache
 the content themselves.
@@ -2304,12 +1862,12 @@ alterations.
 Catalyst provides a convenient way of testing your application during
 development and before deployment in a real environment.
 
-C<Catalyst::Test> makes it possible to run the same tests both locally
+L<Catalyst::Test> makes it possible to run the same tests both locally
 (without an external daemon) and against a remote server via HTTP.
 
 =head3 Tests
 
-Let's examine a skeleton application's C<t/> directory:
+Let's examine a skeleton application's F<t/> directory:
 
     mundus:~/MyApp chansen$ ls -l t/
     total 24
@@ -2319,17 +1877,17 @@ Let's examine a skeleton application's C<t/> directory:
 
 =over 4
 
-=item C<01app.t>
+=item F<01app.t>
 
 Verifies that the application loads, compiles, and returns a successful
 response.
 
-=item C<02pod.t>
+=item F<02pod.t>
 
 Verifies that all POD is free from errors. Only executed if the C<TEST_POD>
 environment variable is true.
 
-=item C<03podcoverage.t>
+=item F<03podcoverage.t>
 
 Verifies that all methods/functions have POD coverage. Only executed if the
 C<TEST_POD> environment variable is true.
@@ -2340,7 +1898,7 @@ C<TEST_POD> environment variable is true.
 
     mundus:~/MyApp chansen$ cat t/01app.t | perl -ne 'printf( "%2d  %s", $., $_ )'
     1  use Test::More tests => 2;
-    2  use_ok( Catalyst::Test, 'MyApp' );
+    2  BEGIN { use_ok( Catalyst::Test, 'MyApp' ) }
     3
     4  ok( request('/')->is_success );
 
@@ -2348,7 +1906,7 @@ The first line declares how many tests we are going to run, in this case
 two. The second line tests and loads our application in test mode. The
 fourth line verifies that our application returns a successful response.
 
-C<Catalyst::Test> exports two functions, C<request> and C<get>. Each can
+L<Catalyst::Test> exports two functions, C<request> and C<get>. Each can
 take three different arguments:
 
 =over 4
@@ -2358,17 +1916,17 @@ take three different arguments:
     request('/my/path');
     request('http://www.host.com/my/path');
 
-=item An instance of C<URI>.
+=item An instance of L<URI>.
 
     request( URI->new('http://www.host.com/my/path') );
 
-=item An instance of C<HTTP::Request>.
+=item An instance of L<HTTP::Request>.
 
     request( HTTP::Request->new( GET => 'http://www.host.com/my/path') );
 
 =back
 
-C<request> returns an instance of C<HTTP::Response> and C<get> returns the
+C<request> returns an instance of L<HTTP::Response> and C<get> returns the
 content (body) of the response.
 
 =head3 Running tests locally
@@ -2399,13 +1957,13 @@ C<CATALYST_SERVER=http://localhost:3000/> is the absolute deployment URI of
 your application. In C<CGI> or C<FastCGI> it should be the host and path
 to the script.
 
-=head3 C<Test::WWW::Mechanize> and Catalyst
+=head3 L<Test::WWW::Mechanize> and Catalyst
 
-Be sure to check out C<Test::WWW::Mechanize::Catalyst>. It makes it easy to
+Be sure to check out L<Test::WWW::Mechanize::Catalyst>. It makes it easy to
 test HTML, forms and links. A short example of usage:
 
     use Test::More tests => 6;
-    use_ok( Test::WWW::Mechanize::Catalyst, 'MyApp' );
+    BEGIN { use_ok( Test::WWW::Mechanize::Catalyst, 'MyApp' ) }
 
     my $mech = Test::WWW::Mechanize::Catalyst->new;
     $mech->get_ok("http://localhost/", 'Got index page');
@@ -2418,77 +1976,50 @@ test HTML, forms and links. A short example of usage:
 
 =over 4
 
-=item Catalyst::Test
-
-L<http://search.cpan.org/dist/Catalyst/lib/Catalyst/Test.pm>
+=item * L<Catalyst::Test>
 
-=item Test::WWW::Mechanize::Catalyst
+=item * L<Test::WWW::Mechanize::Catalyst>
 
-L<http://search.cpan.org/dist/Test-WWW-Mechanize-Catalyst/lib/Test/WWW/Mechanize/Catalyst.pm>
+=item * L<Test::WWW::Mechanize>
 
-=item Test::WWW::Mechanize
+=item * L<WWW::Mechanize>
 
-L<http://search.cpan.org/dist/Test-WWW-Mechanize/Mechanize.pm>
+=item * L<LWP::UserAgent>
 
-=item WWW::Mechanize
+=item * L<HTML::Form>
 
-L<http://search.cpan.org/dist/WWW-Mechanize/lib/WWW/Mechanize.pm>
+=item * L<HTTP::Message>
 
-=item LWP::UserAgent
+=item * L<HTTP::Request>
 
-L<http://search.cpan.org/dist/libwww-perl/lib/LWP/UserAgent.pm>
+=item * L<HTTP::Request::Common>
 
-=item HTML::Form
+=item * L<HTTP::Response>
 
-L<http://search.cpan.org/dist/libwww-perl/lib/HTML/Form.pm>
+=item * L<HTTP::Status>
 
-=item HTTP::Message
+=item * L<URI>
 
-L<http://search.cpan.org/dist/libwww-perl/lib/HTTP/Message.pm>
+=item * L<Test::More>
 
-=item HTTP::Request
+=item * L<Test::Pod>
 
-L<http://search.cpan.org/dist/libwww-perl/lib/HTTP/Request.pm>
+=item * L<Test::Pod::Coverage>
 
-=item HTTP::Request::Common
+=item * L<prove> (L<Test::Harness>)
 
-L<http://search.cpan.org/dist/libwww-perl/lib/HTTP/Request/Common.pm>
-
-=item HTTP::Response
-
-L<http://search.cpan.org/dist/libwww-perl/lib/HTTP/Response.pm>
-
-=item HTTP::Status
-
-L<http://search.cpan.org/dist/libwww-perl/lib/HTTP/Status.pm>
-
-=item URI
-
-L<http://search.cpan.org/dist/URI/URI.pm>
-
-=item Test::More
-
-L<http://search.cpan.org/dist/Test-Simple/lib/Test/More.pm>
-
-=item Test::Pod
-
-L<http://search.cpan.org/dist/Test-Pod/Pod.pm>
+=back
 
-=item Test::Pod::Coverage
+=head3 More Information
 
-L<http://search.cpan.org/dist/Test-Pod-Coverage/Coverage.pm>
+=over 4
 
-=item prove (Test::Harness)
+=item * L<Catalyst::Plugin::Authorization::Roles>
 
-L<http://search.cpan.org/dist/Test-Harness/bin/prove>
+=item * L<Catalyst::Plugin::Authorization::ACL>
 
 =back
 
-=head3 More Information
-
-L<http://search.cpan.org/perldoc?Catalyst::Plugin::Authorization::Roles>
-L<http://search.cpan.org/perldoc?Catalyst::Plugin::Authorization::ACL>
-
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm