Merge branch '2.3' into 2.5

* 2.3:
  Correct a typo: replace "then" by "the".
  Correct a typo: remove unnecessary "the" word.
  Remove horizontal scrollbar and change event name to follow conventions
  Update choice.rst
  Improve readability
  support Varnish in configuration blocks

Author: weaverryan

_exts

@@ -40,7 +40,7 @@ Creating a new Definition
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you need to create a new definition rather than manipulate one retrieved
-from then container then the definition class is :class:`Symfony\\Component\\DependencyInjection\\Definition`.
+from the container then the definition class is :class:`Symfony\\Component\\DependencyInjection\\Definition`.
 
 Class
 ~~~~~

components/dependency_injection/definitions.rst

@@ -21,7 +21,10 @@ Pass the event dispatcher to be wrapped and an instance of the
     // the event dispatcher to debug
     $eventDispatcher = ...;
 
-    $traceableEventDispatcher = new TraceableEventDispatcher($eventDispatcher, new Stopwatch());
+    $traceableEventDispatcher = new TraceableEventDispatcher(
+        $eventDispatcher,
+        new Stopwatch()
+    );
 
 Now, the ``TraceableEventDispatcher`` can be used like any other event dispatcher
 to register event listeners and dispatch events::
@@ -31,11 +34,11 @@ to register event listeners and dispatch events::
     // register an event listener
     $eventListener = ...;
     $priority = ...;
-    $traceableEventDispatcher->addListener('the-event-name', $eventListener, $priority);
+    $traceableEventDispatcher->addListener('event.the_name', $eventListener, $priority);
 
     // dispatch an event
     $event = ...;
-    $traceableEventDispatcher->dispatch('the-event-name', $event);
+    $traceableEventDispatcher->dispatch('event.the_name', $event);
 
 After your application has been processed, you can use the
 :method:`Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface::getCalledListeners`

components/event_dispatcher/traceable_dispatcher.rst

@@ -23,6 +23,7 @@
 # adding PhpLexer
 from sphinx.highlighting import lexers
 from pygments.lexers.web import PhpLexer
+from pygments.lexers.agile import RubyLexer
 
 # -- General configuration -----------------------------------------------------
 
@@ -100,6 +101,15 @@
 lexers['php-annotations'] = PhpLexer(startinline=True)
 lexers['php-standalone'] = PhpLexer(startinline=True)
 lexers['php-symfony'] = PhpLexer(startinline=True)
+lexers['varnish2'] = RubyLexer()
+lexers['varnish3'] = RubyLexer()
+lexers['varnish4'] = RubyLexer()
+
+config_block = {
+    'varnish2': 'Varnish 2',
+    'varnish3': 'Varnish 3',
+    'varnish4': 'Varnish 4'
+}
 
 # use PHP as the primary domain
 primary_domain = 'php'
@@ -264,3 +274,4 @@
 
 # Use PHP syntax highlighting in code examples by default
 highlight_language='php'
+

conf.py

@@ -84,7 +84,7 @@ container, to ensure all services and parameters are also added to the actual
 container.
 
 In the ``load()`` method, you can use PHP code to register service definitions,
-but it is more common if you put the these definitions in a configuration file
+but it is more common if you put these definitions in a configuration file
 (using the Yaml, XML or PHP format). Luckily, you can use the file loaders in
 the extension!
 

cookbook/bundles/extension.rst

@@ -125,7 +125,8 @@ event listeners, you can learn more about them at :doc:`/cookbook/service_contai
             $controller = $event->getController();
 
             /*
-             * $controller passed can be either a class or a Closure. This is not usual in Symfony but it may happen.
+             * $controller passed can be either a class or a Closure.
+             * This is not usual in Symfony but it may happen.
              * If it is a class, it comes in array format
              */
             if (!is_array($controller)) {
@@ -189,7 +190,7 @@ want.
 After Filters with the ``kernel.response`` Event
 ------------------------------------------------
 
-In addition to having a "hook" that's executed before your controller, you
+In addition to having a "hook" that's executed *before* your controller, you
 can also add a hook that's executed *after* your controller. For this example,
 imagine that you want to add a sha1 hash (with a salt using that token) to
 all responses that have passed this token authentication.

cookbook/event_dispatcher/before_after_filters.rst

@@ -119,7 +119,7 @@ With this option you can also allow float values to be selected as data.
 
     // ...
     $builder->add('status', 'choice', array(
-      'choice_list' => new ChoiceList(array(1, 0.5), array('Full', 'Half')
+      'choice_list' => new ChoiceList(array(1, 0.5), array('Full', 'Half'))
     ));
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc