Merge branch '3.4'

* 3.4:
  fixing build
  Adding warning about non-service arguments

Author: weaverryan

controller.rst

@@ -338,6 +338,13 @@ controller's service config:
 You can of course also use normal :ref:`constructor injection <services-constructor-injection>`
 in your controllers.
 
+.. caution::
+
+    You can *only* pass *services* to your controller arguments in this way. It's
+    not possible, for example, to pass a service parameter as a controller argument.
+    If you need a parameter, use the ``$this->getParameter('kernel.debug')`` shortcut
+    or pass the value through your controller's ``__construct()`` method.
+
 For more information about services, see the :doc:`/service_container` article.
 
 .. _controller-service-arguments-tag:

frontend.rst

@@ -81,7 +81,7 @@ Assetic is a pure PHP library that helps to process & optimize your assets (simi
 to Encore). Even though we recommend using Encore, Assetic still works great. For
 a comparison, see :doc:`/frontend/encore/versus-assetic`.
 
-For more about Assetic, see :doc:`/assetic`.
+For more about Assetic, see :doc:`/frontend/assetic`.
 
 Other Front-End Articles
 ------------------------

frontend/encore/versus-assetic.rst

@@ -1,7 +1,7 @@
 Encore Versus Assetic?
 ======================
 
-Symfony originally shipped with support for :doc:`Assetic </assetic>`: a
+Symfony originally shipped with support for :doc:`Assetic </frontend/assetic>`: a
 pure PHP library capable of processing, combining and minifying CSS and JavaScript
 files. And while Encore is now the recommended way of processing your assets, Assetic
 still works well.