ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2012-08-09 22:49:36 -05:00
parent 7dae482708 b5e81cb33c
commit 749948bc9d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/documentation/input.md
View File

@@ -145,10 +145,10 @@ Sometimes you may wish to merge or replace the current input. Here's how:
#### Replacing the entire input array with new data: #### Replacing the entire input array with new data:
Input::merge(array('doctor' => 'Bones', 'captain' => 'Kirk')); Input::replace(array('doctor' => 'Bones', 'captain' => 'Kirk'));
## Clearing Input ## Clearing Input
To clear all input data for the current request, using the `clear()` method, for example: To clear all input data for the current request, you may use the `clear` method:
Input::clear(); Input::clear();

2
laravel/documentation/views/html.md
View File

@@ -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: ### 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> <a name="mail-to-links"></a>
## Mail-To Links ## Mail-To Links