From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:56:50 -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/smiley_helper.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html
index 4668f106e..408df17c9 100644
--- a/user_guide/helpers/smiley_helper.html
+++ b/user_guide/helpers/smiley_helper.html
@@ -83,7 +83,7 @@ Your users can click a desired smiley and with the help of some JavaScript it wi
 requires that you first download and install the smiley images, then create a controller and the View as described.</p>
 
 <p class="important"><strong>Important:</strong> Before you begin, please <a href="http://codeigniter.com/download_files/smileys.zip">download the smiley images</a> and put them in
-a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at
+a publicly accessible place on your server.  This helper also assumes you have the smiley replacement array located at
 <dfn>application/config/smileys.php</dfn></p>
 
 
@@ -166,7 +166,7 @@ you can give your smiley links a generic name that will be tied to a specific id
 
 <h2>get_clickable_smileys()</h2>
 
-<p>Returns an array containing your smiley images wrapped in a clickable link. You must supply the URL to your smiley folder
+<p>Returns an array containing your smiley images wrapped in a clickable link.  You must supply the URL to your smiley folder
 and a field id or field alias.</p>
 
 <code>$image_array = get_smiley_links("http://example.com/images/smileys/", "comment");</code>
@@ -187,10 +187,10 @@ This function is designed to be placed into the &lt;head&gt; area of your web pa
 <h2>parse_smileys()</h2>
 
 <p>Takes a string of text as input and replaces any contained plain text smileys into the image
-equivalent. The first parameter must contain your string, the second must contain the URL to your smiley folder:</p>
+equivalent.  The first parameter must contain your string, the second must contain  the URL to your smiley folder:</p>
 
 <code>
-$str = 'Here are some simileys: :-) ;-)';
+$str = 'Here are some simileys: :-)  ;-)';
 
 $str = parse_smileys($str, "http://example.com/images/smileys/");
 
-- 
cgit v1.2.3-24-g4f1b


From 9c63d0bb34be4007178d5a7e46348d5e23fee3ff Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Thu, 27 Oct 2011 01:55:44 +0100
Subject: Bumped CodeIgniter version to 2.1.0.

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

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

diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html
index 6f1fa5915..8bdd1df2c 100644
--- a/user_guide/helpers/smiley_helper.html
+++ b/user_guide/helpers/smiley_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.3</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
-- 
cgit v1.2.3-24-g4f1b