Merge branch '3.1'

Author: wouterj

components/dependency_injection/compilation.rst

@@ -359,7 +359,7 @@ methods described in :doc:`/service_container/definitions`.
 
 A common use-case of compiler passes is to search for all service definitions
 that have a certain tag in order to process dynamically plug each into some
-other service. See the section on :ref:`service tags <components-di-compiler-pass-tags>`
+other service. See the section on :ref:`service tags <service-container-compiler-pass-tags>`
 for an example.
 
 .. _components-di-separate-compiler-passes:

form/data_transformers.rst

@@ -335,7 +335,7 @@ Define the form type as a service in your configuration files.
 .. tip::
 
     For more information about defining form types as services, read
-    :ref:`register your form type as a service <form-as-services>`.
+    :doc:`register your form type as a service </form/form_dependencies>`.
 
 Now, you can easily use your ``TaskType``::
 

form/rendering.rst

@@ -42,7 +42,7 @@ the other functions do?
 
 The majority of the work is done by the ``form_row`` helper, which renders
 the label, errors and HTML form widget of each field inside a ``div`` tag by
-default. In the :ref:`form-theming` section, you'll learn how the ``form_row``
+default. In the :doc:`/form/form_themes` section, you'll learn how the ``form_row``
 output can be customized on many different levels.
 
 .. tip::

form/use_empty_data.rst

@@ -68,7 +68,7 @@ The point is, you can set ``empty_data`` to the exact "new" object that you want
 .. tip::
 
     In order to pass arguments to the ``BlogType`` constructor, you'll need to
-    :ref:`register it as a service and tag with form.type <form-as-services>`.
+    :doc:`register it as a service and tag with form.type </form/form_dependencies>`.
 
 Option 2: Provide a Closure
 ---------------------------

reference/configuration/framework.rst

@@ -1128,7 +1128,7 @@ resources
 
 A list of all resources for form theming in PHP. This setting is not required
 if you're using the Twig format for your templates, in that case refer to
-:ref:`the form book chapter <forms-theming-twig>`.
+:ref:`the form book chapter <book-forms-theming-twig>`.
 
 Assume you have custom global form themes in
 ``src/WebsiteBundle/Resources/views/Form``, you can configure this like:
@@ -1189,7 +1189,7 @@ Assume you have custom global form themes in
 
 .. seealso::
 
-    See :ref:`forms-theming-global` for more information.
+    See :ref:`book-forms-theming-global` for more information.
 
 .. _reference-templating-cache:
 

service_container/tags.rst

@@ -189,6 +189,8 @@ Notice that each service was given a tag named ``app.mail_transport``. This is
 the custom tag that you'll use in your compiler pass. The compiler pass is what
 makes this tag "mean" something.
 
+.. _service-container-compiler-pass-tags:
+
 Create a Compiler Pass
 ~~~~~~~~~~~~~~~~~~~~~~