summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-01-13 14:04:13 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-01-13 14:04:13 +0100
commitb298374c1628f2768da0fc98308adb9ac761e854 (patch)
treecff361d24734b428041133515c990e1c4d48b3c1
parenta0f980e361d3025b8d34e7cbe3b747460de80dea (diff)
parentf85a4b897b9dfce3de315f307f6fe07606b95131 (diff)
Automated merge with ssh://hg@bitbucket.org/dallard/codeigniter-reactor
-rw-r--r--user_guide/database/active_record.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 065db4913..9ae93a9ae 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -736,7 +736,7 @@ $this-&gt;db-&gt;get('tablename');<br />
<br />
//Generates: SELECT `field2` FROM (`tablename`)</code></p>
-<p class="important"> <strong>Note:</strong> The following statements can be cached: select, from, join, where, like, groupby, having, orderby, set</p>
+<p class="important"> <strong>Note:</strong> The following statements can be cached: select, from, join, where, like, group_by, having, order_by, set</p>
<p>&nbsp;</p>
</div>
<!-- END CONTENT -->