hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit

1 files changed, 8 insertions, 8 deletions

diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index 574ab35d7..abd5845ff 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -58,19 +58,19 @@ Alternate PHP Syntax
 <h1>Alternate PHP Syntax for View Files</h1>
 
 <p>If you do not utilize CodeIgniter's <a href="../libraries/parser.html">template engine</a>, you'll be using pure PHP
-in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use
-PHPs alternative syntax for control structures and short tag echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
+in your View files.  To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use
+PHPs alternative syntax for control structures and short tag echo statements.  If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
 and eliminate "echo" statements.</p>
 
 <h2>Automatic Short Tag Support</h2>
 
 <p><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might
 be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly,
-allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your
+allowing you to use that syntax even if your server doesn't support it.  This feature can be enabled in your
 <dfn>config/config.php</dfn> file.</p>
 
 <p class="important">Please note that if you do use this feature, if PHP errors are encountered
-in your <strong>view files</strong>, the error message and line number will not be accurately shown. Instead, all errors
+in your <strong>view files</strong>, the error message and line number will not be accurately shown.  Instead, all errors
 will be shown as <kbd>eval()</kbd> errors.</p>
 
 
@@ -89,7 +89,7 @@ will be shown as <kbd>eval()</kbd> errors.</p>
 <h2>Alternative Control Structures</h2>
 
 <p>Controls structures, like <var>if</var>, <var>for</var>, <var>foreach</var>, and <var>while</var> can be
-written in a simplified format as well. Here is an example using foreach:</p>
+written in a simplified format as well.  Here is an example using foreach:</p>
 
 <code>
 &lt;ul><br />
@@ -102,14 +102,14 @@ written in a simplified format as well. Here is an example using foreach:</p>
 <br />
 &lt;/ul></code>
 
-<p>Notice that there are no braces. Instead, the end brace is replaced with <var>endforeach</var>.
+<p>Notice that there are no braces.  Instead, the end brace is replaced with <var>endforeach</var>.
 Each of the control structures listed above has a similar closing syntax:
 <var>endif</var>, <var>endfor</var>, <var>endforeach</var>, and <var>endwhile</var></p>
 
-<p>Also notice that instead of using a semicolon after each structure (except the last one), there is a colon. This is
+<p>Also notice that instead of using a semicolon after each structure (except the last one), there is a colon.  This is
 important!</p>
 
-<p>Here is another example, using if/elseif/else. Notice the colons:</p>
+<p>Here is another example, using if/elseif/else.  Notice the colons:</p>
 
 
 <code><var>&lt;?php if ($username == 'sally'): ?></var><br />