X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=ef134b156f0ac41939f6bc905ae5c99d385e1d06;hp=092a60d845a85cadd0832a382bfcf97afe53ae65;hb=23eb3f513f7f03e9f84a441e0e0c78581e4c6c90;hpb=3e82a2958c20b96682e7879a1620740f9daae96d

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 092a60d..ef134b1 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -500,9 +500,17 @@ Contains the return value of the last executed action.
 
 Returns a hashref containing all your data.
 
-    $c->stash->{foo} ||= 'yada';
     print $c->stash->{foo};
 
+Keys may be set in the stash by assigning to the hash reference, or by passing
+either a single hash reference or a list of key/value pairs as arguments.
+
+For example:
+
+    $c->stash->{foo} ||= 'yada';
+    $c->stash( { moose => 'majestic', qux => 0 } );
+    $c->stash( bar => 1, gorch => 2 );
+
 =cut
 
 sub stash {
@@ -549,7 +557,7 @@ sub welcome_message {
             p, h1, h2, a {
                 margin-left: 20px;
                 margin-right: 20px;
-                font-family: garamond, verdana, tahoma, sans-serif;
+                font-family: verdana, tahoma, sans-serif;
             }
             :link, :visited {
                     text-decoration: none;
@@ -597,29 +605,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 following links.</p>
-                 <ul>
-                     <li>
-                         <a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual.pod">
-                             Catalyst::Manual
-                         </a>
-                     </li>
-                     <li>
-                         <a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Intro.pod">
-                             Catalyst::Manual::Intro
-                         </a>
-                     </li>
-                 </ul>
+                    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">
@@ -637,21 +635,35 @@ sub welcome_message {
                          </a>
                      </li>
                  </ul>
-                 <p>You may also want to check the local installed
-                    documentation.</p>
-                 <pre><code>perldoc Catalyst::Manual
-perldoc Catalyst::Manual::Intro</code></pre>
                  <h2>What to do next?</h2>
-                 <p>Next you need to create an actuall application. Use the
+                 <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.
-                    They can handle everything from Authentication to Static
-                    files, and a whole lot in  between.</p>
+                    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>
+                 <p>Catalyst has a very active community. The main places to get
+                    in touch are these.</p>
+                 <ul>
+                     <li>
+                         <a href="http://dev.catalyst.perl.org">Wiki</a>
+                     </li>
+                     <li>
+                         <a href="http://lists.rawmode.org/mailman/listinfo/catalyst">Mailing-List</a>
+                     </li>
+                     <li>
+                         <a href="irc://irc.perl.org/catalyst">IRC channel</a>
+                     </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>