Skip to content

Commit

Permalink
Grammar fixes proposed by @weaverryan and @wouterj
Browse files Browse the repository at this point in the history
  • Loading branch information
javiereguiluz authored and weaverryan committed Feb 26, 2014
1 parent eca1e73 commit fdc755e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ will be executed. In the next section, you'll learn exactly what that means.

In addition to YAML files, routes can be configured in XML or PHP files
and even embedded in PHP annotations. This flexibility is one of the main
features of Symfony2, a framework that never imposes you a particular
configuration format.
features of Symfony2, a framework that never imposes a particular
configuration format on you.

Controllers
~~~~~~~~~~~

A controller is a PHP function or method that handles incoming *requests* and
returns *responses* (often HTML code). Instead of using the PHP global variables
and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages
and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages,
Symfony uses objects: :ref:`Request<component-http-foundation-request>`
and :ref:`Response<component-http-foundation-response>`. The simplest possible
controller might create the response by hand, based on the request::
Expand Down
2 changes: 1 addition & 1 deletion quick_tour/the_view.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ the template contents using any of these delimiters:
* ``{% ... %}``: controls the logic of the template; it is used for example to
execute ``for`` loops and ``if`` statements;

* ``{# ... #}``: allows to include comments inside templates.
* ``{# ... #}``: allows including comments inside templates.

Below is a minimal template that illustrates a few basics, using two variables
``page_title`` and ``navigation``, which would be passed into the template:
Expand Down

0 comments on commit fdc755e

Please sign in to comment.