Merge branch 'master' into develop

2011-08-12 20:16:37 -05:00
parent 0beec68355 8cdf5f2444
commit 7579715563
2 changed files with 2 additions and 2 deletions
--- a/application/config/error.php
+++ b/application/config/error.php
@@ -46,7 +46,7 @@ return array(
 	| level such as "Parsing Error" or "Fatal Error".
 	|
 	| A simple logging system has been setup for you. By default, all errors
-	| will be logged to the application/log.txt file.
+	| will be logged to the storage/log.txt file.
 	|
 	*/

--- a/system/db/eloquent/model.php
+++ b/system/db/eloquent/model.php
@@ -9,7 +9,7 @@ use System\DB\Manager;
 abstract class Model {

 	/**
-	 * The connection that shold be used for the model.
+	 * The connection that should be used for the model.
 	 *
 	 * @var string
 	 */