documentation tweaks

mojolicious · May 14, 2013 · b94dd50 · b94dd50
1 parent a8d9124
commit b94dd50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/lib/Mojolicious/Routes/Match.pm b/lib/Mojolicious/Routes/Match.pm
@@ -18,7 +18,7 @@ sub path_for {
   # Find endpoint
   else { return $name unless $endpoint = $self->root->lookup($name) }
 
-  # Merge values
+  # Merge values (clear format)
   my $captures = $self->stack->[-1] || {};
   %values = (%$captures, format => undef, %values);
   my $pattern = $endpoint->pattern;

diff --git a/lib/Mojolicious/Routes/Route.pm b/lib/Mojolicious/Routes/Route.pm
@@ -155,10 +155,9 @@ sub to {
   return $pattern->defaults unless @_;
   my ($shortcut, %defaults) = _defaults(@_);
 
-  # Shortcut
   if ($shortcut) {
 
-    # App
+    # Application
     if (ref $shortcut || $shortcut =~ /^[\w:]+$/) {
       $defaults{app} = $shortcut;
     }
@@ -170,8 +169,7 @@ sub to {
     }
   }
 
-  # Merge defaults
-  $pattern->defaults({%{$pattern->defaults}, %defaults}) if %defaults;
+  $pattern->defaults({%{$pattern->defaults}, %defaults});
 
   return $self;
 }
@@ -363,19 +361,12 @@ L<Mojolicious::Lite> tutorial for more argument variations.
 =head2 detour
 
   $r = $r->detour(action => 'foo');
-  $r = $r->detour({action => 'foo'});
   $r = $r->detour('controller#action');
-  $r = $r->detour('controller#action', foo => 'bar');
-  $r = $r->detour('controller#action', {foo => 'bar'});
-  $r = $r->detour(Mojolicious->new);
   $r = $r->detour(Mojolicious->new, foo => 'bar');
-  $r = $r->detour(Mojolicious->new, {foo => 'bar'});
-  $r = $r->detour('MyApp');
-  $r = $r->detour('MyApp', foo => 'bar');
   $r = $r->detour('MyApp', {foo => 'bar'});
 
 Set default parameters for this route and allow partial matching to simplify
-application embedding.
+application embedding, takes the same arguments as C<to>.
 
 =head2 find