Merge branch '4.1'

phanan-forks · May 10, 2014 · 1a55def · 1a55def
2 parents b2fbc5f + 3782aed
commit 1a55def
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/session.md b/session.md
@@ -13,6 +13,10 @@ Since HTTP driven applications are stateless, sessions provide a way to store in
 
 The session configuration is stored in `app/config/session.php`. Be sure to review the well documented options available to you in this file. By default, Laravel is configured to use the `file` session driver, which will work well for the majority of applications.
 
+#### Reserved Keys
+
+The Laravel framework uses the `flash` session key internally, so you should not add an item to the session by that name.
+
 <a name="session-usage"></a>
 ## Session Usage