Merge branch 'master' of github.com:laravel/laravel

taylorotwell · taylorotwell · commit 9c823d42be0a · 2012-04-18T20:36:51.000-05:00
diff --git a/laravel/cli/tasks/bundle/bundler.php b/laravel/cli/tasks/bundle/bundler.php
@@ -125,7 +125,7 @@ protected function get($bundles)
 
 			if ($response['status'] == 'not-found')
 			{
-				throw new \Exception("There is not a bundle named [$bundle].");
+				throw new \Exception("There is no bundle named [$bundle].");
 			}
 
 			// If the bundle was retrieved successfully, we will add it to
diff --git a/laravel/core.php b/laravel/core.php
@@ -148,7 +148,7 @@
 |
 | Finally we will register all of the bundles that have been defined for
 | the application. None of them will be started, yet but will be setup
-| so that they may be started by the develop at any time.
+| so that they may be started by the developer at any time.
 |
 */
 
diff --git a/laravel/routing/controller.php b/laravel/routing/controller.php
@@ -312,7 +312,7 @@ public function response($method, $parameters = array())
 
 		$response = call_user_func_array(array($this, $action), $parameters);
 
-		// If the controller has specified a layout view. The response
+		// If the controller has specified a layout view the response
 		// returned by the controller method will be bound to that
 		// view and the layout will be considered the response.
 		if (is_null($response) and ! is_null($this->layout))
diff --git a/laravel/routing/router.php b/laravel/routing/router.php
@@ -161,7 +161,7 @@ public static function group($attributes, Closure $callback)
 	 *
 	 * <code>
 	 *		// Register a route with the router
-	 *		Router::register('GET' ,'/', function() {return 'Home!';});
+	 *		Router::register('GET', '/', function() {return 'Home!';});
 	 *
 	 *		// Register a route that handles multiple URIs with the router
 	 *		Router::register(array('GET', '/', 'GET /home'), function() {return 'Home!';});
@@ -542,7 +542,7 @@ public static function routes()
 			$fallback = array_get(static::$fallback, $method, array());
 
 			// When building the array of routes, we'll merge in all of the fallback
-			// routes for each request methdo individually. This allows us to avoid
+			// routes for each request method individually. This allows us to avoid
 			// collisions when merging the arrays together.
 			$routes[$method] = array_merge($routes[$method], $fallback);
 		}
diff --git a/laravel/url.php b/laravel/url.php
@@ -40,7 +40,7 @@ public static function home($https = false)
 		$route = Router::find('home');
 
 		// If a route named "home" exists, we'll route to that instead of using
-		// the single slash root URI. THis allows the HTTPS attribute to be
+		// the single slash root URI. This allows the HTTPS attribute to be
 		// respected instead of being hard-coded in the redirect.
 		if ( ! is_null($route))
 		{

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function get($bundles)`
`125`	`125`
`126`	`126`	`if ($response['status'] == 'not-found')`
`127`	`127`	`{`
`128`		`- throw new \Exception("There is not a bundle named [$bundle].");`
	`128`	`+ throw new \Exception("There is no bundle named [$bundle].");`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// If the bundle was retrieved successfully, we will add it to`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@`
`148`	`148`	`\|`
`149`	`149`	`\| Finally we will register all of the bundles that have been defined for`
`150`	`150`	`\| the application. None of them will be started, yet but will be setup`
`151`		`-\| so that they may be started by the develop at any time.`
	`151`	`+\| so that they may be started by the developer at any time.`
`152`	`152`	`\|`
`153`	`153`	`*/`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public static function group($attributes, Closure $callback)`
`161`	`161`	`*`
`162`	`162`	`* <code>`
`163`	`163`	`* // Register a route with the router`
`164`		`- * Router::register('GET' ,'/', function() {return 'Home!';});`
	`164`	`+ * Router::register('GET', '/', function() {return 'Home!';});`
`165`	`165`	`*`
`166`	`166`	`* // Register a route that handles multiple URIs with the router`
`167`	`167`	`* Router::register(array('GET', '/', 'GET /home'), function() {return 'Home!';});`
`@@ -542,7 +542,7 @@ public static function routes()`
`542`	`542`	`$fallback = array_get(static::$fallback, $method, array());`
`543`	`543`
`544`	`544`	`// When building the array of routes, we'll merge in all of the fallback`
`545`		`- // routes for each request methdo individually. This allows us to avoid`
	`545`	`+ // routes for each request method individually. This allows us to avoid`
`546`	`546`	`// collisions when merging the arrays together.`
`547`	`547`	`$routes[$method] = array_merge($routes[$method], $fallback);`
`548`	`548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static function home($https = false)`
`40`	`40`	`$route = Router::find('home');`
`41`	`41`
`42`	`42`	`// If a route named "home" exists, we'll route to that instead of using`
`43`		`- // the single slash root URI. THis allows the HTTPS attribute to be`
	`43`	`+ // the single slash root URI. This allows the HTTPS attribute to be`
`44`	`44`	`// respected instead of being hard-coded in the redirect.`
`45`	`45`	`if ( ! is_null($route))`
`46`	`46`	`{`