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.

diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod
index 2bd68de..9ae8630 100644 (file)
--- a/lib/Catalyst/Manual/Cookbook.pod
+++ b/lib/Catalyst/Manual/Cookbook.pod
@@ -243,7 +243,7 @@ this.
 
 This is extensively covered in other documentation; see in particular
 L<Catalyst::Plugin::Authentication> and the Authentication chapter
-of the Tutorial at L<Catalyst::Manual::Tutorial::Authorization>.
+of the Tutorial at L<Catalyst::Manual::Tutorial::06_Authorization>.
 
 =head2 Pass-through login (and other actions)
 
@@ -997,7 +997,7 @@ Then you need a template. Here's the one from Agave:
 
 =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<XML::Feed>, as was done in the Catalyst
 Advent Calendar. Assuming we have a C<view> action that populates
 'entries' with some DBIx::Class iterator, the code would look something
 like this:

diff --git a/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod
index 7bae32b..904959c 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod
+++ b/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod
@@ -563,6 +563,9 @@ 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<http://www.sqlite.org>), 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<SQLite|http://www.sqlite.org>, a popular database that is
+lightweight and easy to use. Be sure to get at least version 3. Open
 C<myapp01.sql> in your editor and enter:
 
     --

diff --git a/lib/Catalyst/Manual/Tutorial/07_Debugging.pod b/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
index 4808852..1644a85 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
+++ b/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
@@ -93,7 +93,7 @@ template view use:
 
     [% c.log.debug("This is a test log message") %]
 
-As with many other logging facilities, you a method is defined for
+As with many other logging facilities, a method is defined for
 each of the following "logging levels" (in increasing order of
 severity/importance):
 

diff --git a/lib/Catalyst/Manual/Tutorial/10_Appendices.pod b/lib/Catalyst/Manual/Tutorial/10_Appendices.pod
index d602c26..f81ec45 100644 (file)
--- a/lib/Catalyst/Manual/Tutorial/10_Appendices.pod
+++ b/lib/Catalyst/Manual/Tutorial/10_Appendices.pod
@@ -139,8 +139,10 @@ L<http://www.gnu.org/software/emacs/manual/html_node/emacs/Indentation-Commands.
 =head1 APPENDIX 2: USING POSTGRESQL AND MYSQL
 
 The main database used in this tutorial is the very simple yet powerful
-SQLite.  This section provides information that can be used to "convert"
-the tutorial to use PostgreSQL and MySQL.  However, note that part of
+L<SQLite|http://www.sqlite.org>.  This section provides information
+that can be used to "convert" the tutorial to use
+L<PostgreSQL|http://www.postgresql.org> and
+L<MySQL|http://dev.mysql.com>.  However, note that part of
 the beauty of the MVC architecture is that very little database-specific
 code is spread throughout the system (at least when MVC is "done
 right").  Consequently, converting from one database to another is
@@ -511,7 +513,7 @@ You can verify that it worked with this command:
 
 =head2 MySQL
 
-B<NOTE:> This section is out of data with the rest of the tutorial.
+B<NOTE:> This section is out of date with the rest of the tutorial.
 Consider using SQLite or PostgreSQL since they are current.
 
 Use the following steps to adapt the tutorial to MySQL.  Thanks to Jim