Merge branch '4.1'

controllers.md

@@ -29,7 +29,7 @@ Here is an example of a basic controller class:
 
  }
 
-All controllers should extend the `BaseController` class. The `BaseController` is also stored in the `app/controllers` directory, and may be used as a place to put shared controller logic. The `BaseController` extends the framework's `Controller` class. Now, We can route to this controller action like so:
+All controllers should extend the `BaseController` class. The `BaseController` is also stored in the `app/controllers` directory, and may be used as a place to put shared controller logic. The `BaseController` extends the framework's `Controller` class. Now, we can route to this controller action like so:
 
  Route::get('user/{id}', 'UserController@showProfile');
 

events.md

@@ -168,3 +168,8 @@ Once the subscriber has been defined, it may be registered with the `Event` clas
  $subscriber = new UserEventHandler;
 
  Event::subscribe($subscriber);
+
+You may also use the [Laravel IoC container](/docs/ioc) to resolve your subscriber. To do so, simply pass the name of your subscriber to the `subscribe` method:
+
+ Event::subscribe('UserEventHandler');
+

installation.md

@@ -47,6 +47,8 @@ Laravel needs almost no configuration out of the box. You are free to get starte
 
 Once Laravel is installed, you should also [configure your local environment](/docs/configuration#environment-configuration). This will allow you to receive detailed error messages when developing on your local machine. By default, detailed error reporting is disabled in your production configuration file.
 
+> **Note:** You should never have `app.debug` set to `true` for a production application. Never, ever do it.
+
 <a name="permissions"></a>
 ### Permissions
 Laravel may require one set of permissions to be configured: folders within app/storage require write access by the web server.

queues.md

@@ -64,7 +64,7 @@ If you need to pass the same data to several queue jobs, you may use the `Queue:
 
 #### Delaying The Execution Of A Job
 
-Sometimes you may wish to delay the execute of a queued job. For instance, you may wish to queue a job that sends a customer an e-mail 15 minutes after sign-up. You can accomplish this using the `Queue::later` method:
+Sometimes you may wish to delay the execution of a queued job. For instance, you may wish to queue a job that sends a customer an e-mail 15 minutes after sign-up. You can accomplish this using the `Queue::later` method:
 
  $date = Carbon::now()->addMinutes(15);
 

quick.md

@@ -157,7 +157,7 @@ Awesome. Now we're ready to display the users in our view!
 <a name="displaying-data"></a>
 ## Displaying Data
 
-Now that we have made the `users` available to our view. We can display them like so:
+Now that we have made the `users` available to our view, we can display them like so:
 
  @extends('layout')
 

requests.md

@@ -110,6 +110,13 @@ Since you often will want to flash input in association with a redirect to the p
 
 The object returned by the `file` method is an instance of the `Symfony\Component\HttpFoundation\File\UploadedFile` class, which extends the PHP `SplFileInfo` class and provides a variety of methods for interacting with the file.
 
+#### Determining If An Uploaded File Is Valid
+
+ if (Input::file('photo')->isValid())
+ {
+  //
+ }
+
 #### Moving An Uploaded File
 
  Input::file('photo')->move($destinationPath);

schema.md

@@ -64,6 +64,7 @@ Command | Description
 `$table->bigInteger('votes');` | BIGINT equivalent to the table
 `$table->binary('data');` | BLOB equivalent to the table
 `$table->boolean('confirmed');` | BOOLEAN equivalent to the table
+`$table->char('name', 4);` | CHAR equivalent with a length
 `$table->date('created_at');` | DATE equivalent to the table
 `$table->dateTime('created_at');` | DATETIME equivalent to the table
 `$table->decimal('amount', 5, 2);` | DECIMAL equivalent with a precision and scale

security.md

@@ -19,7 +19,7 @@ By default, Laravel includes a `User` model in your `app/models` directory which
 
 If your application is not using Eloquent, you may use the `database` authentication driver which uses the Laravel query builder.
 
-> **Note:** Before getting started, make sure that your `users` (or equivalent) table contains a string `remember_token` column. This column will be used to store a token for "remember me" sessions being maintained by your application.
+> **Note:** Before getting started, make sure that your `users` (or equivalent) table contains a nullable, string `remember_token` column of 100 characters. This column will be used to store a token for "remember me" sessions being maintained by your application.
 
 <a name="storing-passwords"></a>
 ## Storing Passwords

upgrade.md

@@ -122,7 +122,7 @@ Update your `app/lang/en/reminders.php` language file to match [this updated fil
 
 ### Environment Detection Updates
 
-For security reasons, URL domains may no longer be used to detect your application environment. These values are easily spoofable and allow attackers to modify the environment for a request. You should convert your environment detection to use machine host names (`hostname` command on Mac & Ubuntu).
+For security reasons, URL domains may no longer be used to detect your application environment. These values are easily spoofable and allow attackers to modify the environment for a request. You should convert your environment detection to use machine host names (`hostname` command on Mac, Linux, and Windows).
 
 ### Simpler Log Files