merging in changes

1 files changed, 4 insertions, 4 deletions

diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html
index 408df17c9..4668f106e 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/");