summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--user_guide/changelog.html4
-rw-r--r--user_guide/helpers/file_helper.html2
-rw-r--r--user_guide/libraries/validation.html2
3 files changed, 3 insertions, 5 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7bdc3da2a..918758901 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -103,11 +103,9 @@ Change Log
<li>Fixed a typo in the image language file &quot;suppor&quot; to &quot;support&quot;. </li>
<li>Fixed an example for XML RPC.</li>
<li>Fixed an example of <kbd>accept_charset()</kbd> in the <a href="./libraries/user_agent.html">User Agent Library</a>. </li>
- <li>Fixed a missing &quot;?&gt;&quot; in the smiley helper. </li>
<li>Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor. </li>
<li>Fixed a typo in the <a href="./helpers/string_helper.html">String Helper</a> (uniquid changed to uniqid) </li>
- <li>Fixed a typo in the DocBlock comment for unset_userdata() in Session.</li>
- <li>Fixed a typo in the table library docs. </li>
+ <li>Fixed assorted user guide typos.</li>
<li>Moved part of the userguide menu javascript to an external file.</li>
<li>Added <a href="http://codeigniter.com/user_guide/libraries/zip.html">Zip Encoding Class</a> to the table of contents of the userguide.</li>
<li>Deprecated from Active Record; <kbd>getwhere()</kbd> for <kbd>get_where()</kbd>; <kbd>groupby()</kbd> for <kbd>group_by()</kbd>; <kbd>orderby()</kbd> for <kbd>order_by</kbd>; <kbd>orwhere()</kbd> for <kbd>or_where()</kbd>; and <kbd>orlike()</kbd> for <kbd>or_like()</kbd>.</li>
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index 815b7fd27..da8337cb1 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -79,7 +79,7 @@ File Helper
<p class="important"><strong>Note:</strong> The path is relative to your main site index.php file, NOT your controller or view files.
CodeIgniter uses a front controller so paths are always relative to the main site index.</p>
-<p>If you server is running an open_basedir restriction this function
+<p>If your server is running an open_basedir restriction this function
might not work if you are trying to access a file above the calling script.</p>
<h2>write_file('<var>path</var>', <kbd>$data</kbd>)</h2>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index b63c3e1c9..90ff0c127 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -675,7 +675,7 @@ each item. Example:</p>
<code>
&lt;select name="myselect"><br />
&lt;option value="one" <dfn>&lt;?= $this->validation->set_select('myselect', 'one'); ?></dfn> >One&lt;/option><br />
-&lt;option value="two" <dfn>&lt;?= $this->validation->set_select('myselect', 'two'); ?></dfn> >Three&lt;/option><br />
+&lt;option value="two" <dfn>&lt;?= $this->validation->set_select('myselect', 'two'); ?></dfn> >Two&lt;/option><br />
&lt;option value="three" <dfn>&lt;?= $this->validation->set_select('myselect', 'three'); ?></dfn> >Three&lt;/option><br />
&lt;/select>
</code>