[#6149] backport to the 2.3 branch

xabbuh · xabbuh · commit d47981d87a5b · 2016-01-19T00:20:58.000+01:00
diff --git a/book/controller.rst b/book/controller.rst
@@ -597,7 +597,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
`@@ -597,7 +597,7 @@ from any controller::`
`597`	`597`	`$filters = $session->get('filters', array());`
`598`	`598`	`}`
`599`	`599`
`600`		`-These attributes will remain on the user for the remainder of that user's`
	`600`	`+These attributes will remain in the session for the remainder of that user's`
`601`	`601`	`session.`
`602`	`602`
`603`	`603`	`.. index::`