X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=8bc6c700bf0002b97dd43a88a76e5968d77e80d0;hb=34a83d89a7989524a72b984bdbce63b44ac41686;hp=5a4ad732e7c4995f0e87028aab48a8888a3fef6e;hpb=6f409682667c23a00552d0573c157ee3487c29bc;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 5a4ad73..8bc6c70 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -22,10 +22,10 @@ use attributes;
 require Catalyst::Helper;
 require Catalyst::PAR;
 require Catalyst::Build;
+require Catalyst::Test;
 
 require Catalyst::Engine::HTTP;
 require Catalyst::Engine::CGI;
-require Catalyst::Engine::FastCGI;
 
 require Catalyst::Controller;
 require Catalyst::Model;
@@ -56,7 +56,7 @@ our $DETACH    = "catalyst_detach\n";
 require Module::Pluggable::Fast;
 
 # Helper script generation
-our $CATALYST_SCRIPT_GEN = 14;
+our $CATALYST_SCRIPT_GEN = 18;
 
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class
@@ -289,7 +289,9 @@ sub detach { my $c = shift; $c->dispatcher->detach( $c, @_ ) }
 
 =item $c->error($arrayref)
 
-Returns an arrayref containing error messages.
+Returns an arrayref containing error messages.  If Catalyst encounters an
+error while processing a request, it stores the error in $c->error.  This
+method should not be used to store non-fatal error messages.
 
     my @error = @{ $c->error };
 
@@ -297,7 +299,8 @@ Add a new error.
 
     $c->error('Something bad happened');
 
-Clear errors.
+Clear errors.  You probably don't want to clear the errors unless you are
+implementing a custom error screen.
 
     $c->error(0);
 
@@ -610,8 +613,11 @@ sub setup {
         <<"EOF") if ( $ENV{CATALYST_SCRIPT_GEN} && ( $ENV{CATALYST_SCRIPT_GEN} < $Catalyst::CATALYST_SCRIPT_GEN ) );
 You are running an old script!
 
-  Please update by running:
-    catalyst.pl -nonew -scripts $class
+  Please update by running (this will overwrite existing files):
+    catalyst.pl -force -scripts $class
+
+  or (this will not overwrite existing files):
+    catalyst.pl -scripts $class
 EOF
 
     if ( $class->debug ) {
@@ -1927,6 +1933,8 @@ David Kamholz
 
 David Naughton
 
+Drew Taylor
+
 Gary Ashton Jones
 
 Geoff Richards