summaryrefslogtreecommitdiffstats
path: root/user_guide/general
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide/general')
-rw-r--r--user_guide/general/alternative_php.html2
-rw-r--r--user_guide/general/ancillary_classes.html2
-rw-r--r--user_guide/general/autoloader.html2
-rw-r--r--user_guide/general/caching.html8
-rw-r--r--user_guide/general/controllers.html15
-rw-r--r--user_guide/general/core_classes.html2
-rw-r--r--user_guide/general/creating_libraries.html6
-rw-r--r--user_guide/general/credits.html3
-rw-r--r--user_guide/general/errors.html2
-rw-r--r--user_guide/general/helpers.html2
-rw-r--r--user_guide/general/hooks.html4
-rw-r--r--user_guide/general/index.html2
-rw-r--r--user_guide/general/libraries.html2
-rw-r--r--user_guide/general/managing_apps.html5
-rw-r--r--user_guide/general/models.html2
-rw-r--r--user_guide/general/plugins.html2
-rw-r--r--user_guide/general/profiling.html2
-rw-r--r--user_guide/general/quick_reference.html5
-rw-r--r--user_guide/general/requirements.html3
-rw-r--r--user_guide/general/routing.html4
-rw-r--r--user_guide/general/scaffolding.html4
-rw-r--r--user_guide/general/security.html2
-rw-r--r--user_guide/general/urls.html6
-rw-r--r--user_guide/general/views.html62
24 files changed, 71 insertions, 78 deletions
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index 2b088919e..7498587ca 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -144,7 +144,7 @@ Previous Topic:&nbsp;&nbsp;<a href="managing_apps.html">Managing Applications</a
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="security.html">Security</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index f6ae7ffa9..58f2b06a7 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -114,7 +114,7 @@ Previous Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Core Libra
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index f3d474f2e..39a0ce657 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -97,7 +97,7 @@ Previous Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks - Extending the Core</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="scaffolding.html">Scaffolding</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index 8756f7c1d..a881f2d42 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -63,11 +63,11 @@ Page Caching
<h1>Web Page Caching</h1>
-<p>CodeIgniter lets you cache your pages in order to achieve maximum performance.
+<p>CodeIgniter lets you cache your pages in order to achieve maximum performance.</p>
-Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the
+<p>Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the
server resources, memory, and processing cycles utilized, which affect your page load speeds.
-By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.
+By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.</p>
<h2>How Does Caching Work?</h2>
@@ -111,7 +111,7 @@ Previous Topic:&nbsp;&nbsp;<a href="errors.html">Error Handling</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="profiling.html">Profiling Your Application</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index c61660d34..5d83edcd6 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -121,7 +121,7 @@ class Blog extends Controller {
<p>If you did it right, you should see <samp>Hello World!</samp>.</p>
-<p>Note: Class names must start with an uppercase letter. In other words, this is valid:
+<p>Note: Class names must start with an uppercase letter. In other words, this is valid:</p>
<code>&lt;?php<br />
class <var>Blog</var> extends Controller {<br />
@@ -182,7 +182,7 @@ class Blog extends Controller {
<p>If your URI contains more then two segments they will be passed to your function as parameters.</p>
-<p>For example, lets say you have a URI like this:
+<p>For example, lets say you have a URI like this:</p>
<code>www.your-site.com/index.php/<var>products</var>/<samp>shoes</samp>/<kbd>sandals</kbd>/<dfn>123</dfn></code>
@@ -258,7 +258,7 @@ allowing you to define your own function routing rules.</p>
<p>CodeIgniter has an output class that takes care of sending your final rendered data to the web browser automatically. More information on this can be found in the
<a href="views.html">Views</a> and <a href="../libraries/output.html">Output class</a> pages. In some cases, however, you might want to
post-process the finalized data in some way and send it to the browser yourself. CodeIgniter permits you to
-add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.
+add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.</p>
<p><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_output()</kbd>, it will <strong>always</strong>
be called by the output class instead of echoing the finalized data directly. The first parameter of the function will contain the finalized output.</p>
@@ -317,12 +317,10 @@ called if the URL contains only the sub-folder. Simply name your default contro
<dfn>application/config/routes.php</dfn> file</p>
-<p>CodeIgniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.
+<p>CodeIgniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.</p>
-
-<a name="constructors"></a>
-<h2>Class Constructors</h2>
+<h2><a name="constructors"></a>Class Constructors</h2>
<p>If you intend to use a constructor in any of your Controllers, you <strong>MUST</strong> place the following line of code in it:</p>
@@ -426,8 +424,7 @@ Previous Topic:&nbsp;&nbsp;<a href="urls.html">CodeIgniter URLs</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="views.html">Views</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 2b476e58b..fa467cb2b 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -166,7 +166,7 @@ Previous Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Your Own L
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks - Extending the Core</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 020f7bed5..b3eaf3d7f 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -68,7 +68,7 @@ your own libraries within your <dfn>application/libraries</dfn> directory in ord
and the global framework resources.</p>
<p>As an added bonus, CodeIgniter permits your libraries to <kbd>extend</kbd> native classes if you simply need to add some functionality
-to an existing library. Or you can even replace native libraries just by placing identically named versions in your <dfn>application/libraries</dfn> folder.
+to an existing library. Or you can even replace native libraries just by placing identically named versions in your <dfn>application/libraries</dfn> folder.</p>
<p>In summary:</p>
@@ -266,7 +266,7 @@ to load the example above, which extends the Email class, you will use:</p>
<code>$this->load->library('<kbd>email</kbd>');</code>
<p>Once loaded you will use the class variable as you normally would for the class you are extending. In the case of
-the email class all calls will use:
+the email class all calls will use:</p>
<code>$this-><kbd>email</kbd>->some_function();</code>
@@ -293,7 +293,7 @@ Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using CodeIgniter Libraries<
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="core_classes.html">Creating Core System Classes</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 9ac1618da..97aef01b2 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -87,8 +87,7 @@ Previous Topic:&nbsp;&nbsp;<a href="changelog.html">Change Log</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="../installation/downloads.html">Downloading CodeIgniter</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index 650008114..d78dd4947 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -134,7 +134,7 @@ Previous Topic:&nbsp;&nbsp;<a href="routing.html">URI Routing</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="caching.html">Page Caching</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index 0aba208aa..a91c8c21f 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -138,7 +138,7 @@ Previous Topic:&nbsp;&nbsp;<a href="models.html">Models</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="plugins.html">Plugins</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index c864c1edb..0776e32c8 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -104,7 +104,7 @@ The following items should be defined in your associative hook array:</p>
<h2>Multiple Calls to the Same Hook</h2>
-<p>If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:
+<p>If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:</p>
<code>
$hook['pre_controller']<kbd>[]</kbd> = array(<br />
@@ -185,7 +185,7 @@ Previous Topic:&nbsp;&nbsp;<a href="core_classes.html">Creating Core Classes</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/index.html b/user_guide/general/index.html
index bf9b4ddc6..2d5148b32 100644
--- a/user_guide/general/index.html
+++ b/user_guide/general/index.html
@@ -91,7 +91,7 @@ Previous Topic:&nbsp;&nbsp;<a href="../overview/goals.html">Architectural Goals<
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="urls.html">CodeIgniter URLs</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index 38c9987bb..4efd5eefe 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -91,7 +91,7 @@ Previous Topic:&nbsp;&nbsp;<a href="plugins.html">Plugins</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Libraries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html
index 103127fb9..836f0c86f 100644
--- a/user_guide/general/managing_apps.html
+++ b/user_guide/general/managing_apps.html
@@ -89,7 +89,7 @@ put all of the directories located inside your <kbd>application</kbd> folder int
own sub-folder.</p>
<p>For example, let's say you want to create two applications, "foo" and "bar". You will structure your
-application folder like this:
+application folder like this:</p>
<code>system/application/<var>foo</var>/<br />
system/application/<var>foo</var>/config/<br />
@@ -130,8 +130,7 @@ Previous Topic:&nbsp;&nbsp;<a href="profiling.html">Profiling Your Application</
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="alternative_php.html">Alternative PHP Syntax</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index c1832cca6..6758ceb86 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -251,7 +251,7 @@ Previous Topic:&nbsp;&nbsp;<a href="views.html">Views</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="helpers.html">Helpers</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
index ef299aa1b..2fde9272e 100644
--- a/user_guide/general/plugins.html
+++ b/user_guide/general/plugins.html
@@ -124,7 +124,7 @@ Previous Topic:&nbsp;&nbsp;<a href="helpers.html">Helpers</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="libraries.html">Using Libraries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 719501338..a73f00987 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -111,7 +111,7 @@ Previous Topic:&nbsp;&nbsp;<a href="caching.html">Caching</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="managing_apps.html">Managing Applications</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index 963f6b051..9680cbd55 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -62,7 +62,7 @@ Quick Reference Chart
<h1>Quick Reference Chart</h1>
-<p>For a PDF version of this chart, <a href="http://www.codeigniter.com/downloads/ci_quick_ref.pdf">click here</a>.
+<p>For a PDF version of this chart, <a href="http://www.codeigniter.com/downloads/ci_quick_ref.pdf">click here</a>.</p>
<p><img src="../images/ci_quick_ref.png" width="763" height="994" border="0" /></p>
@@ -74,8 +74,7 @@ Quick Reference Chart
<p>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index e92b51960..1aa0d78a1 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -79,8 +79,7 @@ Server Requirements
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="../license.html">License Agreement</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index c4af428a0..2cd0d2f49 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -86,7 +86,7 @@ To overcome this, CodeIgniter allows you to remap the URI handler.</p>
<h2>Setting your own routing rules</h2>
<p>Routing rules are defined in your <var>application/config/routes.php</var> file. In it you'll see an array called <dfn>$route</dfn> that
-permits you to specify your own routing criteria. Routes can either be specified using <dfn>wildcards</dfn> or <dfn>Regular Expressions</dnf>
+permits you to specify your own routing criteria. Routes can either be specified using <dfn>wildcards</dfn> or <dfn>Regular Expressions</dfn></p>
<h2>Wildcards</h2>
@@ -172,7 +172,7 @@ Previous Topic:&nbsp;&nbsp;<a href="scaffolding.html">Scaffolding</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="errors.html">Error Handling</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index 4f23d3fed..125732e87 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -116,7 +116,7 @@ class Blog extends Controller {<br />
<p>Where <kbd>table_name</kbd> is the name of the table (table, not database) you wish to work with.</p>
-<p>Once you've initialized scaffolding, you will access it with this URL prototype:
+<p>Once you've initialized scaffolding, you will access it with this URL prototype:</p>
<code>www.your-site.com/index.php/<var>class</var>/<dfn>secret_word</dfn>/</code>
@@ -145,7 +145,7 @@ Previous Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="routing.html">URI Routing</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index fdba2dfc9..24bfe1c46 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -151,7 +151,7 @@ Previous Topic:&nbsp;&nbsp;<a href="alternative_php.html">Alternative PHP</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="../libraries/benchmark.html">Benchmarking Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index 4df37eebc..21031affb 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -90,7 +90,7 @@ contain functions that make it easy to work with your URI data. In addition, yo
<h2>Removing the index.php file</h2>
-<p>By default, the <strong>index.php</strong> file will be included in your URLs:
+<p>By default, the <strong>index.php</strong> file will be included in your URLs:</p>
<code>www.your-site.com/<var>index.php</var>/news/article/my_article</code>
@@ -108,7 +108,7 @@ a request for your index.php file.</p>
<h2>Adding a URL Suffix</h2>
<p>In your <dfn>config/config.php</dfn> file you can specify a suffix that will be added to all URLs generated
-by CodeIgniter. For example, if a URL is this:
+by CodeIgniter. For example, if a URL is this:</p>
<code>www.your-site.com/index.php/products/view/shoes</code>
@@ -151,7 +151,7 @@ Previous Topic:&nbsp;&nbsp;<a href="index.html">Getting Started</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="controllers.html">Controllers</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 8adfc6736..737146dbb 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -77,14 +77,14 @@ you should do so before continuing.</p>
<p>Using your text editor, create a file called <dfn>blogview.php</dfn>, and put this in it:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="10">
-<html>
-<head>
-<title>My Blog</title>
-</head>
-<body>
- <h1>Welcome to my Blog!</h1>
-</body>
-</html>
+&lt;html>
+&lt;head>
+&lt;title>My Blog&lt;/title>
+&lt;/head>
+&lt;body>
+ &lt;h1>Welcome to my Blog!&lt;/h1>
+&lt;/body>
+&lt;/html>
</textarea>
<p>Then save the file in your <dfn>application/views/</dfn> folder.</p>
@@ -169,14 +169,14 @@ class Blog extends Controller {
<textarea class="textarea" style="width:100%" cols="50" rows="10">
-<html>
-<head>
-<title><?=$title;?></title>
-</head>
-<body>
- <h1><?=$heading;?></h1>
-</body>
-</html>
+&lt;html>
+&lt;head>
+&lt;title>&lt;?php echo $title;?>&lt;/title>
+&lt;/head>
+&lt;body>
+ &lt;h1>&lt;?php echo $heading;?>&lt;/h1>
+&lt;/body>
+&lt;/html>
</textarea>
<p>Then load the page at the URL you've been using and you should see the variables replaced.</p>
@@ -214,26 +214,26 @@ class Blog extends Controller {
<textarea class="textarea" style="width:100%" cols="50" rows="24">
-<html>
-<head>
-<title><?=$title;?></title>
-</head>
-<body>
-<h1><?=$heading;?></h1>
+&lt;html>
+&lt;head>
+&lt;title>&lt;?=$title;?>&lt;/title>
+&lt;/head>
+&lt;body>
+&lt;h1>&lt;?=$heading;?>&lt;/h1>
-<h3>My Todo List</h3>
+&lt;h3>My Todo List&lt;/h3>
-<ul>
-<?php foreach($todo_list as $item):?>
+&lt;ul>
+&lt;?php foreach($todo_list as $item):?>
-<li><?=$item;?></li>
+&lt;li>&lt;?=$item;?>&lt;/li>
-<?php endforeach;?>
-</ul>
+&lt;?php endforeach;?>
+&lt;/ul>
-</body>
-</html>
+&lt;/body>
+&lt;/html>
</textarea>
@@ -249,7 +249,7 @@ Previous Topic:&nbsp;&nbsp;<a href="controllers.html">Controllers</a>
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
Next Topic:&nbsp;&nbsp;<a href="models.html">Models</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>