Skip to content

Commit

Permalink
updated Routing
Browse files Browse the repository at this point in the history
  • Loading branch information
chaffneue authored and weaverryan committed Feb 11, 2011
1 parent 7f09e47 commit 06c3bac
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions quick_tour/the_big_picture.rst
Expand Up @@ -101,11 +101,9 @@ Fabien!``).
Configuration
~~~~~~~~~~~~~

Symfony2 routes the request to your code by using a configuration file.

All Symfony2 configuration files can be written in PHP, XML or `YAML`_(YAML is
a simple format that makes the description of configuration settings
straightforward).
Symfony2 configuration files can be written in PHP, XML or `YAML`_. The
different types are compatible and may be used interchangeably within an
application.

.. tip::

Expand All @@ -119,7 +117,8 @@ straightforward).
Routing
~~~~~~~

So, Symfony2 routes the request by reading the routing configuration file:
Symfony2 routes the request to your code by using a configuration file. Here
are a few examples of the routing configuration file for our application:

.. configuration-block::

Expand Down Expand Up @@ -163,9 +162,14 @@ So, Symfony2 routes the request by reading the routing configuration file:
return $collection;
The first few lines of the routing configuration file define the code called
when the user requests the "``/``" resource. More interesting is the last
part, which imports another routing configuration file that reads as follows:
The first few lines of the routing configuration file define the code that is
executed when the user requests the "``/``" resource.

.. tip::

If you're comfortable with routing, have a look at the last directive of
the configuration file. Symfony2 can include routing information from
other bundles.

.. configuration-block::

Expand Down Expand Up @@ -203,7 +207,7 @@ part, which imports another routing configuration file that reads as follows:
return $collection;
Here we go! As you can see, the "``/hello/{name}``" resource pattern (a string
As you can see, the "``/hello/{name}``" resource pattern (a string
enclosed in curly brackets like ``{name}`` is a placeholder) is mapped to a
controller, referenced by the ``_controller`` value.

Expand Down

0 comments on commit 06c3bac

Please sign in to comment.