Merge branch '3.4' into 4.2

* 3.4:
  js -> javascript & jinja -> twig code blocks
  use max 2 blank lines

Author: javiereguiluz

cache.rst

@@ -324,8 +324,6 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
             ],
         ]);
 
-
-
 Creating a Cache Chain
 ----------------------
 

frontend/encore/installation.rst

@@ -51,7 +51,7 @@ Creating the webpack.config.js File
 Next, create a new ``webpack.config.js`` file at the root of your project. This
 is the main config file for both Webpack and Webpack Encore:
 
-.. code-block:: js
+.. code-block:: javascript
 
     var Encore = require('@symfony/webpack-encore');
 

reference/twig_reference.rst

@@ -253,7 +253,7 @@ information in :ref:`templating-pages`.
 absolute_url
 ~~~~~~~~~~~~
 
-.. code-block:: jinja
+.. code-block:: twig
 
     {{ absolute_url(path) }}
 
@@ -264,7 +264,7 @@ Returns the absolute URL from the passed relative path. For example, assume
 you're on the following page in your app:
 ``http://example.com/products/hover-board``.
 
-.. code-block:: jinja
+.. code-block:: twig
 
     {{ absolute_url('/human.txt') }}
     {# http://example.com/human.txt #}
@@ -275,7 +275,7 @@ you're on the following page in your app:
 relative_path
 ~~~~~~~~~~~~~
 
-.. code-block:: jinja
+.. code-block:: twig
 
     {{ relative_path(path) }}
 
@@ -286,7 +286,7 @@ Returns the relative path from the passed absolute URL. For example, assume
 you're on the following page in your app:
 ``http://example.com/products/hover-board``.
 
-.. code-block:: jinja
+.. code-block:: twig
 
     {{ relative_path('http://example.com/human.txt') }}
     {# ../human.txt #}
@@ -619,7 +619,7 @@ This will set the default domain in the current template.
 stopwatch
 ~~~~~~~~~
 
-.. code-block:: jinja
+.. code-block:: twig
 
     {% stopwatch 'name' %}...{% endstopwatch %}