X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FIntro.pod;h=24e4a3eccc5295388f3f2b7b80f89f2eb141c000;hp=5aff62131154c45fe639333da9ca2eefcae3c240;hb=47a792748b49cabce084f4ed40530bf174bb8624;hpb=cb93c9d7a46377666f9593736dcb87fad8f9d82e

diff --git a/lib/Catalyst/Manual/Intro.pod b/lib/Catalyst/Manual/Intro.pod
index 5aff621..24e4a3e 100644
--- a/lib/Catalyst/Manual/Intro.pod
+++ b/lib/Catalyst/Manual/Intro.pod
@@ -216,14 +216,15 @@ means that this decision is entirely up to you, the programmer;
 Catalyst doesn't enforce anything. See L<Catalyst::Manual::About> for
 a general discussion of these issues.
 
-All components must inherit from L<Catalyst::Base>, which provides a
-simple class structure and some common class methods like C<config> and
-C<new> (constructor).
+Model, View and Controller components must inherit from L<Catalyst::Model>,
+L<Catalyst::View> and L<Catalyst::Controller>, respectively. These, in turn, inherit
+from L<Catalyst::Component> which provides a simple class structure and some
+common class methods like C<config> and C<new> (constructor).
 
     package MyApp::Controller::Catalog;
 
     use strict;
-    use base 'Catalyst::Base';
+    use base 'Catalyst::Controller';
 
     __PACKAGE__->config( foo => 'bar' );
 
@@ -330,7 +331,7 @@ But first, we need a database.
 
     INSERT INTO foo (data) VALUES ('TEST!');
 
-    % sqlite /tmp/myapp.db < myapp.sql
+    % sqlite3 /tmp/myapp.db < myapp.sql
 
 Now we can create a DBIC::Schema model for this database.
 
@@ -819,10 +820,16 @@ dispatch type, please see L<Catalyst::DispatchType::Chained>.
     sub foo : Private { }
 
 Matches no URL, and cannot be executed by requesting a URL that
-corresponds to the action key. Private actions can be executed only
-inside a Catalyst application, by calling the C<forward> method:
+corresponds to the action key. Catalyst's :Private attribute is
+exclusive and doesn't work with other attributes (so will not work
+combined with Path or Chained attributes). With the exception of the
+C< index >, C< auto > and C< default > actions, Private actions can
+only be executed from inside a Catalyst application, by calling the
+C<forward> or C<detach> methods:
 
     $c->forward('foo');
+    # or
+    $c->detach('foo');
 
 See L</Flow Control> for a full explanation of C<forward>. Note that, as
 discussed there, when forwarding from another component, you must use
@@ -1158,8 +1165,8 @@ IRC:
 
 Mailing lists:
 
-    http://lists.rawmode.org/mailman/listinfo/catalyst
-    http://lists.rawmode.org/mailman/listinfo/catalyst-dev
+    http://lists.scsys.co.uk/mailman/listinfo/catalyst
+    http://lists.scsys.co.uk/mailman/listinfo/catalyst-dev
 
 =head1 AUTHOR