fix conflicts.

2012-08-09 22:49:36 -05:00
parent 7dae482708 b5e81cb33c
commit 749948bc9d
2 changed files with 3 additions and 3 deletions
--- a/laravel/documentation/views/html.md
+++ b/laravel/documentation/views/html.md
@@ -85,7 +85,7 @@ For example, the < symbol should be converted to its entity representation. Conv

 ### Generating a link to a controller action with wildcard values:

-	echo HTML::link_to_action('user@profile', array($username));
+	echo HTML::link_to_action('user@profile', 'User Profile', array($username));

 <a name="mail-to-links"></a>
 ## Mail-To Links