changes according to comments after pull request

symfony · talitakz · Feb 15, 2016 · Feb 15, 2016 · Mar 11, 2016 · Mar 11, 2016
commit 79e02ac787e6fbf507ff21bd7ad3a3f2e8dc1c13
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -29,22 +29,24 @@ When developing a Symfony application, your responsibility as a developer
 is to write the code that maps the user's *request* (e.g. ``http://localhost:8000/``)
 to the *resource* associated with it (the ``Homepage`` HTML page).
 
-The code to execute is defined in **controllers**  also called **actions** which
-are methods defined in **controller classes** . The mapping between user's requests
-and that code is defined via the **routing** configuration. And the contents displayed
-in the browser are usually rendered using **templates**.
-
-If you'd browsed ``http://localhost:8000/app/example`` for example, Symfony could
-executed the controller defined in the ``src/AppBundle/Controller/DefaultController.php``
-file and rendered the ``app/Resources/views/default/index.html.twig`` template.
+The code to execute is defined as methods of PHP classes. The methods are
+called **actions** and the classes **controllers**, but in practice most
+developers use **controllers** to refer to both of them. The mapping between
+user's requests and that code is defined via the **routing** configuration.
+And the contents displayed in the browser are usually rendered using
+**templates**.
+
+When you go to ``http://localhost:8000/app/example``, Symfony will execut the
+controller in ``src/AppBundle/Controller/DefaultController.php`` and rendered
+the ``app/Resources/views/default/index.html.twig`` template.
 In the following sections you'll learn in detail the inner workings of Symfony
 controllers, routes and templates.
 
 Actions and Controllers
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Open the ``src/AppBundle/Controller/DefaultController.php`` file and you'll
-see the following code (for now, don't look at the ``@Route()`` configuration
+see the following code (for now, don't look at the ``@Route` configuration
 because that will be explained in the next section)::
 
     namespace AppBundle\Controller;

diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
@@ -15,7 +15,7 @@ result of executing any action of any controller is the creation of a
 to the user.
 
 So far, all the actions shown in this tutorial used the ``$this->render()``
-controller shortcut method to return a rendered response as result. In case
+controller shortcut method to return a rendered template as result. In case
 you need it, you can also create a raw ``Response`` object to return any
 text content::
 

diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst
@@ -232,7 +232,7 @@ Creating Links between Pages
 
 Creating links between pages is a must for web applications. Instead of
 hardcoding URLs in templates, the ``path()`` function knows how to generate
-relative URLs based on the routing configuration. That way, all your URLs
+URLs based on the routing configuration. That way, all your URLs
 can be easily updated by just changing the configuration:
 
 .. code-block:: html+twig