summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries/typography.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
commit8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch)
tree912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/libraries/typography.html
parent806b82448ddccece1311228519dc1410dacd0971 (diff)
parent4b9c62980599228f070b401c7673dce8085b0c61 (diff)
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/libraries/typography.html')
-rw-r--r--user_guide/libraries/typography.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html
index 333f77a7d..895e76f7d 100644
--- a/user_guide/libraries/typography.html
+++ b/user_guide/libraries/typography.html
@@ -71,7 +71,7 @@ Typography Class
<h2>auto_typography()</h2>
-<p>Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with
+<p>Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with
the following formatting:</p>
<ul>
@@ -133,7 +133,7 @@ This function is identical to the native PHP <dfn>nl2br()</dfn> function, except
<h2>protect_braced_quotes</h2>
<p>When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single
- and double quotes within curly braces. To enable this, set the <kbd>protect_braced_quotes</kbd> class property to <samp>TRUE</samp>.</p>
+ and double quotes within curly braces. To enable this, set the <kbd>protect_braced_quotes</kbd> class property to <samp>TRUE</samp>.</p>
<p>Usage example:</p>