Fix deprecation warning removal notice to 6.0.

The 2 notice say contradicting things, fallback to the later.

IPython/core/builtin_trap.py

@@ -57,7 +57,7 b' class BuiltinTrap(Configurable):'
             from IPython.lib import deepreload
             if self.shell.deep_reload:
                 from warnings import warn
-                warn("Automatically replacing builtin `reload` by `deepreload.reload` is deprecated and will be removed in IPython 6.0, please import `reload` explicitly from `IPython.lib.deeprelaod", DeprecationWarning)
+                warn("Automatically replacing builtin `reload` by `deepreload.reload` is deprecated since IPython 4.0, please import `reload` explicitly from `IPython.lib.deepreload", DeprecationWarning)
                 self.auto_builtins['reload'] = deepreload._dreload
             else:
                 self.auto_builtins['dreload']= deepreload._dreload

IPython/lib/deepreload.py

@@ -350,12 +350,12 b' def _dreload(module, **kwargs):'
     import reload explicitly from `IPython.lib.deepreload` to use it
 
     """
+    # this was marked as deprecated and for 5.0 removal, but
+    # IPython.core_builtin_trap have a Deprecation warning for 6.0, so cannot
+    # remove that now.
     warn("""
-injecting `dreload` in interactive namespace is deprecated, and will be removed in IPython 5.0. 
+injecting `dreload` in interactive namespace is deprecated since IPython 4.0. 
 Please import `reload` explicitly from `IPython.lib.deepreload`.
 """, DeprecationWarning, stacklevel=2)
     reload(module, **kwargs)
 
-# Uncomment the following to automatically activate deep reloading whenever
-# this module is imported
-#builtin_mod.reload = reload