diff options
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/table.html | 6 | ||||
| -rw-r--r-- | user_guide/libraries/validation.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d01e564ce..83e904681 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -433,7 +433,7 @@ Change Log <li>Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use <kbd>dohash()</kbd> instead.</li>
<li>Fixed an bug that was preventing the input class from unsetting GET variables.</li>
<li>Fixed a router bug that was making it too greedy when matching end segments.</li>
-<li>Fixed a bug that was preventing multiple discreet database calls.</li>
+<li>Fixed a bug that was preventing multiple discrete database calls.</li>
<li>Fixed a bug in which loading a language file was producing a "file contains no data" message.</li>
<li>Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.</li>
<li>Fixed some missing prefixes when using the database prefix feature.</li>
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 8eb686f51..3e0f71668 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -100,7 +100,7 @@ echo $this->table->generate($query); </code>
-<p>Here is an example showing how you might create a table using discreet parameters:</p>
+<p>Here is an example showing how you might create a table using discrete parameters:</p>
<code>
$this->load->library('table');<br />
@@ -187,14 +187,14 @@ $this->table->set_template($tmpl); <h2>$this->table->set_heading()</h2>
-<p>Permits you to set the table heading. You can submit an array or discreet params:</p>
+<p>Permits you to set the table heading. You can submit an array or discrete params:</p>
<code>$this->table->set_heading('Name', 'Color', 'Size');</code>
<code>$this->table->set_heading(array('Name', 'Color', 'Size'));</code>
<h2>$this->table->add_row()</h2>
-<p>Permits you to add a row to your table. You can submit an array or discreet params:</p>
+<p>Permits you to add a row to your table. You can submit an array or discrete params:</p>
<code>$this->table->add_row('Blue', 'Red', 'Green');</code>
<code>$this->table->add_row(array('Blue', 'Red', 'Green'));</code>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index facd1a583..afb960ada 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -610,7 +610,7 @@ For example, your "username" error will be available at:<br /><dfn>$this->valida </tr>
</table>
-<p><strong>Note:</strong> These rules can also be called as discreet functions. For example:</p>
+<p><strong>Note:</strong> These rules can also be called as discrete functions. For example:</p>
<code>$this->validation->required($string);</code>
|