From 33e5b768b3da3164472724877ee667c26c21b8d6 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 18 Sep 2016 16:26:11 -0400
Subject: [PATCH] Moving files into the new structure

---
 .../{serializer/introduction.rst => serializer.rst}    |  7 +------
 components/serializer/index.rst                        |  8 --------
 serializer.rst                                         | 10 ++++++++--
 .../serializer => serializer}/custom_encoders.rst      |  0
 {components/serializer => serializer}/encoders.rst     |  0
 5 files changed, 9 insertions(+), 16 deletions(-)
 rename components/{serializer/introduction.rst => serializer.rst} (99%)
 delete mode 100644 components/serializer/index.rst
 rename {cookbook/serializer => serializer}/custom_encoders.rst (100%)
 rename {components/serializer => serializer}/encoders.rst (100%)

diff --git a/components/serializer/introduction.rst b/components/serializer.rst
similarity index 99%
rename from components/serializer/introduction.rst
rename to components/serializer.rst
index b704d1d3891..4d37c9d16d5 100644
--- a/components/serializer/introduction.rst
+++ b/components/serializer.rst
@@ -44,7 +44,7 @@ Usage
 
 Using the Serializer component is really simple. You just need to set up
 the :class:`Symfony\\Component\\Serializer\\Serializer` specifying
-which encoders and normalizers are going to be available::
+which encoders and normalizer are going to be available::
 
     use Symfony\Component\Serializer\Serializer;
     use Symfony\Component\Serializer\Encoder\XmlEncoder;
@@ -61,11 +61,6 @@ The preferred normalizer is the
 but other normalizers are available. All the examples shown below use
 the ``ObjectNormalizer``.
 
-.. seealso::
-
-    Read the dedicated sections to learn more about :doc:`/components/serializer/encoders`
-    and `Normalizers`_.
-
 Serializing an Object
 ---------------------
 
diff --git a/components/serializer/index.rst b/components/serializer/index.rst
deleted file mode 100644
index d2493f383ed..00000000000
--- a/components/serializer/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Serializer
-==========
-
-.. toctree::
-    :maxdepth: 2
-
-    introduction
-    encoders
diff --git a/serializer.rst b/serializer.rst
index 097a13cfcc5..005455f590a 100644
--- a/serializer.rst
+++ b/serializer.rst
@@ -226,8 +226,8 @@ A service leveraging `APCu`_ (and APC for PHP < 5.5) is built-in.
             ),
         ));
 
-Going Further with the Serializer Component
--------------------------------------------
+Going Further with the Serializer
+---------------------------------
 
 `ApiPlatform`_ provides an API system supporting `JSON-LD`_ and `Hydra Core Vocabulary`_
 hypermedia formats. It is built on top of the Symfony Framework and its Serializer
@@ -237,6 +237,12 @@ and a caching system.
 If you want to leverage the full power of the Symfony Serializer component,
 take a look at how this bundle works.
 
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    serializer/*
+
 .. _`APCu`: https://github.com/krakjoe/apcu
 .. _`ApiPlatform`: https://github.com/api-platform/core
 .. _`JSON-LD`: http://json-ld.org
diff --git a/cookbook/serializer/custom_encoders.rst b/serializer/custom_encoders.rst
similarity index 100%
rename from cookbook/serializer/custom_encoders.rst
rename to serializer/custom_encoders.rst
diff --git a/components/serializer/encoders.rst b/serializer/encoders.rst
similarity index 100%
rename from components/serializer/encoders.rst
rename to serializer/encoders.rst