Merge branch '2.3' into 2.4

Author: weaverryan

book/controller.rst

@@ -236,7 +236,7 @@ example:
 
         # app/config/routing.yml
         hello:
-            path:      /hello/{first_name}/{last_name}
+            path:      /hello/{firstName}/{lastName}
             defaults:  { _controller: AcmeHelloBundle:Hello:index, color: green }
 
     .. code-block:: xml
@@ -248,7 +248,7 @@ example:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="hello" path="/hello/{first_name}/{last_name}">
+            <route id="hello" path="/hello/{firstName}/{lastName}">
                 <default key="_controller">AcmeHelloBundle:Hello:index</default>
                 <default key="color">green</default>
             </route>
@@ -257,19 +257,19 @@ example:
     .. code-block:: php
 
         // app/config/routing.php
-        $collection->add('hello', new Route('/hello/{first_name}/{last_name}', array(
+        $collection->add('hello', new Route('/hello/{firstName}/{lastName}', array(
             '_controller' => 'AcmeHelloBundle:Hello:index',
             'color'       => 'green',
         )));
 
 The controller for this can take several arguments::
 
-    public function indexAction($first_name, $last_name, $color)
+    public function indexAction($firstName, $lastName, $color)
     {
         // ...
     }
 
-Notice that both placeholder variables (``{first_name}``, ``{last_name}``)
+Notice that both placeholder variables (``{firstName}``, ``{lastName}``)
 as well as the default ``color`` variable are available as arguments in the
 controller. When a route is matched, the placeholder variables are merged
 with the ``defaults`` to make one array that's available to your controller.
@@ -281,11 +281,11 @@ the following guidelines in mind while you develop.
 
     Symfony is able to match the parameter names from the route to the variable
     names in the controller method's signature. In other words, it realizes that
-    the ``{last_name}`` parameter matches up with the ``$last_name`` argument.
+    the ``{lastName}`` parameter matches up with the ``$lastName`` argument.
     The arguments of the controller could be totally reordered and still work
     perfectly::
 
-        public function indexAction($last_name, $color, $first_name)
+        public function indexAction($lastName, $color, $firstName)
         {
             // ...
         }
@@ -295,25 +295,25 @@ the following guidelines in mind while you develop.
     The following would throw a ``RuntimeException`` because there is no ``foo``
     parameter defined in the route::
 
-        public function indexAction($first_name, $last_name, $color, $foo)
+        public function indexAction($firstName, $lastName, $color, $foo)
         {
             // ...
         }
 
     Making the argument optional, however, is perfectly ok. The following
     example would not throw an exception::
 
-        public function indexAction($first_name, $last_name, $color, $foo = 'bar')
+        public function indexAction($firstName, $lastName, $color, $foo = 'bar')
         {
             // ...
         }
 
 * **Not all routing parameters need to be arguments on your controller**
 
-    If, for example, the ``last_name`` weren't important for your controller,
+    If, for example, the ``lastName`` weren't important for your controller,
     you could omit it entirely::
 
-        public function indexAction($first_name, $color)
+        public function indexAction($firstName, $color)
         {
             // ...
         }

book/installation.rst

@@ -57,12 +57,7 @@ Distribution:
 
 .. code-block:: bash
 
-    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.0
-
-.. tip::
-
-    For an exact version, replace "2.3.0" with the latest Symfony version.
-    For details, see the `Symfony Installation Page`_
+    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.*
 
 .. tip::
 

book/security.rst

@@ -896,6 +896,14 @@ the trusted reverse proxy cache.
     construct.  Prior to 2.3, users should create one rule per IP address to match and
     use the ``ip`` key instead of ``ips``.
 
+.. caution::
+
+    As you'll read in the explanation below the example, the ``ip`` option
+    does not restrict to a specific IP address. Instead, using the ``ip``
+    key means that the ``access_control`` entry will only match this IP address,
+    and users accessing it from a different IP address will continue down
+    the ``acces_control`` list.
+
 Here is an example of how you might secure all ESI routes that start with a
 given prefix, ``/esi``, from outside access:
 
@@ -1007,11 +1015,13 @@ For a list of the other functions and variables, see
 
 .. _book-security-securing-channel:
 
-Securing by Channel
-~~~~~~~~~~~~~~~~~~~
+Forcing a Channel (http, https)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can also require a user to access a URL via SSL; just use the
-``requires_channel`` argument in any ``access_control`` entries:
+``requires_channel`` argument in any ``access_control`` entries. If this
+``access_control`` is matched and the request is using the ``http`` channel,
+the user will be redirected to ``https``:
 
 .. configuration-block::
 

reference/forms/types/checkbox.rst

@@ -13,8 +13,9 @@ if the box is unchecked, the value will be set to false.
 +-------------+------------------------------------------------------------------------+
 | Options     | - `value`_                                                             |
 +-------------+------------------------------------------------------------------------+
-| Inherited   | - `required`_                                                          |
-| options     | - `label`_                                                             |
+| Inherited   | - `data`_                                                              |
+| options     | - `required`_                                                          |
+|             | - `label`_                                                             |
 |             | - `read_only`_                                                         |
 |             | - `disabled`_                                                          |
 |             | - `error_bubbling`_                                                    |
@@ -47,11 +48,17 @@ value
 The value that's actually used as the value for the checkbox. This does
 not affect the value that's set on your object.
 
+.. caution::
+
+    To make a checkbox checked by default, use the `data`_ option.
+
 Inherited options
 -----------------
 
 These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
+.. include:: /reference/forms/types/options/data.rst.inc
+
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc

reference/forms/types/radio.rst

@@ -17,8 +17,9 @@ If you want to have a Boolean field, use :doc:`checkbox </reference/forms/types/
 +-------------+---------------------------------------------------------------------+
 | Options     | - `value`_                                                          |
 +-------------+---------------------------------------------------------------------+
-| Inherited   | - `required`_                                                       |
-| options     | - `label`_                                                          |
+| Inherited   | - `data`_                                                           |
+| options     | - `required`_                                                       |
+|             | - `label`_                                                          |
 |             | - `read_only`_                                                      |
 |             | - `disabled`_                                                       |
 |             | - `error_bubbling`_                                                 |
@@ -41,11 +42,17 @@ value
 The value that's actually used as the value for the radio button. This does
 not affect the value that's set on your object.
 
+.. caution::
+
+    To make a radio button checked by default, use the `data`_ option.
+
 Inherited Options
 -----------------
 
 These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
+.. include:: /reference/forms/types/options/data.rst.inc
+
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc