diff --git a/serializer.rst b/serializer.rst
index e79c8446ff7..75b38c49d33 100644
--- a/serializer.rst
+++ b/serializer.rst
@@ -4,19 +4,23 @@
 How to Use the Serializer
 =========================
 
-Serializing and deserializing to and from objects and different formats (e.g.
-JSON or XML) is a very complex topic. Symfony comes with a
-:doc:`Serializer Component </components/serializer>`, which gives you some
-tools that you can leverage for your solution.
+Symfony provides a serializer to serialize/deserialize to and from objects and
+different formats (e.g. JSON or XML). Before using it, read the
+:doc:`Serializer component docs </components/serializer>` to get familiar with
+its philosophy and the normalizers and encoders terminology.
 
-In fact, before you start, get familiar with the serializer, normalizers
-and encoders by reading the :doc:`Serializer Component </components/serializer>`.
+.. _activating_the_serializer:
 
-Activating the Serializer
+Installing the Serializer
 -------------------------
 
-The ``serializer`` service is not available by default. To turn it on, activate
-it in your configuration:
+Before using the serializer, run this command to install it in your application:
+
+.. code-block:: terminal
+
+    $ composer require serializer
+
+Then, enable the serializer in the framework config:
 
 .. configuration-block::
 
@@ -65,7 +69,7 @@ it in your configuration:
 Using the Serializer Service
 ----------------------------
 
-Once enabled, the ``serializer`` service can be injected in any service where
+Once enabled, the serializer service can be injected in any service where
 you need it or it can be used in a controller::
 
     // src/Controller/DefaultController.php
@@ -85,7 +89,7 @@ you need it or it can be used in a controller::
 Adding Normalizers and Encoders
 -------------------------------
 
-Once enabled, the ``serializer`` service will be available in the container
+Once enabled, the serializer service will be available in the container
 and will be loaded with four :ref:`encoders <component-serializer-encoders>`
 (:class:`Symfony\\Component\\Serializer\\Encoder\\JsonEncoder`,
 :class:`Symfony\\Component\\Serializer\\Encoder\\XmlEncoder`,
@@ -193,12 +197,12 @@ to your class and choose which groups to use when serializing::
     );
 
 In addition to the ``@Groups`` annotation, the Serializer component also
-supports Yaml or XML files. These files are automatically loaded when being
+supports YAML or XML files. These files are automatically loaded when being
 stored in one of the following locations:
 
-* The ``serialization.yml`` or ``serialization.xml`` file in
+* The ``serialization.yaml`` or ``serialization.xml`` file in
   the ``Resources/config/`` directory of a bundle;
-* All ``*.yml`` and ``*.xml`` files in the ``Resources/config/serialization/``
+* All ``*.yaml`` and ``*.xml`` files in the ``Resources/config/serialization/``
   directory of a bundle.
 
 .. _serializer-enabling-metadata-cache:
@@ -302,9 +306,9 @@ take a look at how this bundle works.
 
 .. toctree::
     :maxdepth: 1
-    :glob:
 
-    serializer/*
+    serializer/encoders
+    serializer/custom_encoders
 
 .. _`APCu`: https://github.com/krakjoe/apcu
 .. _`ApiPlatform`: https://github.com/api-platform/core
diff --git a/serializer/custom_encoders.rst b/serializer/custom_encoders.rst
index a63b27efdf0..24ca040292e 100644
--- a/serializer/custom_encoders.rst
+++ b/serializer/custom_encoders.rst
@@ -15,7 +15,7 @@ to use another structure that's not supported.
 Creating a new encoder
 ----------------------
 
-Imagine you want to serialize and deserialize Yaml. For that you'll have to
+Imagine you want to serialize and deserialize YAML. For that you'll have to
 create your own encoder that uses the
 :doc:`Yaml Component </components/yaml>`::
 
@@ -53,13 +53,13 @@ Registering it in your app
 
 If you use the Symfony Framework. then you probably want to register this encoder
 as a service in your app. If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
-that's done automatically! 
+that's done automatically!
 
 .. tip::
 
-    If you're not using autoconfigure, make sure to register your class as a service
-    and tag it with ``serializer.encoder``.
+    If you're not using :ref:`autoconfigure <service_autoconfigure>`, make sure
+    to register your class as a service and tag it with ``serializer.encoder``.
 
-Now you'll be able to serialize and deserialize Yaml!
+Now you'll be able to serialize and deserialize YAML!
 
 .. _tracker: https://github.com/symfony/symfony/issues
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
index b5ba004db6c..ba4445ad42c 100644
--- a/service_container/3.3-di-changes.rst
+++ b/service_container/3.3-di-changes.rst
@@ -408,6 +408,8 @@ In general, the new best practice is to use normal constructor dependency inject
 (or "action" injection in controllers) instead of fetching public services via
 ``$this->get()`` (though that does still work).
 
+.. _service_autoconfigure:
+
 4) Auto-tagging with autoconfigure
 ----------------------------------