Merge master into gsoc_breadboard

[catagits/Catalyst-Runtime.git] / lib / Catalyst / IOC.pm

diff --git a/lib/Catalyst/IOC.pm b/lib/Catalyst/IOC.pm
index 3b12aa2..4b25e1b 100644 (file)
--- a/lib/Catalyst/IOC.pm
+++ b/lib/Catalyst/IOC.pm
@@ -64,7 +64,7 @@ sub component ($;%) {
     $args{dependencies}{application_name} = depends_on( '/application_name' );
 
     my $lifecycle    = $args{lifecycle} || 'Singleton';
-    $args{lifecycle} = grep( m/^$lifecycle$/, qw/COMPONENTSingleton Request/)
+    $args{lifecycle} = grep( m/^$lifecycle$/, qw/COMPONENTSingleton Request/ )
                      ? "+Catalyst::IOC::LifeCycle::$lifecycle"
                      : $lifecycle
                      ;
@@ -161,7 +161,7 @@ Sets up the controller container to be customised.
 
 =head2 component
 
-Adds a component to the subcontainer. Works like L<Bread::Board::service>.
+Adds a component to the sub-container. Works like L<Bread::Board::service>.
 
 =head1 AUTHORS