diff --git a/components/class_loader/class_loader.rst b/components/class_loader/class_loader.rst
index 246ee38a68a..1bef3f652d9 100644
--- a/components/class_loader/class_loader.rst
+++ b/components/class_loader/class_loader.rst
@@ -12,8 +12,7 @@ load all of your project's classes.
 
     You can use both the ``ApcClassLoader`` and the ``XcacheClassLoader`` to
     :doc:`cache </components/class_loader/cache_class_loader>` a ``ClassLoader``
-    instance or the ``DebugClassLoader`` to :doc:`debug </components/class_loader/debug_class_loader>`
-    it.
+    instance.
 
 Usage
 -----
diff --git a/components/class_loader/debug_class_loader.rst b/components/class_loader/debug_class_loader.rst
deleted file mode 100644
index 75bf66c707a..00000000000
--- a/components/class_loader/debug_class_loader.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. index::
-    single: ClassLoader; DebugClassLoader
-
-Debugging a Class Loader
-========================
-
-.. caution::
-
-    The ``DebugClassLoader`` from the ClassLoader component was deprecated
-    in Symfony 2.5 and will be removed in Symfony 3.0. Use the
-    :doc:`DebugClassLoader provided by the Debug component </components/debug/class_loader>`.
diff --git a/components/class_loader/index.rst b/components/class_loader/index.rst
index 9808f59c6d8..01225f4d523 100644
--- a/components/class_loader/index.rst
+++ b/components/class_loader/index.rst
@@ -9,5 +9,4 @@ ClassLoader
     psr4_class_loader
     map_class_loader
     cache_class_loader
-    debug_class_loader
     class_map_generator
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
index 8b31392f70c..49c3d550450 100644
--- a/components/http_foundation/introduction.rst
+++ b/components/http_foundation/introduction.rst
@@ -250,8 +250,8 @@ by using the following methods:
 :method:`Symfony\\Component\\HttpFoundation\\Request::getCharsets`
     Returns the list of accepted charsets ordered by descending quality.
 
-* :method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings`:
-  returns the list of accepted charsets ordered by descending quality;
+:method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings`
+    Returns the list of accepted encodings ordered by descending quality.
 
   .. versionadded:: 2.4
       The ``getEncodings()`` method was introduced in Symfony 2.4.
diff --git a/components/map.rst.inc b/components/map.rst.inc
index 02731ec21a8..b8566f83203 100644
--- a/components/map.rst.inc
+++ b/components/map.rst.inc
@@ -7,7 +7,6 @@
   * :doc:`/components/class_loader/psr4_class_loader`
   * :doc:`/components/class_loader/map_class_loader`
   * :doc:`/components/class_loader/cache_class_loader`
-  * :doc:`/components/class_loader/debug_class_loader`
   * :doc:`/components/class_loader/class_map_generator`
 
 * :doc:`/components/config/index`
diff --git a/redirection_map b/redirection_map
index e632d829662..830d910e59c 100644
--- a/redirection_map
+++ b/redirection_map
@@ -14,6 +14,7 @@
 /cookbook/service_container/tags /components/dependency_injection/tags
 /reference/configuration/mongodb /bundles/DoctrineMongoDBBundle/config
 /reference/YAML /components/yaml
+/components/class_loader/debug_class_loader /components/debug/class_loader
 /components/dependency_injection /components/dependency_injection/introduction
 /components/event_dispatcher /components/event_dispatcher/introduction
 /components/http_foundation /components/http_foundation/introduction