Merge branch '3.1/develop' into 3.2/develop

kohana · Jul 11, 2011 · 824408f · 824408f
2 parents b94da49 + 1f37955
commit 824408f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/guide/kohana/flow.md b/guide/kohana/flow.md
@@ -6,9 +6,9 @@ Every application follows the same flow:
 	1. The application, module, and system paths are set. (`APPPATH`, `MODPATH`, and `SYSPATH`)
 	2. Error reporting levels are set.
 	3. Install file is loaded, if it exists.
-	4. The [Kohana] class is loaded.
-	5. The bootstrap file, `APPPATH/bootstrap.php`, is included.
+	4. The bootstrap file, `APPPATH/bootstrap.php`, is included.
 2. Once we are in `bootstrap.php`:
+	6. The [Kohana] class is loaded.
 	7. [Kohana::init] is called, which sets up error handling, caching, and logging.
 	8. [Kohana_Config] readers and [Kohana_Log] writers are attached.
 	9. [Kohana::modules] is called to enable additional modules.

diff --git a/guide/kohana/mvc.md b/guide/kohana/mvc.md
@@ -1,3 +1,3 @@
 <http://kohanaframework.org/guide/about.mvc>
 
-Discus the MVC pattern, as it pertains to Kohana.  Perhaps have an image, etc.
+Discuss the MVC pattern, as it pertains to Kohana.  Perhaps have an image, etc.