From: Tomas Doran Date: Thu, 19 Nov 2009 09:57:28 +0000 (+0000) Subject: Merge 'tutorial_role_updates' into 'trunk' X-Git-Tag: v5.8005~77 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=513ae34af19a0b2d71231427093837631b06b5c3;hp=-c Merge 'tutorial_role_updates' into 'trunk' r11821@t0mlaptop (orig r11786): wolfman2000 | 2009-11-08 18:31:13 +0000 Attempt to branch out to work on adding stuff to the tutorial. r11854@t0mlaptop (orig r11819): wolfman2000 | 2009-11-14 15:57:25 +0000 Add link to SQLite, ensure they get version 3. r11878@t0mlaptop (orig r11843): wolfman2000 | 2009-11-16 05:43:41 +0000 Fix minor grammatical issue. r11879@t0mlaptop (orig r11844): wolfman2000 | 2009-11-16 05:54:04 +0000 Add links to the databases. Let the users see what we're talking about. r11880@t0mlaptop (orig r11845): wolfman2000 | 2009-11-16 05:55:41 +0000 Out of data? I think out of date is meant here. r11881@t0mlaptop (orig r11846): wolfman2000 | 2009-11-16 05:59:04 +0000 Fix dead link. r11882@t0mlaptop (orig r11847): wolfman2000 | 2009-11-16 06:02:14 +0000 Add link. --- 513ae34af19a0b2d71231427093837631b06b5c3 diff --combined lib/Catalyst/Manual/Cookbook.pod index 2bd68de,8c46a14..9ae8630 --- a/lib/Catalyst/Manual/Cookbook.pod +++ b/lib/Catalyst/Manual/Cookbook.pod @@@ -243,7 -243,7 +243,7 @@@ this This is extensively covered in other documentation; see in particular L and the Authentication chapter - of the Tutorial at L. + of the Tutorial at L. =head2 Pass-through login (and other actions) @@@ -997,7 -997,7 +997,7 @@@ Then you need a template. Here's the on =head3 Using XML::Feed - A more robust solution is to use XML::Feed, as was done in the Catalyst + A more robust solution is to use L, as was done in the Catalyst Advent Calendar. Assuming we have a C action that populates 'entries' with some DBIx::Class iterator, the code would look something like this: @@@ -1339,13 -1339,13 +1339,13 @@@ Imagine that you would like the followi =over -=item B/track/> +=item B<< /cd//track/ >> Displays info on a particular track. In the case of a multi-volume CD, this is the track sequence. -=item B/volume//track/> +=item B<< /cd//volume//track/ >> Displays info on a track on a specific volume. diff --combined lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod index 7bae32b,38497af..904959c --- a/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod +++ b/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod @@@ -560,9 -560,9 +560,12 @@@ tutorial =head1 CREATE A SQLITE DATABASE In this step, we make a text file with the required SQL commands to +create a database table and load some sample data. We will use +SQLite (L), a popular database that is +lightweight and easy to use. Be sure to get at least version 3. Open + create a database table and load some sample data. We will use + L, a popular database that is + lightweight and easy to use. Be sure to get at least version 3. Open C in your editor and enter: -- @@@ -649,13 -649,13 +652,13 @@@ required if you do a single SQL stateme your OS command prompt. Please note that here we have chosen to use 'singular' table names. This -is because the default inflection code for L +is because the default inflection code for L does NOT handle plurals. There has been much philosophical discussion on whether table names should be plural or singular. There is no one correct answer, as long as one makes a choice and remains consistent with it. If you prefer plural table names (e.g. they are easier and more natural to read) then you will need to pass it an inflect_map -option. See L for more information. +option. See L for more information. For using other databases, such as PostgreSQL or MySQL, see L. @@@ -691,20 -691,20 +694,20 @@@ running this command $ perl -MCatalyst::Model::DBIC::Schema -e \ 'print "$Catalyst::Model::DBIC::Schema::VERSION\n"' - 0.23 + 0.31 Please note the '\' above. Depending on your environment, you might be able to cut and paste the text as shown or need to remove the '\' character to that the command is all on a single line. -You should have version 0.23 or greater if you are following along +You should have version 0.31 or greater if you are following along with Debian 5. In other environments, you may need to run this command to install it directly from CPAN: $ sudo cpan Catalyst::Model::DBIC::Schema And re-run the version print command to verify that you are now at -0.23 or higher. +0.31 or higher. =head2 Create Static DBIx::Class Schema Files @@@ -755,6 -755,11 +758,6 @@@ into files =item * -C causes the help to include the -L DBIC component. - -=item * - And finally, C is the standard DBI connect string for use with SQLite. @@@ -902,9 -907,9 +905,9 @@@ display something like [debug] Statistics enabled [debug] Loaded plugins: .----------------------------------------------------------------------------. - | Catalyst::Plugin::ConfigLoader 0.22 | - | Catalyst::Plugin::StackTrace 0.09 | - | Catalyst::Plugin::Static::Simple 0.21 | + | Catalyst::Plugin::ConfigLoader 0.27 | + | Catalyst::Plugin::StackTrace 0.11 | + | Catalyst::Plugin::Static::Simple 0.25 | '----------------------------------------------------------------------------' [debug] Loaded dispatcher "Catalyst::Dispatcher" @@@ -945,7 -950,7 +948,7 @@@ | /books/list | /books/list | '-------------------------------------+--------------------------------------' - [info] MyApp powered by Catalyst 5.80003 + [info] MyApp powered by Catalyst 5.80013 You can connect to your server at http://debian:3000 B Be sure you run the C