Merge branch '2.8' into 3.0

xabbuh · xabbuh · commit c97d5bfdd762 · 2016-01-19T00:30:55.000+01:00
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)
     // );
 

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ from any controller::`
`605`	`605`	`$filters = $session->get('filters', array());`
`606`	`606`	`}`
`607`	`607`
`608`		`-These attributes will remain on the user for the remainder of that user's`
	`608`	`+These attributes will remain in the session for the remainder of that user's`
`609`	`609`	`session.`
`610`	`610`
`611`	`611`	`.. index::`
`@@ -821,7 +821,7 @@ method to check the CSRF token::`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`// isCsrfTokenValid() is equivalent to:`
`824`		`- // $this->get('security.csrf.token_manager')->isTokenValid()`
	`824`	`+ // $this->get('security.csrf.token_manager')->isTokenValid(`
`825`	`825`	`// new \Symfony\Component\Security\Csrf\CsrfToken\CsrfToken('token_id', $token)`
`826`	`826`	`// );`
`827`	`827`