commit 5025929d76172efd6dd3a7b0f4da7611a3df9391
author Phil Sturgeon <email@philsturgeon.co.uk> Fri Jul 15 15:25:15 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:18:39 2011 -0600
tree 0bdc47fdbdd520ac5f2cb6bb156f1d9c3974b9b7
parent 26b9ae2f500da7658074619af9c6dd982b77d0b8

Fixed conflicted changelog.

user_guide/database/queries.html

diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index f9f9680..4c1ddfe 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -80,11 +80,16 @@
 It simply lets you submit a query. Most users will rarely use this function.</p>
 
 
-<h1>Adding Database prefixes manually</h1>
-<p>If you have configured a database prefix and would like to add it in manually for, you can use the following.</p>
+<h1>Working with Database prefixes manually</h1>
+<p>If you have configured a database prefix and would like to prepend it to a table name for use in a native SQL query for example, then you can use the following:</p>
 <p><code>$this-&gt;db-&gt;dbprefix('tablename');<br />
 // outputs prefix_tablename</code></p>
 
+<p>If for any reason you would like to change the prefix programatically without needing to create a new connection, you can use this method:</p>
+<p><code>$this-&gt;db-&gt;set_dbprefix('newprefix');<br /><br />
+$this-&gt;db-&gt;dbprefix('tablename');<br />
+// outputs newprefix_tablename</code></p>
+
 
 <h1>Protecting identifiers</h1>
 <p>In many databases it is advisable to protect table and field names - for example with backticks in MySQL. <strong>Active Record queries are automatically protected</strong>, however if you need to manually protect an identifier you can use:</p>