Merge branch '4.1'

* 4.1:
  review doc chapter for belittling words
  review getting started chapter for belittling words
  review best practice chapter for belittling words

Author: javiereguiluz

best_practices/business-logic.rst

@@ -110,7 +110,7 @@ Both formats have the same performance, so this is ultimately a matter of
 personal taste.
 
 We recommend YAML because it's friendly to newcomers and concise. You can
-of course use whatever format you like.
+use any of the other formats if you prefer another format.
 
 Using a Persistence Layer
 -------------------------

best_practices/controllers.rst

@@ -181,7 +181,7 @@ When Things Get More Advanced
 
 The above example works without any configuration because the wildcard name
 ``{id}`` matches the name of the property on the entity. If this isn't true, or
-if you have even more complex logic, the easiest thing to do is just query for
+if you have even more complex logic, your best choice is to query for
 the entity manually. In our application, we have this situation in
 ``CommentController``::
 

best_practices/introduction.rst

@@ -49,8 +49,8 @@ It's also a moving target that will continue to improve.
 
 Keep in mind that these are **optional recommendations** that you and your
 team may or may not follow to develop Symfony applications. If you want to
-continue using your own best practices and methodologies, you can of course
-do it. Symfony is flexible enough to adapt to your needs. That will never
+continue using your own best practices and methodologies, you can still do
+that. Symfony is flexible enough to adapt to your needs. That will never
 change.
 
 Who this Book Is for (Hint: It's not a Tutorial)

best_practices/templates.rst

@@ -58,7 +58,7 @@ Twig Extensions
 
 Our application needs a custom ``md2html`` Twig filter so that we can transform
 the Markdown contents of each post into HTML. To do this, create a new
-``Markdown`` class that will be used later by the Twig extension. It just needs
+``Markdown`` class that will be used later by the Twig extension. It needs
 to define one single method to transform Markdown content into HTML::
 
     namespace App\Utils;

best_practices/tests.rst

@@ -27,8 +27,8 @@ functional tests, you can quickly spot any big errors before you deploy them:
     Define a functional test that at least checks if your application pages
     are successfully loading.
 
-A functional test like this is simple to implement thanks to
-:ref:`PHPUnit data providers <testing-data-providers>`::
+:ref:`PHPUnit data providers <testing-data-providers>` help you implement
+functional tests::
 
     // tests/ApplicationAvailabilityFunctionalTest.php
     namespace App\Tests;

bundles/best_practices.rst

@@ -23,7 +23,7 @@ vendor segment, followed by zero or more category segments, and it ends with the
 namespace short name, which must end with ``Bundle``.
 
 A namespace becomes a bundle as soon as you add a bundle class to it. The
-bundle class name must follow these simple rules:
+bundle class name must follow these rules:
 
 * Use only alphanumeric characters and underscores;
 * Use a StudlyCaps name (i.e. camelCase with the first letter uppercased);
@@ -467,8 +467,9 @@ Retrieve the configuration parameters in your code from the container::
 
     $container->getParameter('acme_blog.author.email');
 
-Even if this mechanism is simple enough, you should consider using the more
-advanced :doc:`semantic bundle configuration </bundles/configuration>`.
+While this mechanism requires the least effort, you should consider using the
+more advanced :doc:`semantic bundle configuration </bundles/configuration>` to
+make your configuration more robust.
 
 Versioning
 ----------

bundles/override.rst

@@ -68,7 +68,7 @@ the routes from any bundle, then they must be manually imported from somewhere
 in your application (e.g. ``config/routes.yaml``).
 
 The easiest way to "override" a bundle's routing is to never import it at
-all. Instead of importing a third-party bundle's routing, simply copy
+all. Instead of importing a third-party bundle's routing, copy
 that routing file into your application, modify it, and import it instead.
 
 Controllers

configuration/configuration_organization.rst

@@ -5,7 +5,7 @@ How to Organize Configuration Files
 ===================================
 
 The Symfony skeleton defines three :doc:`execution environments </configuration/environments>`
-called ``dev``, ``prod`` and ``test``. An environment simply represents a way
+called ``dev``, ``prod`` and ``test``. An environment represents a way
 to execute the same codebase with different configurations.
 
 In order to select the configuration file to load for each environment, Symfony
@@ -129,9 +129,9 @@ Global Configuration Files
 
 Some system administrators may prefer to store sensitive parameters in files
 outside the project directory. Imagine that the database credentials for your
-website are stored in the ``/etc/sites/mysite.com/parameters.yaml`` file. Loading
-this file is as simple as indicating the full file path when importing it from
-any other configuration file:
+website are stored in the ``/etc/sites/mysite.com/parameters.yaml`` file. You
+can load files from outside the project folder by indicating the full file path
+when importing it from any other configuration file:
 
 .. configuration-block::
 

configuration/environments.rst

@@ -203,7 +203,7 @@ Creating a new Environment
 --------------------------
 
 Since an environment is nothing more than a string that corresponds to a set of
-configuration, creating a new environment is quite easy.
+configuration, you can also create your own environments for specific purposes.
 
 Suppose, for example, that before deployment, you need to benchmark your
 application. One way to benchmark the application is to use near-production
@@ -359,7 +359,7 @@ includes the following:
 
 .. note::
 
-    You can easily change the directory location and name. For more information
+    You can change the directory location and name. For more information
     read the article :doc:`/configuration/override_dir_structure`.
 
 Going further

configuration/front_controllers_and_kernel.rst

@@ -51,7 +51,7 @@ You can choose the front controller that's used by adding it in the URL, like:
      http://localhost/index.php/some/path/...
 
 As you can see, this URL contains the PHP script to be used as the front
-controller. You can use that to easily switch to a custom made front controller
+controller. You can use that to switch to a custom made front controller
 that is located in the ``public/`` directory.
 
 .. seealso::
@@ -123,7 +123,7 @@ controller to make use of the new kernel.
 The Environments
 ----------------
 
-As just mentioned, the ``Kernel`` has to implement another method -
+As mentioned above, the ``Kernel`` has to implement another method -
 :method:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait::configureContainer`.
 This method is responsible for loading the application's configuration from the
 right *environment*.