Merge branch '2.0'

fabpot · fabpot · commit 94db60352faf · 2012-04-12T07:50:29.000+02:00
* 2.0:
  fixed markup
diff --git a/components/console.rst b/components/console.rst
@@ -62,9 +62,7 @@ and add the following to it::
     }
 
 You also need to create the file to run at the command line which creates
-an ``Application`` and adds commands to it:
-
-.. code-block::php
+an ``Application`` and adds commands to it::
 
     #!/usr/bin/env php
     # app/console
diff --git a/components/templating.rst b/components/templating.rst
@@ -44,7 +44,7 @@ template associated to a reference.
 The :method:`Symfony\\Component\\Templating\\PhpEngine::render` method executes
 the file `views/hello.php` and returns the output text.
 
-.. code-block::php
+.. code-block:: php
 
     <!-- views/hello.php -->
     Hello, <?php echo $firstname ?>!
@@ -54,7 +54,7 @@ Template Inheritance with Slots
 
 The template inheritance is designed to share layouts with many templates.
 
-.. code-block::php
+.. code-block:: php
 
     <!-- views/layout.php -->
     <html>
@@ -69,7 +69,7 @@ The template inheritance is designed to share layouts with many templates.
 The :method:`Symfony\\Templating\\PhpEngine::extend` method is called in the
 sub-template to set its parent template.
 
-.. code-block::php
+.. code-block:: php
 
     <!-- views/page.php -->
     <?php $view->extend('layout.php') ?>

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ and add the following to it::`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`You also need to create the file to run at the command line which creates`
`65`		-an ``Application`` and adds commands to it:
`66`		`-`
`67`		`-.. code-block::php`
	`65`	+an ``Application`` and adds commands to it::
`68`	`66`
`69`	`67`	`#!/usr/bin/env php`
`70`	`68`	`# app/console`