summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-11-08 15:49:50 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-11-08 15:49:50 +0100
commit08277175e84c658a611c530ffea9cffae057c0f5 (patch)
treebebf97335dc6777e29ecd38b0bf7c2caa145f8ed /user_guide
parentd0b61ef16e247d5252c7505ac8e13517ce26ff04 (diff)
parent48531c1a7ae32f0b1e9ac711400a43b76b55dd81 (diff)
Merge branch 'release/2.1.0' of github.com:EllisLab/CodeIgniter into release/2.1.0
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 27980cf32..6b2976855 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -64,7 +64,7 @@ Change Log
<li>General Changes
<ul>
<li>Callback validation rules can now accept parameters like any other validation rule.</li>
- <li class="reactor">Added html_escape() to the <a href="general/common_functions.html">Common functions<a> to escape HTML output for preventing XSS easliy.</li>
+ <li class="reactor">Added html_escape() to the <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS easliy.</li>
</ul>
</li>
<li>Helpers