summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-12-23 16:49:46 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-12-23 16:49:46 +0100
commit162c0226ed81efa318be00f4b8bde44febadccde (patch)
tree40698518fea479b9f7ac711c74661db87ac8a195 /user_guide
parent911d3e0fdd26ebdcb7c862a2a39ddcaef935d6f7 (diff)
format_characters() not convert_characters()
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/libraries/typography.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html
index 2c7e06c9c..b84ce123d 100644
--- a/user_guide/libraries/typography.html
+++ b/user_guide/libraries/typography.html
@@ -79,7 +79,7 @@ the following formatting:</p>
<li>Single line breaks are converted to &lt;br /&gt;, except those that appear within &lt;pre&gt; tags.</li>
<li>Block level elements, like &lt;div&gt; tags, are not wrapped within paragraphs, but their contained text is if it contains paragraphs.</li>
<li>Quotes are converted to correctly facing curly quote entities, except those that appear within tags.</li>
-<li>Apostrophes are converted to curly apostrophy entities.</li>
+<li>Apostrophes are converted to curly apostrophe entities.</li>
<li>Double dashes (either like -- this or like--this) are converted to em&#8212;dashes.</li>
<li>Three consecutive periods either preceding or following a word are converted to ellipsis&#8230;</li>
<li>Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.</li>
@@ -91,7 +91,7 @@ the following formatting:</p>
<h3>Parameters</h3>
-<p>There is one optional parameters that determines whether the parser should reduce more then two consecutive linebreaks down to two. Use bolean <kbd>TRUE</kbd> or <kbd>FALSE</kbd>.
+<p>There is one optional parameters that determines whether the parser should reduce more then two consecutive line breaks down to two. Use boolean <kbd>TRUE</kbd> or <kbd>FALSE</kbd>.
<p>By default the parser does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:</p>
@@ -104,13 +104,13 @@ If you choose to use this function you may want to consider
-<h2>convert_characters()</h2>
+<h2>format_characters()</h2>
-<p>This function is similiar to the <dfn>auto_typography</dfn> function above, except that it only does character conversion:</p>
+<p>This function is similar to the <dfn>auto_typography</dfn> function above, except that it only does character conversion:</p>
<ul>
<li>Quotes are converted to correctly facing curly quote entities, except those that appear within tags.</li>
-<li>Apostrophes are converted to curly apostrophy entities.</li>
+<li>Apostrophes are converted to curly apostrophe entities.</li>
<li>Double dashes (either like -- this or like--this) are converted to em&#8212;dashes.</li>
<li>Three consecutive periods either preceding or following a word are converted to ellipsis&#8230;</li>
<li>Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.</li>
@@ -118,7 +118,7 @@ If you choose to use this function you may want to consider
<p>Usage example:</p>
-<code>$string = $this->typography->convert_characters($string);</code>
+<code>$string = $this->typography->format_characters($string);</code>
<h2>nl2br_except_pre()</h2>