summaryrefslogtreecommitdiffstats
path: root/user_guide/general/common_functions.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/general/common_functions.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/general/common_functions.html')
-rw-r--r--user_guide/general/common_functions.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html
index 3c7a5df9e..bfac32685 100644
--- a/user_guide/general/common_functions.html
+++ b/user_guide/general/common_functions.html
@@ -68,7 +68,7 @@ Auto-loading Resources
&nbsp;&nbsp;&nbsp;&nbsp;$str = quoted_printable_encode($str);<br />
}</code>
-<p>Returns boolean <kbd>TRUE</kbd> if the installed version of PHP is equal to or greater than the supplied version number. Returns <kbd>FALSE</kbd> if the installed version of PHP is lower than the supplied version number.</p>
+<p>Returns boolean <kbd>TRUE</kbd> if the installed version of PHP is equal to or greater than the supplied version number. Returns <kbd>FALSE</kbd> if the installed version of PHP is lower than the supplied version number.</p>
<h2>is_really_writable('<var>path/to/file</var>')</h2>
@@ -92,10 +92,10 @@ else<br />
<h2>set_status_header(<var>code</var>, '<var>text</var>');</h2>
-<p>Permits you to manually set a server status header. Example:</p>
+<p>Permits you to manually set a server status header. Example:</p>
<code>set_status_header(401);<br />
-// Sets the header as: Unauthorized</code>
+// Sets the header as: Unauthorized</code>
<p><a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">See here</a> for a full list of headers.</p>