Merge pull request symfony#1703 from drak/patch-3

weaverryan · weaverryan · commit 2d491c338ce0 · 2012-09-14T10:47:19.000-07:00
[HttpFoundation] Remove misleading documentation.
diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst
@@ -69,13 +69,12 @@ Session workflow
   Starts the session - do not use ``session_start()``.
 
 * :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::migrate`:
-  Regenerates the session id - do not use ``session_regenerate_id()``.
+  Regenerates the session ID - do not use ``session_regenerate_id()``.
   This method can optionally change the lifetime of the new cookie that will
   be emitted by calling this method.
 
 * :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::invalidate`:
-  Clears the session data and regenerates the session id do not use ``session_destroy()``.
-  This is a shortcut for ``clear()`` and ``migrate()``.
+  Clears the all session data and regenerates session ID do not use ``session_destroy()``.
 
 * :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::getId`: Gets the
   session ID. Do not use ``session_id()``.
