Skip to content

Commit

Permalink
Merge branch '2.4' into 2.5
Browse files Browse the repository at this point in the history
* 2.4:
  Update form_events.rst
  Update form_events.rst
  Update page_creation.rst
  Update page_creation.rst
  Update internals.rst
  • Loading branch information
weaverryan committed Jul 28, 2014
2 parents 5e5abd3 + 6d11002 commit ffa4360
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions book/internals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------
Expand Down
2 changes: 1 addition & 1 deletion book/page_creation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`_
Expand Down
4 changes: 2 additions & 2 deletions components/form/form_events.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

// ...

Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit ffa4360

Please sign in to comment.