Merge branch '4.2' into 4.3

* 4.2:
  Fix markup
  Use .xlf extension
  Removed blank line after filepath

Author: wouterj

bundles/best_practices.rst

@@ -354,7 +354,6 @@ following standardized instructions in your ``README.md`` file.
         in the ``config/bundles.php`` file of your project::
 
             // config/bundles.php
-
             return [
                 // ...
                 <vendor>\<bundle-name>\<bundle-long-name>::class => ['all' => true],

contributing/code/pull_requests.rst

@@ -129,7 +129,7 @@ work:
   </contributing/code/maintenance>` (you may have to choose a higher branch if
   the feature you are fixing was introduced in a later version);
 
- * ``master``, if you are adding a new feature.
+* ``master``, if you are adding a new feature.
 
 .. note::
 

translation/debug.rst

@@ -38,7 +38,7 @@ you've already setup some translations for the ``fr`` locale:
 
     .. code-block:: xml
 
-        <!-- translations/messages.fr.xliff -->
+        <!-- translations/messages.fr.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -69,7 +69,7 @@ and for the ``en`` locale:
 
     .. code-block:: xml
 
-        <!-- translations/messages.en.xliff -->
+        <!-- translations/messages.en.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">