Merge branch '3.4' into 4.2

* 3.4:
  be keen to newcomers
  Uncomment some code in "Configuring Babel"
  Fix typo: if -> of

Author: javiereguiluz

best_practices/controllers.rst

@@ -128,7 +128,7 @@ Fetching Services
 
 If you extend the base ``AbstractController`` class, you can't access services
 directly from the container via ``$this->container->get()`` or ``$this->get()``.
-Instead, you must use dependency injection to fetch services: most easily done by
+Instead, you must use dependency injection to fetch services by
 :ref:`type-hinting action method arguments <controller-accessing-services>`:
 
 .. best-practice::
@@ -218,9 +218,9 @@ flexible::
         // ...
     }
 
-The point is this: the ParamConverter shortcut is great for simple situations.
-But you shouldn't forget that querying for entities directly is still very
-easy.
+The point is this: the ParamConverter shortcut is great for most situations.
+However, there is nothing wrong with querying for entities directly if the
+ParamConverter would get complicated.
 
 Pre and Post Hooks
 ------------------

best_practices/security.rst

@@ -105,8 +105,7 @@ The @Security Annotation
 ------------------------
 
 For controlling access on a controller-by-controller basis, use the ``@Security``
-annotation whenever possible. It's easy to read and is placed consistently
-above each action.
+annotation whenever possible. Placing it above each action makes it consistent and readable.
 
 In our application, you need the ``ROLE_ADMIN`` in order to create a new post.
 Using ``@Security``, this looks like:
@@ -153,7 +152,7 @@ Notice that this requires the use of the `ParamConverter`_, which automatically
 queries for the ``Post`` object and puts it on the ``$post`` argument. This
 is what makes it possible to use the ``post`` variable in the expression.
 
-This has one major drawback: an expression in an annotation cannot easily
+This has one major drawback: an expression in an annotation cannot
 be reused in other parts of the application. Imagine that you want to add
 a link in a template that will only be seen by authors. Right now you'll
 need to repeat the expression code using Twig syntax:
@@ -164,7 +163,7 @@ need to repeat the expression code using Twig syntax:
         <a href=""> ... </a>
     {% endif %}
 
-The easiest solution - if your logic is simple enough - is to add a new method
+A good solution - if your logic is simple enough - can be to add a new method
 to the ``Post`` entity that checks if a given user is its author::
 
     // src/Entity/Post.php

best_practices/templates.rst

@@ -44,7 +44,7 @@ and ``edit_form.html.twig`` instead of ``EditForm.html.twig``).
     Use a prefixed underscore for partial templates in template names.
 
 You often want to reuse template code using the ``include`` function to avoid
-redundant code. To determine those partials easily in the filesystem you should
+redundant code. To determine those partials in the filesystem you should
 prefix partials and any other template without HTML body or ``extends`` tag
 with a single underscore.
 

bundles/best_practices.rst

@@ -4,10 +4,10 @@
 Best Practices for Reusable Bundles
 ===================================
 
-This article is all about how to structure your **reusable bundles** so that
-they're easy to configure and extend. Reusable bundles are those meant to be
-shared privately across many company projects or publicly so any Symfony project
-can install them.
+This article is all about how to structure your **reusable bundles** to be
+configurable and extendable. Reusable bundles are those meant to be shared
+privately across many company projects or publicly so any Symfony project can
+install them.
 
 .. index::
    pair: Bundle; Naming conventions

configuration/external_parameters.rst

@@ -7,8 +7,7 @@ How to Set external Parameters in the Service Container
 In :doc:`/configuration`, you learned how to manage your application
 configuration. At times, it may benefit your application to store certain
 credentials outside of your project code. Database configuration is one such
-example. The flexibility of the Symfony service container allows you to easily
-do this.
+example. The flexibility of the Symfony service container allows you to do this.
 
 .. _config-env-vars:
 

configuration/front_controllers_and_kernel.rst

