Merge branch '4.2' into 4.3

* 4.2:
  Update conventions.rst
  Require Dotenv component without --dev
  Fixed a minor RST syntax issue

Author: javiereguiluz

bundles/override.rst

@@ -178,6 +178,6 @@ For this reason, you can override any bundle translation file from the main
 
 For example, to override the translations defined in the
 ``Resources/translations/FOSUserBundle.es.yml`` file of the FOSUserBundle,
-create a``<your-project>/translations/FOSUserBundle.es.yml`` file.
+create a ``<your-project>/translations/FOSUserBundle.es.yml`` file.
 
 .. _`the Doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/inheritance-mapping.html#overrides

components/dotenv.rst

@@ -13,7 +13,7 @@ Installation
 
 .. code-block:: terminal
 
-    $ composer require --dev symfony/dotenv
+    $ composer require symfony/dotenv
 
 .. include:: /components/require_autoload.rst.inc
 

contributing/code/conventions.rst

@@ -124,7 +124,7 @@ between the namespace and the use declarations, like in this example from
     /**
      * @author Adrien Brault <[email protected]>
      *
-     * @deprecated ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.
+     * @deprecated since Symfony 3.2, to be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.
      */
     class ArrayParserCache implements ParserCacheInterface