Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit b3eac8880354 · 2016-01-19T00:22:00.000+01:00
diff --git a/book/controller.rst b/book/controller.rst
@@ -612,7 +612,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::

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ from any controller::`
`612`	`612`	`$filters = $session->get('filters', array());`
`613`	`613`	`}`
`614`	`614`
`615`		`-These attributes will remain on the user for the remainder of that user's`
	`615`	`+These attributes will remain in the session for the remainder of that user's`
`616`	`616`	`session.`
`617`	`617`
`618`	`618`	`.. index::`