6 files changed, 17 insertions, 17 deletions
diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index 7b4ed9b3..6ae95ab3 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -563,7 +563,7 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 	}
 
 	/**
-	 * Resolves the requested servie.
+	 * Resolves the requested service.
 	 * This method implements a URL-based service resolution.
 	 * A URL in the format of /index.php?sp=serviceID.serviceParameter
 	 * will be resolved with the serviceID and the serviceParameter.
@@ -815,7 +815,7 @@ class THttpCookieCollection extends TList
 	 * Inserts an item at the specified position.
 	 * This overrides the parent implementation by performing additional
 	 * operations for each newly added THttpCookie object.
-	 * @param integer the speicified position.
+	 * @param integer the specified position.
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 624b24be..d6469bea 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -491,7 +491,7 @@ class THttpResponse extends TModule implements ITextWriter
 	}
 
 	/**
-	 * Create a new html writer intance.
+	 * Create a new html writer instance.
 	 * This method is used internally. Please use {@link createHtmlWriter} instead.
 	 * @param string type of HTML writer to be created.
 	 * @param ITextWriter text writer holding the contents.
diff --git a/framework/Web/THttpResponseAdapter.php b/framework/Web/THttpResponseAdapter.php
index 8a1c86bb..a521bd21 100644
--- a/framework/Web/THttpResponseAdapter.php
+++ b/framework/Web/THttpResponseAdapter.php
@@ -13,8 +13,8 @@
 /**
  * THttpResponseAdapter class.
  *
- * THttpResponseAdapter allows the base http response class to change behaviour
- * without change the class hierachy.
+ * THttpResponseAdapter allows the base http response class to change behavior
+ * without change the class hierarchy.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Id$
diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php
index 233cd5d2..b9faea74 100644
--- a/framework/Web/THttpSession.php
+++ b/framework/Web/THttpSession.php
@@ -400,7 +400,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session open handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @param string session save path
 	 * @param string session name
 	 * @return boolean whether session is opened successfully
@@ -412,7 +412,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session close handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @return boolean whether session is closed successfully
 	 */
 	public function _close()
@@ -422,7 +422,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session read handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @param string session ID
 	 * @return string the session data
 	 */
@@ -433,7 +433,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session write handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @param string session ID
 	 * @param string session data
 	 * @return boolean whether session write is successful
@@ -445,7 +445,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session destroy handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @param string session ID
 	 * @return boolean whether session is destroyed successfully
 	 */
@@ -456,7 +456,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 
 	/**
 	 * Session GC (garbage collection) handler.
-	 * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
+	 * This method should be overridden if {@link setUseCustomStorage UseCustomStorage} is set true.
 	 * @param integer the number of seconds after which data will be seen as 'garbage' and cleaned up.
 	 * @return boolean whether session is GCed successfully
 	 */
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 33f01340..5c04ea8e 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -205,7 +205,7 @@ class TUrlMapping extends TUrlManager
  *
  * The {@link setPattern Pattern} property takes an string expression with
  * parameter names enclosed between a left brace '{' and a right brace '}'.
- * The pattens for each parameter can be set using {@link getParameters Parameters}
+ * The patterns for each parameter can be set using {@link getParameters Parameters}
  * attribute collection. For example
  * <code>
  * <url ... pattern="articles/{year}/{month}/{day}"
@@ -301,7 +301,7 @@ class TUrlMappingPattern extends TComponent
 	}
 
 	/**
-	 * Subsitutue the parameter key value pairs as named groupings
+	 * Substitute the parameter key value pairs as named groupings
 	 * in the regular expression matching pattern.
 	 * @return string regular expression pattern with parameter subsitution
 	 */
@@ -330,7 +330,7 @@ class TUrlMappingPattern extends TComponent
 	}
 
 	/**
-	 * @param string full regular expression mapping patern.
+	 * @param string full regular expression mapping pattern.
 	 */
 	public function setRegularExpression($value)
 	{
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 4fded17b..817127f0 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -52,11 +52,11 @@ class TClientScriptManager extends TApplicationComponent
 	 */
 	private $_scriptFiles=array();
 	/**
-	 * @var array javascript files to be renderd in page head section
+	 * @var array javascript files to be rendered in page head section
 	 */
 	private $_headScriptFiles=array();
 	/**
-	 * @var array javascript blocks to be renderd in page head section
+	 * @var array javascript blocks to be rendered in page head section
 	 */
 	private $_headScripts=array();
 	/**
@@ -99,7 +99,7 @@ class TClientScriptManager extends TApplicationComponent
 	}
 
 	/**
-	 * Registers a prado javascript library to be loaded.
+	 * Registers a Prado javascript library to be loaded.
 	 */
 	private function registerPradoScriptInternal($name)
 	{