[FrameworkBundle] Update serializer configuration reference

Author: dunglas

cookbook/serializer.rst

@@ -124,6 +124,8 @@ Here is an example on how to load the
         $definition->addTag('serializer.normalizer');
         $container->setDefinition('get_set_method_normalizer', $definition);
 
+.. _cookbook-serializer-using-serialization-groups-annotations:
+
 Using Serialization Groups Annotations
 --------------------------------------
 
@@ -170,6 +172,8 @@ to your class and choose which groups to use when serializing::
         'json', array('groups' => array('group1')
     );
 
+.. _cookbook-serializer-enabling-metadata-cache:
+
 Enabling the Metadata Cache
 ---------------------------
 

reference/configuration/framework.rst

@@ -1,5 +1,5 @@
 .. index::
-    single: Configuration reference; Framework
+single: Configuration reference; Framework
 
 FrameworkBundle Configuration ("framework")
 ===========================================
@@ -92,7 +92,7 @@ Configuration
 * `validation`_
     * :ref:`enabled <reference-validation-enabled>`
     * :ref:`cache <reference-validation-cache>`
-    * `enable_annotations`_
+    * :ref:`enable_annotations <reference-validation-enable_annotations>`
     * `translation_domain`_
     * `strict_email`_
     * `api`_
@@ -102,6 +102,8 @@ Configuration
     * `debug`_
 * `serializer`_
     * :ref:`enabled <reference-serializer-enabled>`
+    * :ref:`cache <reference-serializer-cache>`
+    * :ref:`enable_annotations <reference-serializer-enable_annotations>`
 
 secret
 ~~~~~~
@@ -134,7 +136,7 @@ http_method_override
 ~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    The ``http_method_override`` option was introduced in Symfony 2.3.
+The ``http_method_override`` option was introduced in Symfony 2.3.
 
 **type**: ``boolean`` **default**: ``true``
 
@@ -177,7 +179,7 @@ Configures the IP addresses that should be trusted as proxies. For more
 details, see :doc:`/cookbook/request/load_balancer_reverse_proxy`.
 
 .. versionadded:: 2.3
-    CIDR notation support was introduced in Symfony 2.3, so you can whitelist
+CIDR notation support was introduced in Symfony 2.3, so you can whitelist
     whole subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``).
 
 .. configuration-block::
@@ -226,7 +228,7 @@ using the following keys:
 * ``sublime``
 
 .. versionadded:: 2.3.14
-    The ``emacs`` and ``sublime`` editors were introduced in Symfony 2.3.14.
+The ``emacs`` and ``sublime`` editors were introduced in Symfony 2.3.14.
 
 You can also specify a custom url string. If you do this, all percentage
 signs (``%``) must be doubled to escape that character. For example, if
@@ -522,7 +524,7 @@ enabled
 .......
 
 .. versionadded:: 2.2
-    The ``enabled`` option was introduced in Symfony 2.2. Prior to Symfony
+The ``enabled`` option was introduced in Symfony 2.2. Prior to Symfony
     2.2, the profiler could only be disabled by omitting the ``framework.profiler``
     configuration entirely.
 
@@ -542,7 +544,7 @@ collect
 .......
 
 .. versionadded:: 2.3
-    The ``collect`` option was introduced in Symfony 2.3. Previously, when
+The ``collect`` option was introduced in Symfony 2.3. Previously, when
     ``profiler.enabled`` was ``false``, the profiler *was* actually enabled,
     but the collectors were disabled. Now, the profiler and the collectors
     can be controlled independently.
@@ -1299,7 +1301,7 @@ fallbacks
 **type**: ``string|array`` **default**: ``array('en')``
 
 .. versionadded:: 2.3.25
-    The ``fallbacks`` option was introduced in Symfony 2.3.25. Prior
+The ``fallbacks`` option was introduced in Symfony 2.3.25. Prior
     to Symfony 2.3.25, it was called ``fallback`` and only allowed one fallback
     language defined as a string. Please note that you can still use the
     old ``fallback`` option if you want define only one fallback.
@@ -1317,7 +1319,7 @@ logging
 .......
 
 .. versionadded:: 2.6
-    The ``logging`` option was introduced in Symfony 2.6.
+The ``logging`` option was introduced in Symfony 2.6.
 
 **default**: ``true`` when the debug mode is enabled, ``false`` otherwise.
 
@@ -1372,6 +1374,8 @@ cache
 The service that is used to persist class metadata in a cache. The service
 has to implement the :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`.
 
+.. _reference-validation-enable_annotations:
+
 enable_annotations
 ..................
 
@@ -1391,7 +1395,7 @@ strict_email
 ............
 
 .. versionadded:: 2.5
-    The ``strict_email`` option was introduced in Symfony 2.5.
+The ``strict_email`` option was introduced in Symfony 2.5.
 
 **type**: ``Boolean`` **default**: ``false``
 
@@ -1403,7 +1407,7 @@ api
 ...
 
 .. versionadded:: 2.5
-    The ``api`` option was introduced in Symfony 2.5.
+The ``api`` option was introduced in Symfony 2.5.
 
 **type**: ``string``
 
@@ -1478,7 +1482,32 @@ enabled
 
 Whether to enable the ``serializer`` service or not in the service container.
 
-For more details, see :doc:`/cookbook/serializer`.
+.. _reference-serializer-cache:
+
+cache
+.....
+
+**type**: ``string``
+
+The service that is used to persist class metadata in a cache. The service
+has to implement the :class:`Doctrine\\Common\\Cache\\Cache` interface.
+
+.. seealso::
+
+    For more information, see :ref:`cookbook-serializer-enabling-metadata-cache`.
+
+.. _reference-serializer-enable_annotations:
+
+enable_annotations
+..................
+
+**type**: ``boolean`` **default**: ``false``
+
+If this option is enabled, serialization groups can be defined using annotations.
+
+.. seealso::
+
+    For more information, see :ref:`cookbook-serializer-using-serialization-groups-annotations`.
 
 Full Default Configuration
 --------------------------