diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
| commit | 686ff126762c0923556036a3cf73abb9390a7e67 (patch) | |
| tree | c0aedf7f9ce68ed3e5880f9f1ba14ddf03eb7083 /user_guide/libraries/form_validation.html | |
| parent | 918eaef728eaf49387083b39add7106e029fcfb4 (diff) | |
| parent | cef5bda9765080b818898811023d9ab427b0faf2 (diff) | |
Fixed conflicts
Why were there conflicts merging into master?
Diffstat (limited to 'user_guide/libraries/form_validation.html')
| -rw-r--r-- | user_guide/libraries/form_validation.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 81f2b9582..8d6f3b6d2 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1058,7 +1058,7 @@ POST array:</p> <tr> <td class="td"><strong>valid_ip</strong></td> <td class="td">No</td> - <td class="td">Returns FALSE if the supplied IP is not valid.</td> + <td class="td">Returns FALSE if the supplied IP is not valid. Accepts an optional parameter of "IPv4" or "IPv6" to specify an IP format.</td> <td class="td"> </td> </tr> |