Merge branch 'master' into develop

Author: taylorotwell

app/config/auth.php

@@ -8,7 +8,7 @@
 	|--------------------------------------------------------------------------
 	|
 	| This option controls the authentication driver that will be utilized.
-	| This drivers manages the retrieval and authentication of the users
+	| This driver manages the retrieval and authentication of the users
 	| attempting to get access to protected areas of your application.
 	|
 	| Supported: "database", "eloquent"
@@ -68,4 +68,4 @@
 
 	),
 
-);
+);

app/lang/en/validation.php

@@ -22,10 +22,10 @@
 	"array"            => "The :attribute must be an array.",
 	"before"           => "The :attribute must be a date before :date.",
 	"between"          => array(
-		"numeric" => "The :attribute must be between :min - :max.",
-		"file"    => "The :attribute must be between :min - :max kilobytes.",
-		"string"  => "The :attribute must be between :min - :max characters.",
-		"array"   => "The :attribute must have between :min - :max items.",
+		"numeric" => "The :attribute must be between :min and :max.",
+		"file"    => "The :attribute must be between :min and :max kilobytes.",
+		"string"  => "The :attribute must be between :min and :max characters.",
+		"array"   => "The :attribute must have between :min and :max items.",
 	),
 	"confirmed"        => "The :attribute confirmation does not match.",
 	"date"             => "The :attribute is not a valid date.",

app/tests/TestCase.php

@@ -5,7 +5,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase {
 	/**
 	 * Creates the application.
 	 *
-	 * @return Symfony\Component\HttpKernel\HttpKernelInterface
+	 * @return \Symfony\Component\HttpKernel\HttpKernelInterface
 	 */
 	public function createApplication()
 	{

bootstrap/start.php

@@ -48,7 +48,7 @@
 | Load The Application
 |--------------------------------------------------------------------------
 |
-| Here we will load the Illuminate application. We'll keep this is in a
+| Here we will load this Illuminate application. We will keep this in a
 | separate location so we can isolate the creation of an application
 | from the actual running of the application with a given request.
 |