Merged tip.

1 files changed, 18 insertions, 18 deletions

diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index 4a18cbd64..76a91216d 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 2.0.1</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -62,7 +62,7 @@ Database Caching Class
 <p>The Database Caching Class permits you to cache your queries as text files for reduced database load.</p>
 
 <p class="important"><strong>Important:</strong>&nbsp; This class is initialized automatically by the database driver
-when caching is enabled.  Do NOT load this class manually.<br /><br />
+when caching is enabled. Do NOT load this class manually.<br /><br />
 
 <strong>Also note:</strong>&nbsp; Not all query result functions are available when you use caching. Please read this page carefully.</p>
 
@@ -84,12 +84,12 @@ when caching is enabled.  Do NOT load this class manually.<br /><br />
 <p>CodeIgniter's query caching system happens dynamically when your pages are viewed.
 When caching is enabled, the first time a web page is loaded, the query result object will
 be serialized and stored in a text file on your server. The next time the page is loaded the cache file will be used instead of
-accessing your database.  Your database usage can effectively be reduced to zero for any pages that have been cached.</p>
+accessing your database. Your database usage can effectively be reduced to zero for any pages that have been cached.</p>
 
 <p>Only <dfn>read-type</dfn> (SELECT) queries can be cached, since these are the only type of queries that produce a result.
 <dfn>Write-type</dfn> (INSERT, UPDATE, etc.) queries, since they don't generate a result, will not be cached by the system.</p>
 
-<p>Cache files DO NOT expire.  Any queries that have been cached will remain cached until you delete them.  The caching system
+<p>Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system
 permits you clear caches associated with individual pages, or you can delete the entire collection of cache files.
 Typically you'll want to use the housekeeping functions described below to delete cache files after certain
 events take place, like when you've added new information to your database.</p>
@@ -99,33 +99,33 @@ events take place, like when you've added new information to your database.</p>
 <p>Getting a performance gain as a result of caching depends on many factors.
 If you have a highly optimized database under very little load, you probably won't see a performance boost.
 If your database is under heavy use you probably will see an improved response, assuming your file-system is not
-overly taxed.  Remember that caching simply changes how your information is retrieved, shifting it from being a database
+overly taxed. Remember that caching simply changes how your information is retrieved, shifting it from being a database
 operation to a file-system one.</p>
 
 <p>In some clustered server environments, for example, caching may be detrimental since file-system operations are so intense.
 On single servers in shared environments, caching will probably be beneficial. Unfortunately there is no
-single answer to the question of whether you should cache your database.  It really depends on your situation.</p>
+single answer to the question of whether you should cache your database. It really depends on your situation.</p>
 
 <h2>How are Cache Files Stored?</h2>
 
-<p>CodeIgniter places the result of EACH query into its own cache file.  Sets of cache files are further organized into
-sub-folders corresponding to your controller functions.  To be precise, the sub-folders are named identically to the
+<p>CodeIgniter places the result of EACH query into its own cache file. Sets of cache files are further organized into
+sub-folders corresponding to your controller functions. To be precise, the sub-folders are named identically to the
 first two segments of your URI (the controller class name and function name).</p>
 
 <p>For example, let's say you have a controller called <dfn>blog</dfn> with a function called <dfn>comments</dfn> that
-contains three queries.  The caching system will create a cache folder
+contains three queries. The caching system will create a cache folder
 called <kbd>blog+comments</kbd>, into which it will write three cache files.</p>
 
 <p>If you use dynamic queries that change based on information in your URI (when using pagination, for example), each instance of
-the query will produce its own cache file.  It's possible, therefore, to end up with many times more cache files than you have
+the query will produce its own cache file. It's possible, therefore, to end up with many times more cache files than you have
 queries.</p>
 
 
 <h2>Managing your Cache Files</h2>
 
-<p>Since cache files do not expire, you'll need to build deletion routines into your application.  For example, let's say you have a blog
-that allows user commenting.  Whenever a new comment is submitted you'll want to delete the cache files associated with the
-controller function that serves up your comments.  You'll find two delete functions described below that help you
+<p>Since cache files do not expire, you'll need to build deletion routines into your application. For example, let's say you have a blog
+that allows user commenting. Whenever a new comment is submitted you'll want to delete the cache files associated with the
+controller function that serves up your comments. You'll find two delete functions described below that help you
 clear data.</p>
 
 
@@ -155,8 +155,8 @@ pertain to run-time operations.</p>
 
 <h2>$this->db->cache_on()&nbsp; / &nbsp; $this->db->cache_off()</h2>
 
-<p>Manually enables/disables caching.  This can be useful if you want to
-keep certain queries from being cached.  Example:</p>
+<p>Manually enables/disables caching. This can be useful if you want to
+keep certain queries from being cached. Example:</p>
 
 <code>
 // Turn caching on<br />
@@ -177,9 +177,9 @@ $query = $this->db->query("SELECT * FROM another_table");
 
 <p>Deletes the cache files associated with a particular page. This is useful if you need to clear caching after you update your database.</p>
 
-<p>The caching system saves your cache files to folders that correspond to the URI of the page you are viewing.  For example, if you are viewing
+<p>The caching system saves your cache files to folders that correspond to the URI of the page you are viewing. For example, if you are viewing
 a page at <dfn>example.com/index.php/blog/comments</dfn>, the caching system will put all cache files associated with it in a folder
-called <dfn>blog+comments</dfn>.  To delete those particular cache files you will use:</p>
+called <dfn>blog+comments</dfn>. To delete those particular cache files you will use:</p>
 
 <code>$this->db->cache_delete('blog', 'comments');</code>
 
@@ -188,7 +188,7 @@ called <dfn>blog+comments</dfn>.  To delete those particular cache files you wil
 
 <h2>$this->db->cache_delete_all()</h2>
 
-<p>Clears all existing cache files.  Example:</p>
+<p>Clears all existing cache files. Example:</p>
 
 <code>$this->db->cache_delete_all();</code>