Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 9330ec29fcdb · 2013-05-05T21:52:14.000-04:00
Conflicts:
	reference/dic_tags.rst
diff --git a/components/security/authentication.rst b/components/security/authentication.rst
@@ -119,7 +119,7 @@ from the user data storage, hash the password the user has just provided
 the given password is valid.
 
 This functionality is offered by the :class:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\DaoAuthenticationProvider`.
-It fetches the user's data from a :class:`Symfony\\Component\\Security\\Core\\User\\UserProviderInterface``,
+It fetches the user's data from a :class:`Symfony\\Component\\Security\\Core\\User\\UserProviderInterface`,
 uses a :class:`Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface`
 to create a hash of the password and returns an authenticated token if the
 password was valid::
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -31,6 +31,10 @@ may also be tags in other bundles you use that aren't listed here.
 +-----------------------------------+---------------------------------------------------------------------------+
 | `data_collector`_                 | Create a class that collects custom data for the profiler                 |
 +-----------------------------------+---------------------------------------------------------------------------+
+| `doctrine.event_listener`_        | Add a Doctrine event listener                                             |
++-----------------------------------+---------------------------------------------------------------------------+
+| `doctrine.event_subscriber`_      | Add a Doctrine event subscriber                                           |
++-----------------------------------+---------------------------------------------------------------------------+
 | `form.type`_                      | Create a custom form field type                                           |
 +-----------------------------------+---------------------------------------------------------------------------+
 | `form.type_extension`_            | Create a custom "form extension"                                          |
@@ -231,6 +235,22 @@ data_collector
 For details on creating your own custom data collection, read the cookbook
 article: :doc:`/cookbook/profiler/data_collector`.
 
+doctrine.event_listener
+--------------
+
+**Purpose**: Add a Doctrine event listener
+
+For details on creating Doctrine event listeners, read the cookbook article:
+:doc:`/cookbook/doctrine/event_listeners_subscribers`.
+
+doctrine.event_subscriber
+--------------
+
+**Purpose**: Add a Doctrine event subscriber
+
+For details on creating Doctrine event subscribers, read the cookbook article:
+:doc:`/cookbook/doctrine/event_listeners_subscribers`.
+
 .. _dic-tags-form-type:
 
 form.type
