Merge branch '3.1'

Author: wouterj

controller/argument_value_resolver.rst

@@ -7,7 +7,7 @@ Extending Action Argument Resolving
 .. versionadded:: 3.1
     The ``ArgumentResolver`` and value resolvers were introduced in Symfony 3.1.
 
-In the book, you've learned that you can get the
+In the :doc:`controller guide </controller>`, you've learned that you can get the
 :class:`Symfony\\Component\\HttpFoundation\\Request` object via an argument in
 your controller. This argument has to be type-hinted by the ``Request`` class
 in order to be recognized. This is done via the

form/without_class.rst

@@ -60,8 +60,6 @@ an array.
     a better choice, since it returns the data (usually an object) after
     it's been transformed by the Form component.
 
-.. _booking-validation-forms:
-
 Adding Validation
 -----------------