Skip to content

Commit 06c3bac

Browse files
chaffneueweaverryan
authored andcommitted
updated Routing
1 parent 7f09e47 commit 06c3bac

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

quick_tour/the_big_picture.rst

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,9 @@ Fabien!``).
101101
Configuration
102102
~~~~~~~~~~~~~
103103

104-
Symfony2 routes the request to your code by using a configuration file.
105-
106-
All Symfony2 configuration files can be written in PHP, XML or `YAML`_(YAML is
107-
a simple format that makes the description of configuration settings
108-
straightforward).
104+
Symfony2 configuration files can be written in PHP, XML or `YAML`_. The
105+
different types are compatible and may be used interchangeably within an
106+
application.
109107

110108
.. tip::
111109

@@ -119,7 +117,8 @@ straightforward).
119117
Routing
120118
~~~~~~~
121119

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

124123
.. configuration-block::
125124

@@ -163,9 +162,14 @@ So, Symfony2 routes the request by reading the routing configuration file:
163162
164163
return $collection;
165164
166-
The first few lines of the routing configuration file define the code called
167-
when the user requests the "``/``" resource. More interesting is the last
168-
part, which imports another routing configuration file that reads as follows:
165+
The first few lines of the routing configuration file define the code that is
166+
executed when the user requests the "``/``" resource.
167+
168+
.. tip::
169+
170+
If you're comfortable with routing, have a look at the last directive of
171+
the configuration file. Symfony2 can include routing information from
172+
other bundles.
169173

170174
.. configuration-block::
171175

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

0 commit comments

Comments
 (0)