Merge branch '2.8'

book/http_cache.rst

@@ -384,7 +384,7 @@ This has two very reasonable consequences:
 
 * You should *never* change the state of your application when responding
   to a GET or HEAD request. Even if you don't use a gateway cache, the presence
-  of proxy caches mean that any GET or HEAD request may or may not actually
+  of proxy caches means that any GET or HEAD request may or may not actually
   hit your server;
 
 * Don't expect PUT, POST or DELETE methods to cache. These methods are meant

book/service_container.rst

@@ -978,7 +978,7 @@ Core Symfony and Third-Party Bundle Services
 Since Symfony and all third-party bundles configure and retrieve their services
 via the container, you can easily access them or even use them in your own
 services. To keep things simple, Symfony by default does not require that
-controllers be defined as services. Furthermore, Symfony injects the entire
+controllers must be defined as services. Furthermore, Symfony injects the entire
 service container into your controller. For example, to handle the storage of
 information on a user's session, Symfony provides a ``session`` service,
 which you can access inside a standard controller as follows::

components/security/authentication.rst

@@ -77,7 +77,7 @@ The default authentication manager is an instance of
 
     use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
 
-    // instances of Symfony\Component\Security\Core\Authentication\AuthenticationProviderInterface
+    // instances of Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface
     $providers = array(...);
 
     $authenticationManager = new AuthenticationProviderManager($providers);

contributing/code/core_team.rst

@@ -117,11 +117,10 @@ Pull Request Merging Policy
 
 A pull request **can be merged** if:
 
-* Enough time was given for peer reviews (a few minutes for typos or minor
-  changes, at least 2 days for "regular" pull requests, and 4 days for pull
-  requests with "a significant impact");
+* It is a minor change [1]_;
 
-* It is a minor change [1]_, regardless of the number of votes;
+* Enough time was given for peer reviews (at least 2 days for "regular"
+  pull requests, and 4 days for pull requests with "a significant impact");
 
 * At least the component's **Merger** or two other Core members voted ``+1``
   and no Core member voted ``-1``.

cookbook/assetic/uglifyjs.rst

@@ -40,7 +40,7 @@ Local Installation
 ~~~~~~~~~~~~~~~~~~
 
 It's also possible to install UglifyJS inside your project only, which is useful
-when your project requires an specific UglifyJS version. To do this, install it
+when your project requires a specific UglifyJS version. To do this, install it
 without the ``-g`` option and specify the path where to put the module:
 
 .. code-block:: bash

cookbook/configuration/using_parameters_in_dic.rst

@@ -93,9 +93,8 @@ Now, examine the results to see this closely:
 In order to support this use case, the ``Configuration`` class has to
 be injected with this parameter via the extension as follows::
 
-    namespace Acme\DemoBundle\DependencyInjection;
+    namespace AppBundle\DependencyInjection;
 
-    use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
     use Symfony\Component\Config\Definition\Builder\TreeBuilder;
     use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -130,9 +129,7 @@ And set it in the constructor of ``Configuration`` via the ``Extension`` class::
     namespace AppBundle\DependencyInjection;
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
     use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-    use Symfony\Component\Config\FileLocator;
 
     class AppExtension extends Extension
     {

cookbook/configuration/web_server_configuration.rst

@@ -45,7 +45,7 @@ The **minimum configuration** to get your application running under Apache is:
         DocumentRoot /var/www/project/web
         <Directory /var/www/project/web>
             AllowOverride All
-            Order allow, deny
+            Order Allow,Deny
             Allow from All
         </Directory>
 
@@ -76,7 +76,7 @@ and increase web server performance:
         DocumentRoot /var/www/project/web
         <Directory /var/www/project/web>
             AllowOverride None
-            Order allow, deny
+            Order Allow,Deny
             Allow from All
 
             <IfModule mod_rewrite.c>
@@ -110,7 +110,7 @@ and increase web server performance:
 Using mod_php/PHP-CGI with Apache 2.4
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In Apache 2.4, ``Order allow,deny`` has been replaced by ``Require all granted``.
+In Apache 2.4, ``Order Allow,Deny`` has been replaced by ``Require all granted``.
 Hence, you need to modify your ``Directory`` permission settings as follows:
 
 .. code-block:: apache
@@ -223,7 +223,7 @@ should look something like this:
         <Directory /var/www/project/web>
             # enable the .htaccess rewrites
             AllowOverride All
-            Order allow, deny
+            Order Allow,Deny
             Allow from all
         </Directory>
 

cookbook/email/email.rst

@@ -93,9 +93,8 @@ an email is pretty straightforward::
 
     public function indexAction($name)
     {
-        $mailer = $this->get('mailer');
-        $message = $mailer->createMessage()
-            ->setSubject('You have Completed Registration!')
+        $message = \Swift_Message::newInstance()
+            ->setSubject('Hello Email')
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(
@@ -117,7 +116,7 @@ an email is pretty straightforward::
             )
             */
         ;
-        $mailer->send($message);
+        $this->get('mailer')->send($message);
 
         return $this->render(...);
     }

reference/constraints/_payload-option.rst.inc

@@ -8,9 +8,9 @@ payload
 
 This option can be used to attach arbitrary domain-specific data to a constraint.
 The configured payload is not used by the Validator component, but its processing
-is completely up to.
+is completely up to you.
 
-For example, you may want to used
+For example, you may want to use
 :doc:`several error levels </cookbook/validation/severity>` to present failed
-constraint differently in the front-end depending on the severity of the
+constraints differently in the front-end depending on the severity of the
 error.