summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-06-15 19:23:48 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-06-15 19:23:48 +0200
commit810d5015dd535098cef3f7c16d997374d0d431ac (patch)
tree071c0dbbda5af6914e7143ba911e3595d418f436 /user_guide
parent1249107af8bad0434b310bda51d2de0a429a366c (diff)
userguide typo fix
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html2
-rw-r--r--user_guide/database/active_record.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d004da640..a75e71ca1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -103,7 +103,7 @@ SVN Revision: not currently released</p>
<li>Fixed a bug (#4561) where <kbd>orhaving()</kbd> wasn't properly passing values.</li>
<li>Removed some unused variables from the code (#4563).</li>
<li>Fixed a bug where <kbd>having()</kbd> was not adding an = into the statement (#4568).</li>
- <li>Fixed assorted user guide typos or examples (#4574).</li>
+ <li>Fixed assorted user guide typos or examples (#4574, #4706).</li>
<li>Added quoted-printable headers to Email class when the multi-part override is used.</li>
</ul>
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 1a3c9b6e2..aaee21e97 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -699,7 +699,7 @@ $query = $this->db->get();</code>
<h1><a name="caching">&nbsp;</a>Active Record Caching</h1>
<p>While not &quot;true&quot; caching, Active Record enables you to save (or &quot;cache&quot;) certain parts of your queries for reuse later. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.</p>
-<p>Cached calls are cumulative.  If you makes 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:</p>
+<p>Cached calls are cumulative.  If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:</p>
<h2>$this-&gt;db-&gt;start_cache()</h2>
<p>This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.</p>
<h2>$this-&gt;db-&gt;stop_cache()</h2>