Skip to content

Commit fdc755e

Browse files
javiereguiluzweaverryan
authored andcommitted
Grammar fixes proposed by @weaverryan and @wouterj
1 parent eca1e73 commit fdc755e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

quick_tour/the_big_picture.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ will be executed. In the next section, you'll learn exactly what that means.
140140

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

146146
Controllers
147147
~~~~~~~~~~~
148148

149149
A controller is a PHP function or method that handles incoming *requests* and
150150
returns *responses* (often HTML code). Instead of using the PHP global variables
151-
and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages
151+
and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages,
152152
Symfony uses objects: :ref:`Request<component-http-foundation-request>`
153153
and :ref:`Response<component-http-foundation-response>`. The simplest possible
154154
controller might create the response by hand, based on the request::

quick_tour/the_view.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ the template contents using any of these delimiters:
2121
* ``{% ... %}``: controls the logic of the template; it is used for example to
2222
execute ``for`` loops and ``if`` statements;
2323

24-
* ``{# ... #}``: allows to include comments inside templates.
24+
* ``{# ... #}``: allows including comments inside templates.
2525

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

0 commit comments

Comments
 (0)