Merge branch '2.3' into 2.6

* 2.3:
  [#5081] Very minor language tweak
  [#5008] Shortening section and moving much of the note to reference
  Added a note about how to enable http_method_override for caching kernels
  some language tweaks
  Reworded again the note about "optional options"
  Reworded the explanation about "optional options"
  Minow grammar fix
  Added a note about the Symfony versions affected by ICU problems
  Reworded the explanation about optional command options

Author: weaverryan

book/http_cache.rst

@@ -166,6 +166,12 @@ kernel::
 The caching kernel will immediately act as a reverse proxy - caching responses
 from your application and returning them to the client.
 
+.. caution::
+
+    If you're using the :ref:`framework.http_method_override <configuration-framework-http_method_override>`
+    option to read the HTTP method from a ``_method`` parameter, see the
+    above link for a tweak you need to make.
+
 .. tip::
 
     The cache kernel has a special ``getLog()`` method that returns a string

components/console/introduction.rst

@@ -324,9 +324,11 @@ declare a one-letter shortcut that you can call with a single dash like
 
 .. tip::
 
-    It is also possible to make an option *optionally* accept a value (so that
-    ``--yell``, ``--yell=loud`` or ``--yell loud`` work). Options can also be configured to
-    accept an array of values.
+    There is nothing forbidding you to create a command with an option that
+    optionally accepts a value. However, there is no way you can distinguish
+    when the option was used without a value (``command --yell``) or when it
+    wasn't used at all (``command``). In both cases, the value retrieved for
+    the option will be ``null``.
 
 For example, add a new option to the command that can be used to specify
 how many times in a row the message should be printed::

components/intl.rst

@@ -62,6 +62,11 @@ code::
 
 .. sidebar:: ICU and Deployment Problems
 
+    .. note::
+
+        These deployment problems only affect the following Symfony versions:
+        2.3.0 to 2.3.20 versions, any 2.4.x version and 2.5.0 to 2.5.5 versions.
+
     The intl extension internally uses the `ICU library`_ to obtain localization
     data such as number formats in different languages, country names and more.
     To make this data accessible to userland PHP libraries, Symfony ships a copy

cookbook/session/locale_sticky_session.rst

@@ -116,10 +116,10 @@ before the ``FirewallListener``, which is responsible for handling authenticatio
 setting the user token on the ``TokenStorage``, you have no access to the user
 which is logged in.
 
-Let's pretend you have defined a ``locale"`` property on your ``User`` entity
-and you want to use this as the locale for the given user. To accomplish this,
-you can hook into the login process and update the user's session with the
-this locale value before they are redirected to their first page.
+Suppose you have defined a ``locale`` property on your ``User`` entity and
+you want to use this as the locale for the given user. To accomplish this,
+you can hook into the login process and update the user's session with this
+locale value before they are redirected to their first page.
 
 To do this, you need an event listener for the ``security.interactive_login``
 event:

reference/configuration/framework.rst

@@ -91,6 +91,24 @@ method gets called automatically. It becomes the service container parameter
 named ``kernel.http_method_override``. For more information, see
 :doc:`/cookbook/routing/method_parameters`.
 
+.. caution::
+
+    If you're using the :ref:`AppCache Reverse Proxy <symfony2-reverse-proxy>`
+    with this option, the kernel will ignore the ``_method`` parameter,
+    which could lead to errors.
+
+    To fix this, invoke the ``enableHttpMethodParameterOverride()`` method
+    before creating the ``Request`` object::
+
+        // web/app.php
+
+        // ...
+        $kernel = new AppCache($kernel);
+
+        Request::enableHttpMethodParameterOverride(); // <-- add this line
+        $request = Request::createFromGlobals();
+        // ...
+
 ide
 ~~~