summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/application/config/smileys.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php
index 9f38d2ca6..cddc881cc 100644
--- a/system/application/config/smileys.php
+++ b/system/application/config/smileys.php
@@ -30,7 +30,7 @@ $smileys = array(
':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
'%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'),
- ':P' => array('rasberry.gif', '19', '19', 'rasberry'),
+ ':P' => array('raspberry.gif', '19', '19', 'rasberry'),
':blank:' => array('blank.gif', '19', '19', 'blank stare'),
':long:' => array('longface.gif', '19', '19', 'long face'),
':ohh:' => array('ohh.gif', '19', '19', 'ohh'),
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 3a19f7f9c..afb83ff49 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -80,6 +80,7 @@ SVN Revision: XXXX</p>
<li>Removed added newlines ("\n") from most form and html helper functions.</li>
<li>Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.</li>
<li>Updated Date Helper to match the world's current time zones and offsets.</li>
+ <li>Fixed the spelling of "respberry" in config/smileys.php</li>
</ul>
</li>
<li>Other changes