Merge branch 'master' into develop

jasonlewis · jasonlewis · commit 9fae4dc8d7f1 · 2012-09-24T01:01:53.000+09:30
diff --git a/laravel/documentation/auth/usage.md b/laravel/documentation/auth/usage.md
@@ -50,9 +50,9 @@ To determine if the user of your application is logged in, call the **check** me
 	     return "You're logged in!";
 	}
 
-Use the **login** method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass your user object or the user's ID:
+Use the **login** method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass the user's ID:
 
-	Auth::login($user);
+	Auth::login($user->id);
 
 	Auth::login(15);
 
diff --git a/laravel/documentation/controllers.md b/laravel/documentation/controllers.md
@@ -17,7 +17,7 @@
 
 Controllers are classes that are responsible for accepting user input and managing interactions between models, libraries, and views. Typically, they will ask a model for data, and then return a view that presents that data to the user.
 
-The usage of controllers is the most common method of implementing application logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encourage to start with controllers. There is nothing that route-based application logic can do that controllers can't.
+The usage of controllers is the most common method of implementing application logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encouraged to start with controllers. There is nothing that route-based application logic can do that controllers can't.
 
 Controller classes should be stored in **application/controllers** and should extend the Base\_Controller class. A Home\_Controller class is included with Laravel.
 
diff --git a/laravel/documentation/routing.md b/laravel/documentation/routing.md
@@ -295,6 +295,8 @@ The **Controller::detect** method simply returns an array of all of the controll
 
 If you wish to automatically detect the controllers in a bundle, just pass the bundle name to the method. If no bundle is specified, the application folder's controller directory will be searched.
 
+> **Note:** It is important to note that this method gives you no control over the order in which controllers are loaded. Controller::detect() should only be used to Route controllers in very small sites. "Manually" routing controllers gives you much more control, is more self-documenting, and is certainly advised.
+
 #### Register all controllers for the "admin" bundle:
 
 	Route::controller(Controller::detect('admin'));
diff --git a/readme.md b/readme.md
@@ -27,7 +27,7 @@ enjoy, not something that is painful. Enjoy the fresh air.
 
 Route::get('/', function()
 {
-	return "Hello World!":
+	return "Hello World!";
 });
 ```
 
@@ -64,4 +64,4 @@ git commit -s -m "this commit will be signed off automatically!"
 
 ## License
 
-Laravel is open-sourced software licensed under the MIT License.
+Laravel is open-sourced software licensed under the MIT License.

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ To determine if the user of your application is logged in, call the check me`
`50`	`50`	`return "You're logged in!";`
`51`	`51`	`}`
`52`	`52`
`53`		`-Use the login method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass your user object or the user's ID:`
	`53`	`+Use the login method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass the user's ID:`
`54`	`54`
`55`		`- Auth::login($user);`
	`55`	`+ Auth::login($user->id);`
`56`	`56`
`57`	`57`	`Auth::login(15);`
`58`	`58`