Merge branch '2.1' into 2.2

Author: dunglas

index.md

@@ -38,17 +38,22 @@
             1. [Using Doctrine Filters](core/filters.md#using-doctrine-filters)
         2.  [Overriding Extraction of Properties from the Request](core/filters.md#overriding-extraction-of-properties-from-the-request)
     4.  [ApiFilter Annotation](core/filters.md#apifilter-annotation)
-7.  [Serialization Groups and Relations](core/serialization-groups-and-relations.md)
-    1.  [Configuration](core/serialization-groups-and-relations.md#configuration)
-    2.  [Using Different Serialization Groups per Operation](core/serialization-groups-and-relations.md#embedding-relations)
-    3.  [Embedding Relations](core/serialization-groups-and-relations.md#embedding-relations)
-        1.  [Normalization](core/serialization-groups-and-relations.md#normalization)
-        2.  [Denormalization](core/serialization-groups-and-relations.md#denormalization)
-        3.  [Changing the Serialization Context Dynamically](core/serialization-groups-and-relations.md#changing-the-serialization-context-dynamically)
-    4.  [Name Conversion](core/serialization-groups-and-relations.md#name-conversion)
-    5.  [Entity Identifier Case](core/serialization-groups-and-relations.md#entity-identifier-case)
-    6.  [Writable Entity Identifier](core/serialization-groups-and-relations.md#writable-entity-identifier)
-    7.  [Embedding the Context](core/serialization-groups-and-relations.md#embedding-the-context)
+7.  [The Serialization Process](core/serialization.md)
+    1.  [Overall Process](core/serialization.md#overall-process)
+    2.  [Available Serializers](core/serialization.md#available-serializers)
+    3.  [The Serialization Context, Groups and Relations](core/serialization.md#the-serialization-context-groups-and-relations)
+        1.  [Configuration](core/serialization.md#configuration)
+    4.  [Using Serialization Groups](core/serialization.md#using-serialization-groups)
+    5.  [Using Different Serialization Groups per Operation](core/serialization.md#using-different-serialization-groups-per-operation)
+        1.  [Embedding Relations](core/serialization.md#embedding-relations)
+        2.  [Normalization](core/serialization.md#normalization)
+        2.  [Denormalization](core/serialization.md#denormalization)
+    6.  [Changing the Serialization Context Dynamically](core/serialization.md#changing-the-serialization-context-dynamically)
+    7.  [Changing the Serialization Context on a Per Item Basis](core/serialization.md#changing-the-serialization-context-on-a-per-item-basis)
+    8.  [Name Conversion](core/serialization.md#name-conversion)
+    9.  [Decorating a Serializer and Add Extra Data](core/serialization.md#decorating-a-serializer-and-add-extra-data)
+    10. [Entity Identifier Case](core/serialization.md#entity-identifier-case)
+    11. [Embedding the JSON-LD Context](core/serialization.md#embedding-the-json-ld-context)
 8.  [Validation](core/validation.md)
     1.  [Using Validation Groups](core/validation.md#using-validation-groups)
     2.  [Dynamic Validation Groups](core/validation.md#dynamic-validation-groups)