diff --git a/docs/api/db/ActiveRecord.md b/docs/api/db/ActiveRecord.md
index 70f171b..ef050d0 100644
--- a/docs/api/db/ActiveRecord.md
+++ b/docs/api/db/ActiveRecord.md
@@ -1,6 +1,6 @@
 ActiveRecord implements the [Active Record design pattern](http://en.wikipedia.org/wiki/Active_record).
 The idea is that an ActiveRecord object is associated with a row in a database table
-so object properties are mapped to colums of the corresponding database row.
+so object properties are mapped to columns of the corresponding database row.
 For example, a `Customer` object is associated with a row in the `tbl_customer`
 table. Instead of writing raw SQL statements to access the data in the table,
 you can call intuitive methods available in the corresponding ActiveRecord class
diff --git a/docs/guide/authorization.md b/docs/guide/authorization.md
index 47b9409..b49f1af 100644
--- a/docs/guide/authorization.md
+++ b/docs/guide/authorization.md
@@ -7,7 +7,7 @@ of controlling it.
 Access control basics
 ---------------------
 
-Basic acces control is very simple to implement using [[\yii\web\AccessControl]]:
+Basic access control is very simple to implement using [[\yii\web\AccessControl]]:
 
 ```php
 class SiteController extends Controller
diff --git a/docs/guide/i18n.md b/docs/guide/i18n.md
index 33f7758..6524801 100644
--- a/docs/guide/i18n.md
+++ b/docs/guide/i18n.md
@@ -121,7 +121,7 @@ extension. After installing and enabling it you will be able to use extended syn
 that allows you to specify formatting style.
 
 Full reference is [available at ICU website](http://icu-project.org/apiref/icu4c/classMessageFormat.html) but since it's
-a bit crypric we have our own reference below.
+a bit cryptic we have our own reference below.
 
 ### Numbers
 
diff --git a/docs/guide/query-builder.md b/docs/guide/query-builder.md
index ffc9871..7625c0b 100644
--- a/docs/guide/query-builder.md
+++ b/docs/guide/query-builder.md
@@ -45,7 +45,7 @@ $query->select(['tbl_user.name AS author', 'tbl_post.title as title']) // <-- sp
 	->leftJoin('tbl_post', 'tbl_post.user_id = tbl_user.id'); // <-- join with another table
 ```
 
-In the code above we've used `leftJoin` method to select from two related tables at the same time. Firsrt parameter
+In the code above we've used `leftJoin` method to select from two related tables at the same time. First parameter
 specifies table name and the second is the join condition. Query builder has the following methods to join tables:
 
 - `innerJoin`
diff --git a/docs/guide/validation.md b/docs/guide/validation.md
index c8c8674..59242f5 100644
--- a/docs/guide/validation.md
+++ b/docs/guide/validation.md
@@ -8,7 +8,7 @@ Standard Yii validators
 -----------------------
 
 Standard Yii validators could be specified using aliases instead of referring to class names. Here's the list of all
-validators budled with Yii with their most useful properties:
+validators bundled with Yii with their most useful properties:
 
 ### `boolean`: [[BooleanValidator]]
 
diff --git a/docs/guide/view.md b/docs/guide/view.md
index ee469e6..1069e89 100644
--- a/docs/guide/view.md
+++ b/docs/guide/view.md
@@ -38,7 +38,7 @@ Widgets
 
 Widgets are a self-contained building blocks for your views. A widget may contain advanced logic, typically takes some
 configuration and data and returns HTML. There is a good number of widgets bundled with Yii such as [active form](form.md),
-breadcrumbs, menu or [wrappers around bootstrap component framework](boostrap-widgets.md). Additionally there are
+breadcrumbs, menu or [wrappers around bootstrap component framework](bootstrap-widgets.md). Additionally there are
 extensions providing additional widgets such as official one for jQueryUI components.
 
 In order to use widget you need to do the following:
diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php
index 4bc5351..b3e28f6 100644
--- a/framework/yii/base/Module.php
+++ b/framework/yii/base/Module.php
@@ -241,7 +241,7 @@ abstract class Module extends Component
 	 * Sets the directory that contains the controller classes.
 	 * @param string $path the directory that contains the controller classes.
 	 * This can be either a directory name or a path alias.
-	 * @throws Exception if the directory is invalid
+	 * @throws InvalidParamException if the directory is invalid
 	 */
 	public function setControllerPath($path)
 	{
@@ -264,7 +264,7 @@ abstract class Module extends Component
 	/**
 	 * Sets the directory that contains the view files.
 	 * @param string $path the root directory of view files.
-	 * @throws Exception if the directory is invalid
+	 * @throws InvalidParamException if the directory is invalid
 	 */
 	public function setViewPath($path)
 	{
@@ -287,7 +287,7 @@ abstract class Module extends Component
 	/**
 	 * Sets the directory that contains the layout files.
 	 * @param string $path the root directory of layout files.
-	 * @throws Exception if the directory is invalid
+	 * @throws InvalidParamException if the directory is invalid
 	 */
 	public function setLayoutPath($path)
 	{
diff --git a/framework/yii/db/sqlite/QueryBuilder.php b/framework/yii/db/sqlite/QueryBuilder.php
index 2a6f345..4a5407f 100644
--- a/framework/yii/db/sqlite/QueryBuilder.php
+++ b/framework/yii/db/sqlite/QueryBuilder.php
@@ -80,6 +80,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	 * @param boolean $check whether to turn on or off the integrity check.
 	 * @param string $schema the schema of the tables. Meaningless for SQLite.
 	 * @param string $table the table name. Meaningless for SQLite.
+	 * @return string the SQL statement for checking integrity
 	 * @throws NotSupportedException this is not supported by SQLite
 	 */
 	public function checkIntegrity($check = true, $schema = '', $table = '')
diff --git a/framework/yii/i18n/GettextMoFile.php b/framework/yii/i18n/GettextMoFile.php
index 4a0a93c..b4a016d 100644
--- a/framework/yii/i18n/GettextMoFile.php
+++ b/framework/yii/i18n/GettextMoFile.php
@@ -54,6 +54,7 @@ class GettextMoFile extends GettextFile
 	 * @param string $context message context
 	 * @return array message translations. Array keys are source messages and array values are translated messages:
 	 * source message => translated message.
+	 * @throws Exception if unable to read the MO file
 	 */
 	public function load($filePath, $context)
 	{
@@ -128,6 +129,7 @@ class GettextMoFile extends GettextFile
 	 * @param array $messages message translations. Array keys are source messages and array values are
 	 * translated messages: source message => translated message. Note if the message has a context,
 	 * the message ID must be prefixed with the context with chr(4) as the separator.
+	 * @throws Exception if unable to save the MO file
 	 */
 	public function save($filePath, $messages)
 	{