6 files changed, 23 insertions, 15 deletions

diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 5492ddb4c..8f18a32c4 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -601,7 +601,7 @@ Previous Topic:&nbsp;&nbsp;<a href="results.html">Query Results</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <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="fields.html">Field Metadata</a>

+Next Topic:&nbsp;&nbsp;<a href="transactions.html">Transactions</a>

 <p>

 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>

 </div>

diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index e5584e9ef..6b52cfc14 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -114,7 +114,7 @@ Previous Topic:&nbsp;&nbsp;<a href="fields.html">Field MetaData</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <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="../email.html">Email Class</a>

+Next Topic:&nbsp;&nbsp;<a href="utilities.html">Utilities Class</a>

 <p>

 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>

 </div>

diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index ecb6fcb45..290a7ec4f 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -149,11 +149,11 @@ $fields = $query->field_data();
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="results.html">Query Results</a>

+Previous Topic:&nbsp;&nbsp;<a href="transactions.html">Transactions</a>

 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <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="table_data.html">Table MetaData</a>

+Next Topic:&nbsp;&nbsp;<a href="call_function.html">Custom Function Calls</a>

 <p>

 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>

 </div>

diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index 204116696..1d1fb37ad 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -76,13 +76,18 @@ Query Helpers
 correct number of affected rows.  By default this hack is enabled but it can be turned off in the database driver file.</p>

 

 

+<h2>$this->db->platform()</h2>

+<p>Outputs the database platform you are running (MySQL, MS SQL, Postgre, etc...):</p>

+<code>echo $this->db->platform();</code>

+

+

 <h2>$this->db->version()</h2>

 <p>Outputs the database version you are running:</p>

-

 <code>echo $this->db->version();</code>

 

-<h2>$this->db->last_query();</h2>

 

+

+<h2>$this->db->last_query();</h2>

 <p>Returns the last query that was run (the query string, not the result).  Example:</p>

 

 <code>$str = $this->db->last_query();<br />

diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index 0344d0258..2aba1dda1 100644
--- a/user_guide/database/index.html
+++ b/user_guide/database/index.html
@@ -77,8 +77,8 @@ structures and Active Record patterns. The database functions offer clear, simpl
 		<li><a href="active_record.html">Active Record Class</a></li>

 		<li><a href="transactions.html">Transactions</a></li>

 		<li><a href="fields.html">Field MetaData</a></li>

-		<li><a href="table_data.html">Table MetaData</a></li>

 		<li><a href="call_function.html">Custom Function Calls</a></li>

+		<li><a href="utilities.html">Database Utilities Class</a></li>

 	</ul>

 	

 

@@ -88,7 +88,7 @@ structures and Active Record patterns. The database functions offer clear, simpl
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="../config.html">Config Class</a>

+Previous Topic:&nbsp;&nbsp;<a href="../libraries/config.html">Config Class</a>

 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <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;

diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index 649e4081f..2294afad7 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -79,9 +79,11 @@ have a basic understanding of transactions.  For most sites, however, transactio
 <p>Code Igniter utilizes an approach to transactions that is very similar to the process used by the popular database class ADODB.  We've chosen that approach

 because it greatly simplifies the process of running transactions.  In most cases all that is required are two lines of code.</p>

 

-<p>Traditionally transactions have required a fair amount of work to implement since they demand that you to keep track of your queries

-and determine whether to <dfn>commit</dfn> or <dfn>rollback</dfn> based on the success or failure of your queries. In contrast,

-we've implemented a smart transaction system that does all this for you automatically (you can also manage your transactions manually if you choose to).</p>

+<p>Traditionally, transactions have required a fair amount of work to implement since they demand that you to keep track of your queries

+and determine whether to <dfn>commit</dfn> or <dfn>rollback</dfn> based on the success or failure of your queries. This is particularly cumbersome with 

+nested queries. In contrast,

+we've implemented a smart transaction system that does all this for you automatically (you can also manage your transactions manually if you choose to,

+but there's really no benefit).</p>

 

 <h2>Running Transactions</h2>

 

@@ -95,7 +97,8 @@ $this->db->query('AND YET ANOTHER QUERY...');<br />
 <kbd>$this->db->trans_complete();</kbd>

 </code>

 

-<p>You can run as many queries as you want between the start/complete functions and they will all be committed or rolled back based on success or failure.</p>

+<p>You can run as many queries as you want between the start/complete functions and they will all be committed or rolled back based on success or failure

+of any given query.</p>

 

 

 <h2>Managing Errors</h2>

@@ -111,7 +114,7 @@ $this->db->trans_complete();<br />
 <br />

 if (<kbd>$this->db->trans_status()</kbd> === FALSE)<br />

 {<br />

-&nbsp;&nbsp;&nbsp;&nbsp;// generate an error....<br />

+&nbsp;&nbsp;&nbsp;&nbsp;// generate an error... or use the log_message() function to log your error<br />

 }

 </code>

 

@@ -183,11 +186,11 @@ else<br />
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="index.html">Database Class</a>

+Previous Topic:&nbsp;&nbsp;<a href="active_record.html">Active Record</a>

 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <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="configuration.html">Database Configuration</a>

+Next Topic:&nbsp;&nbsp;<a href="fields.html">Field Metadata</a>

 <p>

 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>

 </div>