diff options
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/libraries/form_validation.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/loader.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/typography.html | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 8485c7d3f..196c83b31 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -561,7 +561,7 @@ callback function for you to process.</dfn></p> <p><strong>To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.</strong></p>
-<p>You can also process the form data that is passed to your callback and return it. If your callback returns anything other then a boolean TRUE/FALSE
+<p>You can also process the form data that is passed to your callback and return it. If your callback returns anything other than a boolean TRUE/FALSE
it is assumed that the data is your newly processed form data.</p>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 60a2fe269..c40f44aa3 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -127,7 +127,7 @@ $this->my_session <p>This function is used to load your View files. If you haven't read the <a href="../general/views.html">Views</a> section of the
user guide it is recommended that you do since it shows you how this function is typically used.</p>
-<p>The first parameter is required. It is the name of the view file you would like to load. Note: The .php file extension does not need to be specified unless you use something other then <kbd>.php</kbd>.</p>
+<p>The first parameter is required. It is the name of the view file you would like to load. Note: The .php file extension does not need to be specified unless you use something other than <kbd>.php</kbd>.</p>
<p>The second <strong>optional</strong> parameter can take
an associative array or an object as input, which it runs through the PHP <a href="http://www.php.net/extract">extract</a> function to
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 29219059c..cd161016a 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -91,16 +91,11 @@ the following formatting:</p> <h3>Parameters</h3>
-<p>There are two optional parameters:</p>
+<p>There is one optional parameters that determines whether the parser should reduce more then two consecutive linebreaks down to two. Use bolean <kbd>TRUE</kbd> or <kbd>FALSE</kbd>.
-<ol>
- <li><strong>Strip JavaScript Event Handlers</strong>. Determines whether the parser should strip all JavaScript event handlers for security. Use bolean <kbd>TRUE</kbd> or <kbd>FALSE</kbd>.</li>
- <li><strong>Reduce Linebreaks</strong>. Determines whether the parser should reduce more then two consecutive linebreaks down to two. Use bolean <kbd>TRUE</kbd> or <kbd>FALSE</kbd>.</li>
-</ol>
+<p>By default the parser does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:</p>
-<p>By default the parser strips JS Event handlers and does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:</p>
-
-<code>$string = $this->typography->auto_typography($string, <kbd>TRUE</kbd>, <kbd>FALSE</kbd>);</code>
+<code>$string = $this->typography->auto_typography($string, <kbd>FALSE</kbd>);</code>
<p class="important"><strong>Note:</strong> Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted.
|