@@ -138,9 +138,8 @@ the ``configureContainer()`` method to decide which configuration files to load.
 
 Symfony's default ``Kernel`` class implements this method by loading first the
 config files found on ``config/packages/*`` and then, the files found on
-``config/packages/ENVIRONMENT_NAME/``. You are, of course, free to implement
-this method differently if you need a more sophisticated way of loading your
-configuration.
+``config/packages/ENVIRONMENT_NAME/``. You are free to implement this method
+differently if you need a more sophisticated way of loading your configuration.
 
 .. _front controller: https://en.wikipedia.org/wiki/Front_Controller_pattern
 .. _decorate: https://en.wikipedia.org/wiki/Decorator_pattern

configuration/override_dir_structure.rst

@@ -185,7 +185,7 @@ Override the ``public`` Directory
 
 If you need to rename or move your ``public`` directory, the only thing you need
 to guarantee is that the path to the ``var`` directory is still correct in your
-``index.php`` front controller. If you simply renamed the directory, you're
+``index.php`` front controller. If you renamed the directory, you're
 fine. But if you moved it in some way, you may need to modify these paths inside
 those files::
 

console/style.rst

@@ -226,7 +226,7 @@ User Input Methods
 
         $io->ask('What is your name?');
 
-    You can pass the default value as the second argument so the user can simply
+    You can pass the default value as the second argument so the user can
     hit the <Enter> key to select that value::
 
         $io->ask('Where are you from?', 'United States');
@@ -262,7 +262,7 @@ User Input Methods
 
         $io->confirm('Restart the web server?');
 
-    You can pass the default value as the second argument so the user can simply
+    You can pass the default value as the second argument so the user can
     hit the <Enter> key to select that value::
 
         $io->confirm('Restart the web server?', true);
@@ -273,7 +273,7 @@ User Input Methods
 
         $io->choice('Select the queue to analyze', ['queue1', 'queue2', 'queue3']);
 
-    You can pass the default value as the third argument so the user can simply
+    You can pass the default value as the third argument so the user can
     hit the <Enter> key to select that value::
 
         $io->choice('Select the queue to analyze', ['queue1', 'queue2', 'queue3'], 'queue1');

create_framework/http_foundation.rst

@@ -52,7 +52,7 @@ As you can see for yourself, the simple code we had written first is not that
 simple anymore if we want to avoid PHP warnings/notices and make the code
 more secure.
 
-Beyond security, this code is not even easily testable. Even if there is not
+Beyond security, this code can be complex to test. Even if there is not
 much to test, it strikes me that writing unit tests for the simplest possible
 snippet of PHP code is not natural and feels ugly. Here is a tentative PHPUnit
 unit test for the above code::
@@ -126,10 +126,10 @@ containing the new requirement.
 .. sidebar:: Class Autoloading
 
     When installing a new dependency, Composer also generates a
-    ``vendor/autoload.php`` file that allows any class to be easily
-    `autoloaded`_. Without autoloading, you would need to require the file
-    where a class is defined before being able to use it. But thanks to
-    `PSR-4`_, we can just let Composer and PHP do the hard work for us.
+    ``vendor/autoload.php`` file that allows any class to be `autoloaded`_.
+    Without autoloading, you would need to require the file where a class
+    is defined before being able to use it. But thanks to `PSR-4`_,
+    we can just let Composer and PHP do the hard work for us.
 
 Now, let's rewrite our application by using the ``Request`` and the
 ``Response`` classes::

email/dev_environment.rst

@@ -6,10 +6,10 @@ How to Work with Emails during Development
 
 When developing an application which sends email, you will often
 not want to actually send the email to the specified recipient during
-development. If you are using the default Symfony mailer, you
-can achieve this through configuration settings without having to
-make any changes to your application's code at all. There are two main
-choices when it comes to handling email during development: (a) disabling the
+development. If you are using the SwiftmailerBundle with Symfony, you
+can achieve this through configuration settings without having to make
+any changes to your application's code at all. There are two main choices
+when it comes to handling email during development: (a) disabling the
 sending of email altogether or (b) sending all email to a specific
 address (with optional exceptions).