From 27ed2cca1bf7f2fca6a03a434624e43a02501d3f Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 17 Jan 2010 23:58:01 +0000
Subject: user guide clarification on large image processing

---
 user_guide/changelog.html           | 2 +-
 user_guide/libraries/image_lib.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index bd45f69ed..be021771c 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -102,7 +102,7 @@ SVN Revision: </p>
 
 <h3>Bug fixes for 1.7.3</h3>
 <ul>
-	<li>Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883, #6771).</li>
+	<li>Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883, #6771, #10656).</li>
 	<li>Increased randomness with <kbd>is_really_writable()</kbd> to avoid file collisions when hundreds or thousands of requests occur at once.</li>
 	<li>Fixed or clarified assorted user guide typos or examples.</li>
 	<li>Made <kbd>get_mime_by_extension()</kbd> case insensitive.</li>
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
index b6a34472d..0baad8c4f 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -112,6 +112,7 @@ Since the <dfn>maintain_ratio</dfn> option is enabled, the thumb will be as clos
 <p class="important"><strong>Note:</strong> In order for the image class to be allowed to do any processing, the
 folder containing the image files must have write permissions.</p>
 
+<p class="important"><strong>Note:</strong> Image processing can require a considerable amount of server memory for some operations. If you are experiencing out of memory errors while processing images you may need to limit their maximum size, and/or adjust PHP memory limits.</p>
 
 <h2>Processing Functions</h2>
 
-- 
cgit v1.2.3-24-g4f1b