Merge branch '3.4' into 4.3

* 3.4:
  [Encore] Replace "Encore.setPublicPrefix" by "Encore.setPublicPath"

Author: javiereguiluz

frontend/encore/faq.rst

@@ -59,7 +59,7 @@ My App Lives under a Subdirectory
 ---------------------------------
 
 If your app does not live at the root of your web server (i.e. it lives under a subdirectory,
-like ``/myAppSubdir``), you need to configure that when calling ``Encore.setPublicPrefix()``:
+like ``/myAppSubdir``), you will need to configure that when calling ``Encore.setPublicPath()``:
 
 .. code-block:: diff