moved the newly added inline elements so the list would remain in alphabetical order, added corresponding changelog note

2 files changed, 2 insertions, 1 deletions

diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index fad018fd3..6a0f2ec33 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -33,7 +33,7 @@ class CI_Typography {
 	var $skip_elements	= 'p|pre|ol|ul|dl|object|table';
 	
 	// Tags we want the parser to completely ignore when splitting the string.
-	var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var|big|small|q|tt';
+	var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
 
 	// whether or not to protect quotes within { curly braces }
 	var $protect_braced_quotes = FALSE;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 8fafcc76e..f690c9194 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -66,6 +66,7 @@ SVN Revision: </p>
 		<ul>
 			<li>Changed default current page indicator in the Pagination library to use &lt;strong&gt; instead of &lt;b&gt;</li>
 			<li>A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.</li>
+			<li>Added &lt;big&gt;, &lt;small&gt;, &lt;q&gt;, and &lt;tt&gt; to the Typography parser's inline elements.</li>
 		</ul>
 	</li>
 	<li>Helpers