merged conflicts

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Delta.pod

diff --git a/lib/Catalyst/Delta.pod b/lib/Catalyst/Delta.pod
index 95c9fc2..8b5caf2 100755 (executable)
--- a/lib/Catalyst/Delta.pod
+++ b/lib/Catalyst/Delta.pod
@@ -61,6 +61,11 @@ function perfectly with this version of Catalyst).
 Has been updated to fix failing tests (although older versions still
 function perfectly with this version of Catalyst).
 
+=item Catalyst::Plugin::Authentication
+
+Has been updated to fix failing tests (although older versions still
+function perfectly with this version of Catalyst).
+
 =back
 
 =head1 PREVIOUS VERSIONS
@@ -162,7 +167,7 @@ classes are better implemented as Moose roles.
 
 =item *
 
-L<MooseX::MethodAttributes::Inheritable> is used to contain action
+L<MooseX::MethodAttributes::Role::AttrContainer::Inheritable> is used to contain action
 attributes. This means that attributes are represented in the MOP, and
 decouples action creation from attributes.