Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 3cda09296900 · 2013-10-10T07:51:56.000-04:00
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
@@ -131,7 +131,7 @@ from any controller::
     $foo = $session->get('foo');
 
     // use a default value if the key doesn't exist
-    $filters = $session->set('filters', array());
+    $filters = $session->get('filters', array());
 
 You can also store small messages that will only be available for the very
 next request::
