X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUpgrading.pod;h=66201a589af4c2158aa443fba624c429fd0cf469;hb=fb495632d15d5aa112371bb5c3c39a6189ddb9a0;hp=e0c3ee660c04e71557ee9431ebbdfcd0b9f4a175;hpb=da73c6af7a4e16c1e2ccf179345a2a13f5d26b05;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Upgrading.pod b/lib/Catalyst/Upgrading.pod
index e0c3ee6..66201a5 100644
--- a/lib/Catalyst/Upgrading.pod
+++ b/lib/Catalyst/Upgrading.pod
@@ -32,7 +32,8 @@ L<Moose> in your applications.
 
 =head2 Controller actions in Moose roles
 
-Declaring actions in Roles is currently unsupported.
+You can use L<MooseX::MethodAttributes::Role> if you want to declare actions
+inside Moose roles.
 
 =head2 Using Moose in Components
 
@@ -216,7 +217,7 @@ been called, and will not call them again.
 
 Using this now causes infinite recursion between MyApp::setup and
 Catalyst::setup, due to other backwards compatibility issues related to how
-plugin setup works. Moose method modifiers like C<< before|after|around 'setup
+plugin setup works. Moose method modifiers like C<< before|after|around setup
 => sub { ... }; >> also will not operate correctly on the setup method.
 
 The right way to do it is this:
@@ -307,26 +308,27 @@ COMPONENT method in your @ISA.
 =head2 Actions in your application class
 
 Having actions in your application class will now emit a warning at application
-startup as this is deprecated.It is highly recommended that these actions are moved
+startup as this is deprecated. It is highly recommended that these actions are moved
 into a MyApp::Controller::Root (as demonstrated by the scaffold application
-generated by catalyst.pl 
+generated by catalyst.pl). 
 
-This warning, also affects tests. You should move actions in your test, creating a myTest::Controller::Root, like the following example:
+This warning, also affects tests. You should move actions in your test,
+creating a myTest::Controller::Root, like the following example:
 
     package MyTest::Controller::Root;
-    
+
     use strict;
     use warnings;
-    
+
     use parent 'Catalyst::Controller';
-    
+
     __PACKAGE__->config(namespace => '');
-    
+
     sub action : Local {
         my ( $self, $c ) = @_;
         $c->do_something; 
     }
-    
+
     1;
 
 =head2 ::[MVC]:: naming scheme
@@ -399,7 +401,7 @@ to B<any> of the packages defined within that component.
 Calling the plugin method is deprecated, and calling it at run time is B<highly
 deprecated>.
 
-Instead you are recommended to use L< Catalyst::Model::Adaptor > or similar to
+Instead you are recommended to use L<Catalyst::Model::Adaptor> or similar to
 compose the functionality you need outside of the main application name space.
 
 Calling the plugin method will not be supported past Catalyst 5.81.