Merge branch '4.4'

* 4.4:
  Reworded the docs about Doctrine events

Author: javiereguiluz

_build/redirection_map

@@ -458,3 +458,5 @@
 /templating/embedding_controllers /templates
 /templating/inheritance /templates
 /testing/doctrine /testing/database
+/doctrine/lifecycle_callbacks /doctrine/events
+/doctrine/event_listeners_subscribers /doctrine/events

controller/upload_file.rst

@@ -347,9 +347,8 @@ Using a Doctrine Listener
 -------------------------
 
 The previous versions of this article explained how to handle file uploads using
-:doc:`Doctrine listeners </doctrine/event_listeners_subscribers>`. However, this
-is no longer recommended, because Doctrine events shouldn't be used for your
-domain logic.
+:ref:`Doctrine listeners <doctrine-lifecycle-listener>`. However, this is no longer
+recommended, because Doctrine events shouldn't be used for your domain logic.
 
 Moreover, Doctrine listeners are often dependent on internal Doctrine behavior
 which may change in future versions. Also, they can introduce performance issues

doctrine.rst

@@ -808,8 +808,7 @@ Learn more
 
     doctrine/associations
     doctrine/common_extensions
-    doctrine/lifecycle_callbacks
-    doctrine/event_listeners_subscribers
+    doctrine/events
     doctrine/registration_form
     doctrine/custom_dql_functions
     doctrine/dbal

doctrine/common_extensions.rst

@@ -14,8 +14,7 @@ functionality for `Sluggable`_, `Translatable`_, `Timestampable`_, `Loggable`_,
 The usage for each of these extensions is explained in that repository.
 
 However, to install/activate each extension you must register and activate an
-:doc:`Event Listener </doctrine/event_listeners_subscribers>`.
-To do this, you have two options:
+:ref:`Doctrine event Listener <doctrine-lifecycle-listener>`. To do this, you have two options:
 
 #. Use the `StofDoctrineExtensionsBundle`_, which integrates the above library.