diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
index 6c87f84e4f4..10f5410bab4 100644
--- a/book/from_flat_php_to_symfony2.rst
+++ b/book/from_flat_php_to_symfony2.rst
@@ -113,7 +113,7 @@ is primarily an HTML file that uses a template-like PHP syntax:
-
-
+
diff --git a/book/service_container.rst b/book/service_container.rst
index 7fe60df77af..a3439ff7a46 100644
--- a/book/service_container.rst
+++ b/book/service_container.rst
@@ -982,7 +982,7 @@ which you can access inside a standard controller as follows::
In Symfony, you'll constantly use services provided by the Symfony core or
other third-party bundles to perform tasks such as rendering templates (``templating``),
-sending emails (``mailer``), or accessing information on the request (``request``).
+sending emails (``mailer``), or accessing information on the request through the request stack (``request_stack``).
You can take this a step further by using these services inside services that
you've created for your application. Beginning by modifying the ``NewsletterManager``
diff --git a/components/security/authorization.rst b/components/security/authorization.rst
index 5306a3eec61..5f5287bd64c 100644
--- a/components/security/authorization.rst
+++ b/components/security/authorization.rst
@@ -120,7 +120,7 @@ on a "remember-me" cookie, or even authenticated anonymously?
// any object
$object = ...;
- $vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY');
+ $vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY'));
RoleVoter
~~~~~~~~~
diff --git a/cookbook/assetic/php.rst b/cookbook/assetic/php.rst
index 2cc6b6bf4f7..14176e1d84c 100644
--- a/cookbook/assetic/php.rst
+++ b/cookbook/assetic/php.rst
@@ -33,10 +33,8 @@ directory and execute the following commands:
.. code-block:: bash
$ composer require leafo/scssphp
- $ composer require patchwork/jsqueeze:"~1.0"
+ $ composer require patchwork/jsqueeze
-It's very important to maintain the ``~1.0`` version constraint for the ``jsqueeze``
-dependency because the most recent stable version is not compatible with Assetic.
Organizing your Web Asset Files
-------------------------------
diff --git a/cookbook/bundles/configuration.rst b/cookbook/bundles/configuration.rst
index 4c8746deda8..3c32ef89069 100644
--- a/cookbook/bundles/configuration.rst
+++ b/cookbook/bundles/configuration.rst
@@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your
array(
'twitter' => array(
'client_id' => 123,
- 'client_secret' => '$secret',
+ 'client_secret' => 'your_secret',
),
),
)
@@ -155,7 +155,7 @@ beneath it, the incoming array might look like this::
array(
'twitter' => array(
'client_id' => 123,
- 'client_secret' => '$secret',
+ 'client_secret' => 'your_secret',
),
),
// values from config_dev.yml
diff --git a/cookbook/workflow/homestead.rst b/cookbook/workflow/homestead.rst
index 2f50a3305ac..cd3948fe375 100644
--- a/cookbook/workflow/homestead.rst
+++ b/cookbook/workflow/homestead.rst
@@ -11,7 +11,7 @@ quickly.
.. tip::
Due to the amount of filesystem operations in Symfony (e.g. updating cache
- files and writing to log files), Symfony can slow down signifcantly. To
+ files and writing to log files), Symfony can slow down significantly. To
improve the speed, consider :ref:`overriding the cache and log directories `
to a location outside the NFS share (for instance, by using
:phpfunction:`sys_get_temp_dir`). You can read `this blog post`_ for more
diff --git a/images/request-flow.png b/images/request-flow.png
index d33716beb28..cbf4019307b 100644
Binary files a/images/request-flow.png and b/images/request-flow.png differ
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index 977d64412b2..470488796d0 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -20,6 +20,7 @@ photos).
| | - `entry_options`_ |
| | - `entry_type`_ |
| | - `prototype`_ |
+| | - `prototype_data`_ |
| | - `prototype_name`_ |
+-------------+-----------------------------------------------------------------------------+
| Inherited | - `by_reference`_ |
@@ -353,6 +354,31 @@ rendering your form, having the entire "form row" may be easier for you.
For details on how to actually use this option, see the above example as
well as :ref:`cookbook-form-collections-new-prototype`.
+prototype_data
+~~~~~~~~~~~~~~
+
+.. versionadded:: 2.8
+ The ``prototype_data`` option was introduced in Symfony 2.8.
+
+**type**: ``mixed`` **default**: ``null``
+
+Allows you to define specific data for the prototype. Each new row added will
+initially contain the data set by this option. By default, the data configured
+for all entries with the `entry_options`_ option will be used.
+
+.. code-block:: php
+
+ use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+ use Symfony\Component\Form\Extension\Core\Type\TextType;
+ // ...
+
+ $builder->add('tags', CollectionType::class, array(
+ 'entry_type' => TextType::class,
+ 'allow_add' => true,
+ 'prototype' => true,
+ 'prototype_data' => 'New Tag Placeholder',
+ ));
+
prototype_name
~~~~~~~~~~~~~~