From 348fb25264f6cc9251f5ae9cb8c7a8a1013e2d67 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 13 Sep 2006 12:37:23 +0000
Subject: Merge from 3.0 branch till 1409.

---
 framework/Web/THttpResponse.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'framework/Web/THttpResponse.php')

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 90d2c0ef..ad935103 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -32,13 +32,15 @@ Prado::using('System.Web.THttpResponseAdapter');
  * By default, THttpResponse is registered with {@link TApplication} as the
  * response module. It can be accessed via {@link TApplication::getResponse()}.
  *
- * THttpRequest may be configured in application configuration file as follows
+ * THttpResponse may be configured in application configuration file as follows
+ *
  * <module id="response" CacheExpire="20" CacheControl="nocache" BufferOutput="true" />
+ *
  * where {@link getCacheExpire CacheExpire}, {@link getCacheControl CacheControl}
- * and {@link getBufferOutput BufferOutput} are configurable properties of THttpResponse.
+ * and {@link getBufferOutput BufferOutput} are optional properties of THttpResponse.
  *
- * When sending headers the Charset set in {@link TGlobalization::getCharset()}
- * is use when Charset is null or empty in THttpResponse.
+ * THttpResponse sends charset header if either {@link setCharset() Charset}
+ * or {@link TGlobalization::setCharset() TGlobalization.Charset} is set.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Id$
-- 
cgit v1.2.3