unify EventDispatcher/event dispatcher usages

Author: xabbuh

Diff for: book/internals.rst

@@ -238,8 +238,8 @@ add the following code at the beginning of your listener method::
 
 .. tip::
 
-    If you are not yet familiar with the Symfony EventDispatcher, read the
-    :doc:`EventDispatcher component documentation </components/event_dispatcher/introduction>`
+    If you are not yet familiar with the Symfony EventDispatcher component,
+    read :doc:`its documentation </components/event_dispatcher/introduction>`
     section first.
 
 .. index::
@@ -433,8 +433,10 @@ and set a new ``Exception`` object, or do nothing::
 .. index::
    single: EventDispatcher
 
-The EventDispatcher
--------------------
+.. _the-eventdispatcher:
+
+The EventDispatcher Component
+-----------------------------
 
 The EventDispatcher is a standalone component that is responsible for much
 of the underlying logic and flow behind a Symfony request. For more information,

Diff for: components/event_dispatcher/container_aware_dispatcher.rst

@@ -8,9 +8,9 @@ Introduction
 ------------
 
 The :class:`Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher` is
-a special EventDispatcher implementation which is coupled to the service container
+a special ``EventDispatcher`` implementation which is coupled to the service container
 that is part of :doc:`the DependencyInjection component </components/dependency_injection/introduction>`.
-It allows services to be specified as event listeners making the EventDispatcher
+It allows services to be specified as event listeners making the ``EventDispatcher``
 extremely powerful.
 
 Services are lazy loaded meaning the services attached as listeners will only be
@@ -31,8 +31,8 @@ into the :class:`Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatc
 Adding Listeners
 ----------------
 
-The *Container Aware EventDispatcher* can either load specified services
-directly, or services that implement :class:`Symfony\\Component\\EventDispatcher\\EventSubscriberInterface`.
+The ``ContainerAwareEventDispatcher`` can either load specified services
+directly or services that implement :class:`Symfony\\Component\\EventDispatcher\\EventSubscriberInterface`.
 
 The following examples assume the service container has been loaded with any
 services that are mentioned.

Diff for: components/event_dispatcher/introduction.rst

@@ -591,8 +591,8 @@ specifically pass one::
 
     $dispatcher->dispatch('foo.event');
 
-Moreover, the EventDispatcher always returns whichever event object that was
-dispatched, i.e. either the event that was passed or the event that was
+Moreover, the event dispatcher always returns whichever event object that
+was dispatched, i.e. either the event that was passed or the event that was
 created internally by the dispatcher. This allows for nice shortcuts::
 
     if (!$dispatcher->dispatch('foo.event')->isPropagationStopped()) {

Diff for: components/form/form_events.rst

@@ -5,10 +5,11 @@ Form Events
 ===========
 
 The Form component provides a structured process to let you customize your
-forms, by making use of the :doc:`EventDispatcher </components/event_dispatcher/introduction>`
-component. Using form events, you may modify information or fields at
-different steps of the workflow: from the population of the form to the
-submission of the data from the request.
+forms, by making use of the
+:doc:`EventDispatcher component </components/event_dispatcher/introduction>`.
+Using form events, you may modify information or fields at different steps
+of the workflow: from the population of the form to the submission of the
+data from the request.
 
 Registering an event listener is very easy using the Form component.
 

Diff for: components/http_kernel/introduction.rst

@@ -7,9 +7,9 @@ The HttpKernel Component
 ========================
 
     The HttpKernel component provides a structured process for converting
-    a ``Request`` into a ``Response`` by making use of the EventDispatcher.
-    It's flexible enough to create a full-stack framework (Symfony), a micro-framework
-    (Silex) or an advanced CMS system (Drupal).
+    a ``Request`` into a ``Response`` by making use of the EventDispatcher
+    component. It's flexible enough to create a full-stack framework (Symfony),
+    a micro-framework (Silex) or an advanced CMS system (Drupal).
 
 Installation
 ------------
@@ -79,10 +79,11 @@ and talks about how one specific implementation of the HttpKernel - the Symfony
 Framework - works.
 
 Initially, using the :class:`Symfony\\Component\\HttpKernel\\HttpKernel`
-is really simple, and involves creating an :doc:`EventDispatcher </components/event_dispatcher/introduction>`
-and a :ref:`controller resolver <component-http-kernel-resolve-controller>`
-(explained below). To complete your working kernel, you'll add more event
-listeners to the events discussed below::
+is really simple and involves creating an
+:doc:`event dispatcher </components/event_dispatcher/introduction>` and a
+:ref:`controller resolver <component-http-kernel-resolve-controller>` (explained
+below). To complete your working kernel, you'll add more event listeners
+to the events discussed below::
 
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpKernel\HttpKernel;

Diff for: cookbook/bundles/configuration.rst

@@ -117,7 +117,7 @@ bundle configuration would look like:
 
 .. seealso::
 
-    For parameter handling within a Dependency Injection class see
+    For parameter handling within a dependency injection container see
     :doc:`/cookbook/configuration/using_parameters_in_dic`.
 
 

Diff for: cookbook/form/dynamic_form_modification.rst

@@ -77,7 +77,7 @@ or if an existing product is being edited (e.g. a product fetched from the datab
 
 Suppose now, that you don't want the user to be able to change the ``name`` value
 once the object has been created. To do this, you can rely on Symfony's
-:doc:`EventDispatcher </components/event_dispatcher/introduction>`
+:doc:`EventDispatcher component </components/event_dispatcher/introduction>`
 system to analyze the data on the object and modify the form based on the
 Product object's data. In this entry, you'll learn how to add this level of
 flexibility to your forms.