Merge branch '4.0' into 4.1

* 4.0:
  Update service_container.rst
  hide Assetic pages from TOC
  [Validation]  Added internal link

Author: javiereguiluz

_build/redirection_map

@@ -80,12 +80,12 @@
 /bundles/installation /bundles
 /cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
 /cookbook/assetic/asset_management /frontend/assetic/asset_management
-/cookbook/assetic/index /frontend/assetic
+/cookbook/assetic/index /frontend/assetic/index
 /cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
 /cookbook/assetic/php /frontend/assetic/php
 /cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
 /cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
-/assetic /frontend/assetic
+/assetic /frontend/assetic/index
 /assetic/apply_to_option /frontend/assetic/apply_to_option
 /assetic/asset_management /frontend/assetic/asset_management
 /assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
@@ -370,13 +370,14 @@
 /event_dispatcher/class_extension /event_dispatcher
 /form /forms
 /form/use_virtual_forms /form/inherit_data_option
-/frontend/assetic/apply_to_option /frontend/assetic
-/frontend/assetic/asset_management /frontend/assetic
-/frontend/assetic/jpeg_optimize /frontend/assetic
-/frontend/assetic/php /frontend/assetic
-/frontend/assetic/uglifyjs /frontend/assetic
-/frontend/assetic/yuicompressor /frontend/assetic
-/reference/configuration/assetic /frontend/assetic
+/frontend/assetic /frontend/assetic/index
+/frontend/assetic/apply_to_option /frontend/assetic/index
+/frontend/assetic/asset_management /frontend/assetic/index
+/frontend/assetic/jpeg_optimize /frontend/assetic/index
+/frontend/assetic/php /frontend/assetic/index
+/frontend/assetic/uglifyjs /frontend/assetic/index
+/frontend/assetic/yuicompressor /frontend/assetic/index
+/reference/configuration/assetic /frontend/assetic/index
 /security/target_path /security
 /security/csrf_in_login_form /security/csrf
 /service_container/service_locators /service_container/service_subscribers_locators

frontend.rst

@@ -77,16 +77,14 @@ Full API
 
 * `Full API`_: https://github.com/symfony/webpack-encore/blob/master/index.js
 
-For more about Assetic, see :doc:`/frontend/assetic`.
-
 Other Front-End Articles
 ------------------------
 
 .. toctree::
     :hidden:
     :glob:
 
-    frontend/assetic
+    frontend/assetic/index
     frontend/encore/installation
     frontend/encore/simple-example
     frontend/encore/*

frontend/assetic.rst renamed to frontend/assetic/index.rst

@@ -1,7 +1,7 @@
 Encore Versus Assetic?
 ======================
 
-Symfony originally shipped with support for :doc:`Assetic </frontend/assetic>`: a
+Symfony originally shipped with support for :doc:`Assetic </frontend/assetic/index>`: 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.

frontend/encore/versus-assetic.rst

@@ -1010,7 +1010,7 @@ admin email. In this case, each needs to have a unique service id:
                     <argument>contact@example.com</argument>
                 </service>
 
-                <alias id="App\Updates\SiteUpdateManager" service="site_update_manager.superadmin" />
+                <service id="App\Updates\SiteUpdateManager" alias="site_update_manager.superadmin" />
             </services>
         </container>
 

service_container.rst

@@ -482,7 +482,7 @@ options can be specified in this way.
 This is purely meant to make the configuration of the most common option of
 a constraint shorter and quicker.
 
-If you're ever unsure of how to specify an option, either check the API documentation
+If you're ever unsure of how to specify an option, either check :namespace:`Symfony\\Component\\Validator\\Constraints`
 for the constraint or play it safe by always passing in an array of options
 (the first method shown above).