From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 user_guide/helpers/security_helper.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'user_guide/helpers/security_helper.html')

diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index 49e0365d1..e0cace325 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -71,19 +71,19 @@ Security Helper
 
 <h2>xss_clean()</h2>
 
-<p>Provides Cross Site Script Hack filtering. This function is an alias to the one in the
-<a href="../libraries/input.html">Input class</a>. More info can be found there.</p>
+<p>Provides Cross Site Script Hack filtering.  This function is an alias to the one in the
+<a href="../libraries/input.html">Input class</a>.  More info can be found there.</p>
 
 
 <h2>sanitize_filename()</h2>
 
-<p>Provides protection against directory traversal. This function is an alias to the one in the
-<a href="../libraries/security.html">Security class</a>. More info can be found there.</p>
+<p>Provides protection against directory traversal.  This function is an alias to the one in the
+<a href="../libraries/security.html">Security class</a>.  More info can be found there.</p>
 
 
 <h2>do_hash()</h2>
 
-<p>Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:</p>
+<p>Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords.  Will create SHA1 by default. Examples:</p>
 
 <code>
 $str = do_hash($str); // SHA1<br />
@@ -91,13 +91,13 @@ $str = do_hash($str); // SHA1<br />
 $str = do_hash($str, 'md5'); // MD5
 </code>
 
-<p class="important"><strong>Note:</strong> This function was formerly named <kbd>dohash()</kbd>, which has been deprecated in favour of <kbd>do_hash()</kbd>.</p>
+<p class="important"><strong>Note:</strong>  This function was formerly named <kbd>dohash()</kbd>, which has been deprecated in favour of <kbd>do_hash()</kbd>.</p>
 
 
 
 <h2>strip_image_tags()</h2>
 
-<p>This is a security function that will strip image tags from a string. It leaves the image URL as plain text.</p>
+<p>This is a security function that will strip image tags from a string.  It leaves the image URL as plain text.</p>
 
 <code>$string = strip_image_tags($string);</code>
 
-- 
cgit v1.2.3-24-g4f1b


From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
 markers found in the change log

---
 user_guide/helpers/security_helper.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/helpers/security_helper.html')

diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index e0cace325..7343da152 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
-- 
cgit v1.2.3-24-g4f1b