Merge remote-tracking branch 'origin/2.2' into 2.2

weaverryan · weaverryan · commit fd29a7e47c23 · 2013-10-26T09:18:28.000-05:00
diff --git a/book/translation.rst b/book/translation.rst
@@ -520,15 +520,13 @@ via the ``request`` object::
 
     $request->setLocale('en_US');
 
-.. index::
-   single: Translations; Fallback and default locale
-
-It is also possible to store the locale in the session instead of on a per
-request basis. If you do this, each subsequent request will have this locale.
+.. tip::
 
-.. code-block:: php
+    Read :doc:`/cookbook/session/locale_sticky_session` to learn, how to store
+    the user's locale in the session.
 
-    $this->get('session')->set('_locale', 'en_US');
+.. index::
+   single: Translations; Fallback and default locale
 
 See the :ref:`book-translation-locale-url` section below about setting the
 locale via routing.
