Merge branch '2.7' into 2.8

Author: wouterj

book/service_container.rst

@@ -994,7 +994,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``

components/security/authorization.rst

@@ -133,7 +133,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
 ~~~~~~~~~

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
 -------------------------------

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

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 <override-cache-dir>`
     to a location outside the NFS share (for instance, by using
     :phpfunction:`sys_get_temp_dir`). You can read `this blog post`_ for more