From: Kennedy Clark Date: Thu, 18 Dec 2008 15:52:09 +0000 (+0000) Subject: Minor adjustments to tutorial. Mention tests fail in 5.7014 for Part8. X-Git-Tag: v5.8005~241 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=191dee29949dbcb6c296feb845dc08e22eac2949 Minor adjustments to tutorial. Mention tests fail in 5.7014 for Part8. --- diff --git a/lib/Catalyst/Manual/Tutorial/Appendices.pod b/lib/Catalyst/Manual/Tutorial/Appendices.pod index 349e433..c2e7a56 100644 --- a/lib/Catalyst/Manual/Tutorial/Appendices.pod +++ b/lib/Catalyst/Manual/Tutorial/Appendices.pod @@ -107,8 +107,8 @@ Removes four leading space from the current line through line 44 =head2 "Un-indenting" with Emacs -Although there author has not used emacs for many years (apologies to -the emacs fans out there), here is a quick hint to get you started. To +Although there author has not used Emacs for many years (apologies to +the Emacs fans out there), here is a quick hint to get you started. To replace the leading spaces of every line in a file, use: M-x replace-regexp @@ -121,7 +121,7 @@ four spaces after the "^" on the "Replace regexp:" line and no spaces entered on the last line. You can limit the replacement operation by selecting text first (depending -on your version of emacs, you can either use the mouse or experiment with +on your version of Emacs, you can either use the mouse or experiment with commands such as C to set the mark at the cursor location and C> and C> to set the mark at the beginning and end of the file respectively. diff --git a/lib/Catalyst/Manual/Tutorial/Authentication.pod b/lib/Catalyst/Manual/Tutorial/Authentication.pod index cb61aea..0f66ebf 100644 --- a/lib/Catalyst/Manual/Tutorial/Authentication.pod +++ b/lib/Catalyst/Manual/Tutorial/Authentication.pod @@ -139,10 +139,10 @@ Notice how the helper has added three new table-specific result source files to the C directory. And, more importantly, even if there were changes to the existing result source files, those changes would have only been written above the C<# DO NOT -MODIFY THIS OR ANYTHING ABOVE!> comment and your hand-editted +MODIFY THIS OR ANYTHING ABOVE!> comment and your hand-edited enhancements would have been preserved. -Speaking of "hand-editted enhancements," we should now add +Speaking of "hand-edit ted 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<# DO NOT MODIFY THIS OR ANYTHING ABOVE!> comment and the closing C<1;>: @@ -501,7 +501,7 @@ the following method: my ($self, $c) = @_; # Allow unauthenticated users to reach the login page. This - # allows anauthenticated users to reach any action in the Login + # allows unauthenticated users to reach any action in the Login # controller. To lock it down to a single action, we could use: # if ($c->action eq $c->controller('Login')->action_for('index')) # to only allow unauthenticated access to the 'index' action we diff --git a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod index 7be1749..cc42b07 100644 --- a/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod +++ b/lib/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod @@ -343,7 +343,7 @@ 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, +Template 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 style of view @@ -383,7 +383,7 @@ And update it to match: B Make sure to add a comma after '.tt2' outside the single quote. -This changes the default extenstion for Template Toolkit from '.tt' to +This changes the default extension for Template Toolkit from '.tt' to '.tt2' and changes the base directory for your template files from C to C. @@ -553,16 +553,16 @@ your OS command prompt. =head1 DATABASE ACCESS WITH C -Catalyst can be used with virtually any form of persistent datastore -available via Perl. For example, -L can be used to -easily access databases through the traditional Perl C 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 has been a popular choice -in the past, Matt Trout's L (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. +Catalyst can be used with virtually any form of persistent datastore +available via Perl. For example, +L can be used to easily +access databases through the traditional Perl C interface. However, +most Catalyst applications use some form of ORM technology to +automatically create and save model objects as they are used. Although +L has been a popular choice in the past, Matt +Trout's L (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 @@ -598,8 +598,8 @@ use the C option that we switch to below. =head1 ENABLE THE MODEL IN THE CONTROLLER -Open C and uncomment the model code we -left disabled earlier (uncomment the line containing +Open C and un-comment the model code we +left disabled earlier (un-comment the line containing C<[$c-Emodel('DB::Books')-Eall]> and delete the next 2 lines): =head2 list @@ -624,7 +624,7 @@ C<[$c-Emodel('DB::Books')-Eall]> and delete the next 2 lines): $c->stash->{template} = 'books/list.tt2'; } -B: You may see the C<$c-Emodel('DB::Book')> uncommented above +B: You may see the C<$c-Emodel('DB::Book')> un-commented above written as C<$c-Emodel('DB')-Eresultset('Book')>. The two are equivalent. @@ -733,7 +733,7 @@ Next, to view the book list, change the URL in your browser to L. You should get a list of the five books loaded by the C 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). +column will still be blank (we will fill that in later). Also notice in the output of the C