X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2F02_CatalystBasics.pod;h=2319bea339e4014ac7f127ab78d582c7ed4d8698;hp=3808ec05921e800e4ac3ab4f5124e42537479244;hb=608ea8afc33ba2fd406e19111720fac2cfe7ce39;hpb=6bd343899559c5504700854f7c9f607eea8c686a

diff --git a/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod
index 3808ec0..2319bea 100644
--- a/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod
@@ -74,7 +74,7 @@ clean "separation of control" between the different portions of your
 application. Given that many other documents cover this subject in
 detail, MVC will not be discussed in depth here (for an excellent
 introduction to MVC and general Catalyst concepts, please see
-L<Catalyst::Manual::About|Catalyst::Manual::About>). In short:
+L<Catalyst::Manual::About>). In short:
 
 =over 4
 
@@ -110,7 +110,7 @@ automatically create our Catalyst model for use with a database.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::01_Intro|Catalyst::Manual::Tutorial::01_Intro>.
+L<Catalyst::Manual::Tutorial::01_Intro>.
 
 
 =head1 CREATE A CATALYST PROJECT
@@ -118,10 +118,10 @@ L<Catalyst::Manual::Tutorial::01_Intro|Catalyst::Manual::Tutorial::01_Intro>.
 Catalyst provides a number of helper scripts that can be used to quickly
 flesh out the basic structure of your application. All Catalyst projects
 begin with the C<catalyst.pl> helper (see
-L<Catalyst::Helper|Catalyst::Helper> for more information on helpers).
+L<Catalyst::Helper> for more information on helpers).
 Also note that as of Catalyst 5.7000, you will not have the helper
-scripts unless you install both L<Catalyst::Runtime|Catalyst::Runtime>
-and L<Catalyst::Devel|Catalyst::Devel>.
+scripts unless you install both L<Catalyst::Runtime>
+and L<Catalyst::Devel>.
 
 In this first chapter of the tutorial, use the Catalyst C<catalyst.pl>
 script to initialize the framework for an application called C<Hello>:
@@ -200,13 +200,13 @@ C<Ctrl-C> to breakout of the dev server) if you prefer.
     [debug] Statistics enabled
     [debug] Loaded plugins:
     .----------------------------------------------------------------------------.
-    | Catalyst::Plugin::ConfigLoader  0.27                                       |
+    | Catalyst::Plugin::ConfigLoader  0.30                                       |
     '----------------------------------------------------------------------------'
     
     [debug] Loaded dispatcher "Catalyst::Dispatcher"
-    [debug] Loaded engine "Catalyst::Engine::HTTP"
-    [debug] Found home "/home/me/Hello"
-    [debug] Loaded Config "/home/me/Hello/hello.conf"
+    [debug] Loaded engine "Catalyst::Engine"
+    [debug] Found home "/home/catalyst/Hello"
+    [debug] Loaded Config "/home/catalyst/Hello/hello.conf"
     [debug] Loaded components:
     .-----------------------------------------------------------------+----------.
     | Class                                                           | Type     |
@@ -231,8 +231,8 @@ C<Ctrl-C> to breakout of the dev server) if you prefer.
     | /                                   | /default                             |
     '-------------------------------------+--------------------------------------'
     
-    [info] Hello powered by Catalyst 5.80025
-    You can connect to your server at http://debian:3000
+    [info] Hello powered by Catalyst 5.90002
+    HTTP::Server::PSGI: Accepting connections at http://0:3000/
 
 Point your web browser to L<http://localhost:3000> (substituting a
 different hostname or IP address as appropriate) and you should be
@@ -241,15 +241,18 @@ screen or an "Index" screen, you probably forgot to specify port 3000 in
 your URL).  Information similar to the following should be appended to
 the logging output of the development server:
 
-    [info] *** Request 1 (0.001/s) [23194] [Sat Jan 16 11:09:18 2010] ***
-    [debug] "GET" request for "/" from "127.0.0.1"
+    [info] Hello powered by Catalyst 5.90002
+    HTTP::Server::PSGI: Accepting connections at http://0:3000/
+    [info] *** Request 1 (0.067/s) [19026] [Tue Aug 30 17:24:32 2011] ***
+    [debug] "GET" request for "/" from "192.168.245.2"
     [debug] Path is "/"
