Merge branch '3.4' into 4.1

* 3.4:
  Grammar fix
  [Webpack Encore] Fixed code display

Author: javiereguiluz

create_framework/http_foundation.rst

@@ -264,7 +264,7 @@ explicitly trust your reverse proxies by calling ``setTrustedProxies()``::
 
 So, the ``getClientIp()`` method works securely in all circumstances. You can
 use it in all your projects, whatever the configuration is, it will behave
-correctly and safely. That's one of the goal of using a framework. If you were
+correctly and safely. That's one of the goals of using a framework. If you were
 to write a framework from scratch, you would have to think about all these
 cases by yourself. Why not using a technology that already works?
 

frontend/encore/split-chunks.rst

@@ -50,8 +50,6 @@ The logic for *when* and *how* to split the files is controlled by the
 `SplitChunksPlugin from Webpack`_. You can control the configuration passed to
 this plugin with the ``configureSplitChunks()`` function:
 
-.. code-block:: js
-
 .. code-block:: diff
 
     Encore