Skip to content

Commit 1e36cfa

Browse files
javiereguiluzweaverryan
authored andcommitted
[quick_tour] rewording and grammar fixes noted by @xabbuh
1 parent 69fdff1 commit 1e36cfa

File tree

3 files changed

+26
-22
lines changed

3 files changed

+26
-22
lines changed

quick_tour/the_big_picture.rst

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ make sure that your system meets all the technical requirements:
5050
$ cd myproject/
5151
$ php app/check.php
5252
53-
Fix any error reported by the command and then, use the PHP built-in web server
53+
Fix any error reported by the command and then use the PHP built-in web server
5454
to run Symfony:
5555

5656
.. code-block:: bash
@@ -59,12 +59,12 @@ to run Symfony:
5959
6060
If you get the error `There are no commands defined in the "server" namespace.`,
6161
then you are probably using PHP 5.3. That's ok! But the built-in web server is
62-
available for PHP 5.4.0 or higher. If you have an older version of PHP or if you
63-
prefer a traditional web server such as Apache or Nginx, read the
62+
only available for PHP 5.4.0 or higher. If you have an older version of PHP or
63+
if you prefer a traditional web server such as Apache or Nginx, read the
6464
:doc:`/cookbook/configuration/web_server_configuration` article.
6565

66-
Open your browser and access to the ``http://localhost:8000`` URL to
67-
see the Welcome page of Symfony2:
66+
Open your browser and access the ``http://localhost:8000`` URL to see the
67+
Welcome page of Symfony2:
6868

6969
.. image:: /images/quick_tour/welcome.png
7070
:align: center
@@ -73,7 +73,7 @@ see the Welcome page of Symfony2:
7373
Understanding the Fundamentals
7474
------------------------------
7575

76-
One of the main goals of a framework is to keep your code organized and allow
76+
One of the main goals of a framework is to keep your code organized and to allow
7777
your application to evolve easily over time by avoiding the mixing of database
7878
calls, HTML tags and business logic in the same script. To achieve this goal
7979
with Symfony, you'll first need to learn a few fundamental concepts and terms.
@@ -141,8 +141,8 @@ will be executed. In the next section, you'll learn exactly what that means.
141141
.. tip::
142142

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

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

158158
use Symfony\Component\HttpFoundation\Response;
@@ -318,17 +318,17 @@ environment.
318318

319319
.. _quick-tour-big-picture-environments-intro:
320320

321-
What *is* an environment?
322-
~~~~~~~~~~~~~~~~~~~~~~~~~
321+
What Is an environment?
322+
~~~~~~~~~~~~~~~~~~~~~~~
323323

324-
An :term:`Environment` represents a group of configuration that's used to run
324+
An :term:`Environment` represents a group of configurations that's used to run
325325
your application. Symfony2 defines two environments by default: ``dev``
326326
(suited for when developing the application locally) and ``prod`` (optimized
327327
for when executing the application on production).
328328

329329
Typically, the environments share a large amount of configuration options. For
330330
that reason, you put your common configuration in ``config.yml`` and override
331-
where necessary in the specific configuration file for each environment:
331+
the specific configuration file for each environment where necessary:
332332

333333
.. code-block:: yaml
334334
@@ -354,16 +354,18 @@ URL, you'll get a 404 error.
354354

355355
.. tip::
356356

357-
If instead of using PHP built-in webserver, you use Apache with ``mod_rewrite``
358-
enabled and take advantage of the ``.htaccess`` file Symfony2 provides
359-
in ``web/``, you can even omit the ``app.php`` part of the URL. The default
360-
``.htaccess`` points all requests to the ``app.php`` front controller:
357+
If instead of using PHP's built-in webserver, you use Apache with
358+
``mod_rewrite`` enabled and take advantage of the ``.htaccess`` file
359+
Symfony2 provides in ``web/``, you can even omit the ``app.php`` part of the
360+
URL. The default ``.htaccess`` points all requests to the ``app.php`` front
361+
controller:
361362

362363
.. code-block:: text
363364
364365
http://localhost/demo/hello/Fabien
365366
366-
For more details on environments, see ":ref:`Environments & Front Controllers<page-creation-environments>`" article.
367+
For more details on environments, see
368+
":ref:`Environments & Front Controllers <page-creation-environments>`" article.
367369

368370
Final Thoughts
369371
--------------

quick_tour/the_controller.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ user to another page (which will then show the message)::
167167
// store a message for the very next request (in a controller)
168168
$session->getFlashBag()->add('notice', 'Congratulations, your action succeeded!');
169169

170-
// display the flash message in the template
170+
.. code-block:: html+jinja
171+
172+
{# display the flash message in the template #}
171173
<div>{{ app.session.flashbag.get('notice') }}</div>
172174

173175
Caching Resources

quick_tour/the_view.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ and pass the variables needed as an array using the optional second argument::
5656
Variables passed to a template can be strings, arrays, or even objects. Twig
5757
abstracts the difference between them and lets you access "attributes" of a
5858
variable with the dot (``.``) notation. The following code listing shows how to
59-
display the content of a variable depending on the type of variable passed by
60-
the controller:
59+
display the content of a variable depending on the type of the variable passed
60+
by the controller:
6161

6262
.. code-block:: jinja
6363

0 commit comments

Comments
 (0)