-    [info] Request took 0.004851s (206.143/s)
+    [debug] Response Code: 200; Content-Type: text/html; charset=utf-8; Content-Length: 5613
+    [info] Request took 0.040895s (24.453/s)
     .------------------------------------------------------------+-----------.
     | Action                                                     | Time      |
     +------------------------------------------------------------+-----------+
-    | /index                                                     | 0.000395s |
-    | /end                                                       | 0.000425s |
+    | /index                                                     | 0.000916s |
+    | /end                                                       | 0.000877s |
     '------------------------------------------------------------+-----------'
 
 B<Note>: Press C<Ctrl-C> to break out of the development server if
@@ -268,7 +271,7 @@ browser.
 
     sub index :Path :Args(0) {
         my ( $self, $c ) = @_;
-        
+    
         # Hello World
         $c->response->body( $c->welcome_message );
     }
@@ -279,11 +282,11 @@ as a "404" message or a redirect, but for now just leave it alone.
 The "C<$c>" here refers to the Catalyst context, which is used to access
 the Catalyst application. In addition to many other things, the Catalyst
 context provides access to "response" and "request" objects. (See
-L<Catalyst|Catalyst>, L<Catalyst::Response|Catalyst::Response>, and
-L<Catalyst::Request|Catalyst::Request>)
+L<Catalyst::Runtime>, L<Catalyst::Response>, and
+L<Catalyst::Request>)
 
 C<$c-E<gt>response-E<gt>body> sets the HTTP response (see
-L<Catalyst::Response|Catalyst::Response>), while
+L<Catalyst::Response>), while
 C<$c-E<gt>welcome_message> is a special method that returns the welcome
 message that you saw in your browser.
 
@@ -308,28 +311,25 @@ way. For example, the URL C<http://hello.com/admin/articles/create> maps
 to the package C<Hello::Controller::Admin::Articles>, and the C<create>
 method.
 
