Merge branch 'master' of https://github.com/vjousse/symfony-docs into vjousse-master

Author: weaverryan

book/templating.rst

@@ -419,8 +419,8 @@ that specify the *format* and *engine* for that template.
 * **BlogBundle:Blog:index.css.twig** - CSS format, Twig engine
 
 By default, any Symfony2 template can be written in either Twig or PHP, and
-the first part of the extension specifies which of these two *engines*
-should be used. The second part of the extension, (e.g. HTML, CSS, etc)
+the second part of the extension specifies which of these two *engines*
+should be used. The first part of the extension, (e.g. HTML, CSS, etc)
 is the finished format that the template will generate. Unlike the engine,
 which determines how Symfony2 parses the template, this is simply an organizational
 tactic used in case the same content ever needs to be rendered as HTML
@@ -1124,4 +1124,4 @@ Learn more from the Cookbook
 .. _`Output Escaping`: http://www.twig-project.org
 .. _`tags`: http://www.twig-project.org/doc/templates.html#comments
 .. _`filters`: http://www.twig-project.org/doc/templates.html#list-of-built-in-filters
-.. _`add your own extensions`: http://www.twig-project.org/doc/advanced.html
+.. _`add your own extensions`: http://www.twig-project.org/doc/advanced.html