Merge pull request #2081 from WouterJ/warning_to_caution_21

[2.1] Renamed warning to caution blocks
symfony · Jan 3, 2013 · baad982 · baad982
2 parents df85a35 + 0f286be
commit baad982
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/book/security.rst b/book/security.rst
@@ -1564,7 +1564,7 @@ Note that you will *not* need to implement a controller for the ``/logout``
 URL as the firewall takes care of everything. You *do*, however, need to create
 a route so that you can use it to generate the URL:
 
-.. warning::
+.. caution::
 
     As of Symfony 2.1, you *must* have a route that corresponds to your logout
     path. Without this route, logging out will not work.

diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst
@@ -48,7 +48,7 @@ Quick example::
     start on demand, that is, if any session request is made to read/write session
     data.
 
-.. warning::
+.. caution::
 
     Symfony sessions are incompatible with PHP ini directive ``session.auto_start = 1``
     This directive should be turned off in ``php.ini``, in the webserver directives or