-Add the following subroutine to your C<lib/Hello/Controller/Root.pm>
-file:
+While you leave the C<script/hello_server.pl -r> command running the
+development server in one window (don't forget the "-r" at the end!),
+open another window and add the following subroutine to your
+C<lib/Hello/Controller/Root.pm> file:
 
     sub hello :Global {
         my ( $self, $c ) = @_;
-        
+    
         $c->response->body("Hello, World!");
     }
 
-Once you restart the server, you will need to use the new address
-L<http://localhost:3000/hello> instead of L<http://localhost:3000/> to see the
-changes.
-
 B<TIP>: See Appendix 1 for tips on removing the leading spaces when
 cutting and pasting example code from POD-based documents.
 
-Here you're sending your own string to the webpage.
-
-Save the file, and you should notice the following in your server output:
+Notice in the window running the Development Server that you should
+get output similar to the following:
 
     Saw changes to the following files:
-     - /home/me/Hello/lib/Hello/Controller/Root.pm (modify)
+     - /home/catalyst/Hello/lib/Hello/Controller/Root.pm (modify)
     
     Attempting to restart the server
     ...
@@ -342,17 +342,11 @@ Save the file, and you should notice the following in your server output:
     | /index               | Hello::Controller::Root              | index        |
     | /hello               | Hello::Controller::Root              | hello        |
     '----------------------+--------------------------------------+--------------'
-    
-    [debug] Loaded Path actions:
-    .-------------------------------------+--------------------------------------.
-    | Path                                | Private                              |
-    +-------------------------------------+--------------------------------------+
-    | /                                   | /index                               |
-    | /                                   | /default                             |
-    | /hello                              | /hello                               |
-    '-------------------------------------+--------------------------------------'
     ...
 
+The development server noticed the change in C<Hello::Controller::Root>
+and automatically restarted itself.
+
 Go to L<http://localhost:3000/hello> to see "Hello, World!".   Also
 notice that the newly defined 'hello' action is listed under "Loaded
 Private actions" in the development server debug output.
@@ -362,9 +356,9 @@ Private actions" in the development server debug output.
 
 In the Catalyst world a "View" itself is not a page of XHTML or a
 template designed to present a page to a browser. Rather, it is the
-module that determines the I<type> of view -- HTML, pdf, XML, etc. For
-the thing that generates the I<content> of that view (such as the a
-Toolkit Template template file), the actual templates go under the
+module that determines the I<type> of view -- HTML, PDF, XML, etc. For
+the thing that generates the I<content> of that view (such as a
+Template Toolkit template file), the actual templates go under the
 "root" directory.
 
 To create a TT view, run:
@@ -385,13 +379,13 @@ The "view" keyword tells the create script that you are creating a view.
 The first argument "HTML" tells the script to name the View module "HTML.pm",
 which is a commonly used name for TT views.  You can name it anything you want,
 such as "MyView.pm". If you have more than one view, be sure to set the
-default_view in Hello.pm (See L<Catalyst::View::TT|Catalyst::View::TT> for more
+default_view in Hello.pm (See L<Catalyst::View::TT> for more
 details on setting this).
 
 =item *
 
 The final "TT" tells Catalyst the I<type> of the view, with "TT"
-indicating that you want to a Template Toolkit view.
+indicating that you want to use a Template Toolkit view.
 
 =back
 
@@ -402,7 +396,7 @@ Now that the HTML.pm "View" exists, Catalyst will autodiscover it and be
 able to use it to display the view templates using the "process" method
 that it inherits from the C<Catalyst::View::TT> class.
 
-Template Toolkit is a very full featured template facility, with
+Template Toolkit is a very full-featured template facility, with
 excellent documentation at L<http://template-toolkit.org/>, but since
 this is not a TT tutorial, we'll stick to only basic TT usage here (and
 explore some of the more common TT features in later chapters of the
@@ -436,18 +430,18 @@ area for putting information to share with other parts of your
 application. The "template" key determines which template will be
 displayed at the end of the request cycle. Catalyst controllers have a
 default "end" action for all methods which causes the first (or default)
-view to be rendered (unless there's a C<$c-E<gt>response- E<gt>body()>
+view to be rendered (unless there's a C<$c-E<gt>response-E<gt>body()>
 statement). So your template will be magically displayed at the end of
 your method.
 
 After saving the file, the development server should automatically
 restart (again, the tutorial is written to assume that you are using the
 "-r" option -- manually restart it if you aren't), and look at
-L<http://localhost:3000/hello> in your again. You should see the
-template that you just made.
+L<http://localhost:3000/hello> in your web browser again. You should see
+the template that you just created.
 
 B<TIP:> If you keep the server running with "-r" in a "background
-window," don't let that window get totally hidden... if you have an
+window," don't let that window get totally hidden... if you have a
 syntax error in your code, the debug server output will contain the
 error information.
 
@@ -480,8 +474,8 @@ Create a controller named "Site" by executing the create script:
     $ script/hello_create.pl controller Site
 
 This will create a C<lib/Hello/Controller/Site.pm> file (and a test
-file). Bring Site.pm up in your editor, and you can see that there's not
-much there.
+file). If you bring Site.pm up in your editor, you can see that
+there's not much there to see.
 
 In C<lib/Hello/Controller/Site.pm>, add the following method:
 
@@ -514,7 +508,7 @@ Make a subdirectory "site" in the "root" directory.
 
     $ mkdir root/site
 
-Create a new template file in that direction named C<root/site/test.tt>
+Create a new template file in that directory named C<root/site/test.tt>
 and include a line like:
 
     <p>Hello, [% username %]!</p>
@@ -526,6 +520,11 @@ your test.tt file displayed, including the name "John" that you set in
 the controller.
 
 
+You can jump to the next chapter of the tutorial here:
+L<More Catalyst Basics|Catalyst::Manual::Tutorial::03_MoreCatalystBasics>
+
+
+
 =head1 AUTHORS
 
 Gerda Shank, C<gerda.shank@gmail.com>
@@ -533,11 +532,8 @@ Kennedy Clark, C<hkclark@gmail.com>
 
 Feel free to contact the author for any errors or suggestions, but the
 best way to report issues is via the CPAN RT Bug system at
-<https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual>.
-
-The most recent version of the Catalyst Tutorial can be found at
-L<http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Tutorial/>.
+L<https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual>.
 
-Copyright 2006-2010, Kennedy Clark, under the
+Copyright 2006-2011, Kennedy Clark, under the
 Creative Commons Attribution Share-Alike License Version 3.0
 (L<http://creativecommons.org/licenses/by-sa/3.0/us/>).