From d5b61545e2b736e0a818731e0173ddeb3baf451b Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 19 Oct 2017 09:36:38 +0200
Subject: [PATCH 1/3] Documented the framework.serializer.mapping config option

---
 reference/configuration/framework.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index c9ecfa4800b..4ba97dcea88 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -107,6 +107,8 @@ Configuration
     * :ref:`enable_annotations <reference-serializer-enable_annotations>`
     * :ref:`name_converter <reference-serializer-name_converter>`
     * :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
+    * `mapping`_
+        * :ref:`paths <reference-serializer-mapping-paths>`
 * `php_errors`_
     * `log`_
     * `throw`_
@@ -1692,6 +1694,19 @@ method.
     For more information, see
     :ref:`component-serializer-handling-circular-references`.
 
+mapping
+.......
+
+.. _reference-serializer-mapping-paths:
+
+paths
+"""""
+
+**type**: ``array`` **default**: ``[]``
+
+This option allows to define an array of paths with files or directories where
+the component will look for additional validation files.
+
 php_errors
 ~~~~~~~~~~
 

From d3f95222b841fc219cdb36e4322d8e72efb63872 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 25 Oct 2017 13:26:38 +0200
Subject: [PATCH 2/3] Fixed the reference to a repeated config option

---
 reference/configuration/framework.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index 4ba97dcea88..c4c02275c00 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -95,7 +95,7 @@ Configuration
     * :ref:`enable_annotations <reference-validation-enable_annotations>`
     * `translation_domain`_
     * `strict_email`_
-    * `mapping`_
+    * :ref:`mapping <reference-validation-mapping>`
         * :ref:`paths <reference-validation-mapping-paths>`
 * `annotations`_
     * :ref:`cache <reference-annotations-cache>`
@@ -107,7 +107,7 @@ Configuration
     * :ref:`enable_annotations <reference-serializer-enable_annotations>`
     * :ref:`name_converter <reference-serializer-name_converter>`
     * :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
-    * `mapping`_
+    * :ref:`mapping <reference-serializer-mapping>`
         * :ref:`paths <reference-serializer-mapping-paths>`
 * `php_errors`_
     * `log`_
@@ -1569,6 +1569,8 @@ If this option is enabled, the `egulias/email-validator`_ library will be
 used by the :doc:`/reference/constraints/Email` constraint validator. Otherwise,
 the validator uses a simple regular expression to validate email addresses.
 
+.. _reference-validation-mapping:
+
 mapping
 .......
 
@@ -1694,6 +1696,8 @@ method.
     For more information, see
     :ref:`component-serializer-handling-circular-references`.
 
+.. _reference-serializer-mapping:
+
 mapping
 .......
 

From 8a1b7e0b4121b55dc110ce5680d465a6b17fcad9 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Thu, 16 Nov 2017 15:04:41 +0200
Subject: [PATCH 3/3] fix typo

---
 reference/configuration/framework.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index c4c02275c00..ef437247a45 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -1709,7 +1709,7 @@ paths
 **type**: ``array`` **default**: ``[]``
 
 This option allows to define an array of paths with files or directories where
-the component will look for additional validation files.
+the component will look for additional serialization files.
 
 php_errors
 ~~~~~~~~~~