X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2FMoreCatalystBasics.pod;h=7aa2cb8731a578669e7aad88a5eb70f63cb1f5e4;hp=aa66e12e17de6cc64213bbe1d99973c37e8af17e;hb=55beb65d70dcc3257ff21e9bf62826dba3f1a6fc;hpb=8a7c51514fe8828c25ecd353ad2e9dc3b456ac9a

diff --git a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
index aa66e12..7aa2cb8 100644
--- a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
@@ -110,7 +110,7 @@ C<-Debug> Flag
 
 Enables the Catalyst debug output you saw when we started the
 C<script/myapp_server.pl> development server earlier.  You can remove
-this plugin when you place your application into production.
+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
@@ -146,7 +146,7 @@ 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 Catatlyst will automcatically use the new
+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
@@ -181,17 +181,17 @@ 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:
 
-    __PACKAGE__->setup(qw/-Debug ConfigLoader Static::Simple/);
+    use Catalyst qw/-Debug ConfigLoader Static::Simple/;
 
 Replace it with:
 
-    __PACKAGE__->setup(qw/
-            -Debug
-            ConfigLoader
-            Static::Simple
-            
-            StackTrace
-            /);
+    use Catalyst qw/
+                   -Debug
+                   ConfigLoader
+                   Static::Simple
+
+                   StackTrace
+                  /;
 
 This tells Catalyst to start using one new plugin:
 
@@ -272,7 +272,7 @@ Catalyst components.  It is used to pass information between
 components and provide access to Catalyst and plugin functionality.
 
 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
+written as C<$c-E<gt>model('DB')-E<gt>resultset('Book')>.  The two
 are equivalent.
 
 B<Note:> Catalyst actions are regular Perl methods, but they make use 
@@ -309,7 +309,7 @@ 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>).
+(L<http://html-template.sourceforge.net>).
 
 =head2 Create a Catalyst View Using C<TTSite>
 
@@ -377,7 +377,7 @@ 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', 'provider', and 'service'.  See
+'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).
@@ -464,10 +464,10 @@ files, looping, conditional logic, etc.  In general, TT simplifies the
 usual range of Perl operators down to the single dot (C<.>) operator.
 This applies to operations as diverse as method calls, hash lookups, and
 list index values (see
-L<http://www.template-toolkit.org/docs/default/Manual/Variables.html>
+L<http://search.cpan.org/perldoc?Template::Manual::Variables>
 for details and examples).  In addition to the usual C<Template> module
 Pod documentation, you can access the TT manual at
-L<http://www.template-toolkit.org/docs/default/>.
+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
@@ -727,7 +727,7 @@ used the following SQL to retrieve the data:
 
 because we enabled DBIC_TRACE.
 
-You now the beginnings of a simple but workable web application. 
+You now have the beginnings of a simple but workable web application.
 Continue on to future sections and we will develop the application
 more fully.