Merge branch '2.8' into 3.0

symfony · Jan 18, 2016 · c97d5bf · c97d5bf
2 parents 62a8755 + f398b03
commit c97d5bf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/book/controller.rst b/book/controller.rst
@@ -605,7 +605,7 @@ from any controller::
         $filters = $session->get('filters', array());
     }
 
-These attributes will remain on the user for the remainder of that user's
+These attributes will remain in the session for the remainder of that user's
 session.
 
 .. index::
@@ -821,7 +821,7 @@ method to check the CSRF token::
     }
 
     // isCsrfTokenValid() is equivalent to:
-    // $this->get('security.csrf.token_manager')->isTokenValid()
+    // $this->get('security.csrf.token_manager')->isTokenValid(
     //     new \Symfony\Component\Security\Csrf\CsrfToken\CsrfToken('token_id', $token)
     // );