Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit ffa43603544c · 2014-07-28T06:44:00.000-05:00
* 2.4:
  Update form_events.rst
  Update form_events.rst
  Update page_creation.rst
  Update page_creation.rst
  Update internals.rst
diff --git a/book/internals.rst b/book/internals.rst
@@ -10,8 +10,8 @@ Symfony2 internals.
 
 .. note::
 
-    You need to read this section only if you want to understand how Symfony2
-    works behind the scene, or if you want to extend Symfony2.
+    You only need to read this section if you want to understand how Symfony2
+    works behind the scenes, or if you want to extend Symfony2.
 
 Overview
 --------
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -81,7 +81,7 @@ greeted. To create the page, follow the simple two-step process.
     your webserver. The above URL assumes that ``localhost`` points to the
     ``web`` directory of your new Symfony2 project. For detailed information
     on this process, see the documentation on the web server you are using.
-    Here's the relevant documentation page for some web server you might be using:
+    Here are some relevant documentation pages for the web server you might be using:
 
     * For Apache HTTP Server, refer to `Apache's DirectoryIndex documentation`_
     * For Nginx, refer to `Nginx HttpCoreModule location documentation`_
diff --git a/components/form/form_events.rst b/components/form/form_events.rst
@@ -14,7 +14,7 @@ Registering an event listener is very easy using the Form component.
 
 For example, if you wish to register a function to the
 ``FormEvents::PRE_SUBMIT`` event, the following code lets you add a field,
-depending on the request' values::
+depending on the request values::
 
     // ...
 
@@ -349,7 +349,7 @@ Event subscribers have different uses:
 
     class AddEmailFieldListener implements EventSubscriberInterface
     {
-        public function getSubscribedEvents()
+        public static function getSubscribedEvents()
         {
             return array(
                 FormEvents::PRE_SET_DATA => 'onPreSetData',

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Registering an event listener is very easy using the Form component.`
`14`	`14`
`15`	`15`	`For example, if you wish to register a function to the`
`16`	`16`	``FormEvents::PRE_SUBMIT`` event, the following code lets you add a field,
`17`		`-depending on the request' values::`
	`17`	`+depending on the request values::`
`18`	`18`
`19`	`19`	`// ...`
`20`	`20`
`@@ -349,7 +349,7 @@ Event subscribers have different uses:`
`349`	`349`
`350`	`350`	`class AddEmailFieldListener implements EventSubscriberInterface`
`351`	`351`	`{`
`352`		`- public function getSubscribedEvents()`
	`352`	`+ public static function getSubscribedEvents()`
`353`	`353`	`{`
`354`	`354`	`return array(`
`355`	`355`	`FormEvents::PRE_SET_DATA => 'onPreSetData',`