Merge branch '3.4' into 4.0

* 3.4: Long line wrapping [Form] Removed Integer scale option Minor fixes Update swiftmailer.rst
mhujer · Apr 30, 2018 · 80fd0a6 · 80fd0a6
2 parents 93f788b + 3ef5c40
commit 80fd0a6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
@@ -22,6 +22,7 @@ Configuration
 * `transport`_
 * `username`_
 * `password`_
+* `command`_
 * `host`_
 * `port`_
 * `timeout`_
@@ -77,6 +78,13 @@ password
 
 The password when using ``smtp`` as the transport.
 
+command
+~~~~~~~~
+
+**type**: ``string`` **default**: ``/usr/sbin/sendmail -bs``
+
+Command to be executed by ``sendmail`` transport.
+
 host
 ~~~~
 

diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst
@@ -17,11 +17,10 @@ integers. By default, all non-integer values (e.g. 6.78) will round down
 | Rendered as | ``input`` ``number`` field                                            |
 +-------------+-----------------------------------------------------------------------+
 | Options     | - `grouping`_                                                         |
-|             | - `scale`_                                                            |
 |             | - `rounding_mode`_                                                    |
 +-------------+-----------------------------------------------------------------------+
 | Overridden  | - `compound`_                                                         |
-| options     |                                                                       |
+| options     | - `scale`_                                                            |
 +-------------+-----------------------------------------------------------------------+
 | Inherited   | - `data`_                                                             |
 | options     | - `disabled`_                                                         |
@@ -46,8 +45,6 @@ Field Options
 
 .. include:: /reference/forms/types/options/grouping.rst.inc
 
-.. include:: /reference/forms/types/options/scale.rst.inc
-
 rounding_mode
 ~~~~~~~~~~~~~
 
@@ -82,6 +79,16 @@ Overridden Options
 
 .. include:: /reference/forms/types/options/compound_type.rst.inc
 
+scale
+~~~~~
+
+**type**: ``integer`` **default**: ``0``
+
+This specifies how many decimals will be allowed until the field rounds the
+submitted value (via ``rounding_mode``). This option inherits from
+:doc:`number </reference/forms/types/number>` type and is overriden to ``0`` for
+``IntegerType``.
+
 Inherited Options
 -----------------
 

diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst
@@ -41,7 +41,19 @@ Field Options
 
 .. include:: /reference/forms/types/options/grouping.rst.inc
 
-.. include:: /reference/forms/types/options/scale.rst.inc
+scale
+~~~~~
+
+.. versionadded:: 2.7
+    The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7,
+    it was known as ``precision``.
+
+**type**: ``integer`` **default**: Locale-specific (usually around ``3``)
+
+This specifies how many decimals will be allowed until the field rounds
+the submitted value (via ``rounding_mode``). For example, if ``scale`` is set
+to ``2``, a submitted value of ``20.123`` will be rounded to, for example,
+``20.12`` (depending on your `rounding_mode`_).
 
 rounding_mode
 ~~~~~~~~~~~~~