improved spelling in welcome screen.

Removed references to CRUD in the Cookbook

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a15482f..aed8d01 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -597,19 +597,19 @@ sub welcome_message {
                 <h1>$name on Catalyst $VERSION</h1>
              </div>
              <div id="answers">
-                 <p>Welcome to the wonderfull world of Catalyst.
-                    This MVC framework will make webdevelopment
+                 <p>Welcome to the wonderful world of Catalyst.
+                    This MVC framework will make web development
                     something you had never expected it to be:
                     Fun, rewarding and quick.</p>
                  <h2>What to do now?</h2>
-                 <p>That all depends really, on what <b>you</b> want to do.
+                 <p>That really depends  on what <b>you</b> want to do.
                     We do, however, provide you with a few starting points.</p>
                  <p>If you want to jump right into web development with Catalyst
                     you might want to check out the documentation.</p>
                  <pre><code>perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual.pod">Catalyst::Manual</a>
 perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Intro.pod">Catalyst::Manual::Intro</a></code></pre>
                  <p>If you would like some background information on the
-                    MVC-pattern, theese links might be able to help you out.</p>
+                    MVC-pattern, these links might be of help to you.</p>
                  <ul>
                      <li>
                          <a href="http://dev.catalyst.perl.org/wiki/Models">
@@ -630,8 +630,8 @@ perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Int
                  <h2>What to do next?</h2>
                  <p>Next you need to create an actual application. Use the
                     helper scripts for what they are worth, they can save you
-                    alot of work getting everything set up. Also, be sure to
-                    check out the vast array of plugins for Catalyst.
+                    a lot of work getting everything set up. Also, be sure to
+                    check out the vast array of plugins for Catalyst on CPAN.
                     They can handle everything from A to Z
                     , and a whole lot in  between.</p>
                  <h2>Need help?</h2>
@@ -649,9 +649,13 @@ perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Int
                      </li>
                  </ul>
                  <h2>In conclusion</h2>
-                 <p>The Catalyst team hope you will enjoy Catalyst as much as we                    enjoyed making it, and that rest asure that any and all
+                 <p>The Catalyst team hope you will enjoy using  Catalyst as much 
+                    as we enjoyed making it, and rest assured that any and all
                     feedback is welcomed</p>
-                 <p class="signature">-- there is no cabal, 2005</p>
+                 <p class="signature">-- #1. the first rule of the Cabal is, you do not 
+                                         talk about the Cabal.<br/>
+                                         #2. the second rule of the Cabal is, you DO NOT
+                                         talkk about the Cabal.</p>
              </div>
          </div>
     </body>

diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod
index 2cfdf77..ff80c19 100644 (file)
--- a/lib/Catalyst/Manual/Cookbook.pod
+++ b/lib/Catalyst/Manual/Cookbook.pod
@@ -40,45 +40,15 @@ statistics in your debug messages.
 =head2 Scaffolding
 
 Scaffolding is very simple with Catalyst.
-Just use Catalyst::Model::CDBI::CRUD as your base class.
 
-    # lib/MyApp/Model/CDBI.pm
-    package MyApp::Model::CDBI;
+The recommended way is to use Catalyst::Helper::Controller::Scaffold.
 
-    use strict;
-    use base 'Catalyst::Model::CDBI::CRUD';
-
-    __PACKAGE__->config(
-        dsn           => 'dbi:SQLite:/tmp/myapp.db',
-        relationships => 1
-    );
-
-    1;
-
-    # lib/MyApp.pm
-    package MyApp;
+Just install this module, and to scaffold a Class::DBI Model class, do the following:
 
-    use Catalyst 'FormValidator';
+./script/myapp_create controller <name> Scaffold <CDBI::Class>Scaffolding
 
-    __PACKAGE__->config(
-        name => 'My Application',
-        root => '/home/joeuser/myapp/root'
-    );
-
-    sub my_table : Global {
-        my ( $self, $c ) = @_;
-        $c->form( optional => [ MyApp::Model::CDBI::Table->columns ] );
-        $c->forward('MyApp::Model::CDBI::Table');
-    }
-
-    1;
 
-Modify the C<$c-E<gt>form()> parameters to match your needs, and don't
-forget to copy the templates into the template root. Can't find the
-templates?  They were in the CRUD model distribution, so you can do
-B<look Catalyst::Model::CDBI::CRUD> from the CPAN shell to find them.
 
-Other Scaffolding modules are in development at the time of writing.
 
 =head2 File uploads