summaryrefslogtreecommitdiffstats
path: root/user_guide/helpers/string_helper.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
commit8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch)
tree912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/helpers/string_helper.html
parent806b82448ddccece1311228519dc1410dacd0971 (diff)
parent4b9c62980599228f070b401c7673dce8085b0c61 (diff)
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/helpers/string_helper.html')
-rw-r--r--user_guide/helpers/string_helper.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 6fc2cf5f7..169ee4ebb 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -70,9 +70,9 @@ String Helper
<h2>random_string()</h2>
-<p>Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.</p>
+<p>Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.</p>
-<p>The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:</p>
+<p>The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:</p>
alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1
<ul>
@@ -92,7 +92,7 @@ String Helper
<h2>alternator()</h2>
-<p>Allows two or more items to be alternated between, when cycling through a loop. Example:</p>
+<p>Allows two or more items to be alternated between, when cycling through a loop. Example:</p>
<code>for ($i = 0; $i < 10; $i++)<br />
{<br />