[Catalyst-commits] r11904 - in Catalyst-Manual/5.80/trunk: . lib/Catalyst/Manual

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-11-19 09:56:33 +0000 (Thu, 19 Nov 2009)
New Revision: 11904

Modified:
   Catalyst-Manual/5.80/trunk/
   Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Intro.pod
Log:
 r11933 at t0mlaptop (orig r11898):  altreus | 2009-11-18 23:31:34 +0000
 A branch for Altreus
 r11934 at t0mlaptop (orig r11899):  altreus | 2009-11-18 23:33:11 +0000
 Fix incorrectness re :Global and :Local
 
 Authorization:
 <@mst> wow. whoever said that was on crack.
 



Property changes on: Catalyst-Manual/5.80/trunk
___________________________________________________________________
Name: svk:merge
   + 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Manual/5.70/trunk:10285
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Manual/5.80/branches/altreus-is-fixing-inconsistencies:11899
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Manual:8492

Modified: Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Intro.pod
===================================================================
--- Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Intro.pod	2009-11-19 09:52:36 UTC (rev 11903)
+++ Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Intro.pod	2009-11-19 09:56:33 UTC (rev 11904)
@@ -847,7 +847,7 @@
 Matches any URL beginning with> http://localhost:3000/my/controller/foo. The namespace and
 subroutine name together determine the path.
 
-=item * Namespace-level (C<:Global>)
+=item * Root-level (C<:Global>)
 
     package MyApp::Controller::Foo;
     sub foo : Global { }
@@ -855,8 +855,9 @@
 Matches http://localhost:3000/foo - that is, the action is mapped
 directly to the controller namespace, ignoring the function name.
 
-C<:Global> is equivalent C<:Local> one level higher in
-the namespace.
+C<:Global> always matches from root: it is sugar for C<:Path('/methodname')>.
+C<:Local> is simply sugar for C<:Path('methodname')>, which takes the package
+namespace as described above.
 
     package MyApp::Controller::Root;
     __PACKAGE__->config->{namespace}='';
@@ -887,7 +888,9 @@
 match precisely.
 
 No :Args at all means that B<any number> of arguments are taken.  Thus, any
-URL that B<starts with> the controller's path will match.
+URL that B<starts with> the controller's path will match. Obviously, this means
+you cannot chain from an action that does not specify args, as the next action
+in the chain will be swallowed as an arg to the first!
 
 
 =item * Literal match (C<:Path>)