diff --git a/components/process.rst b/components/process.rst index 3de0dca66a7..9ca2e71d809 100644 --- a/components/process.rst +++ b/components/process.rst @@ -312,7 +312,7 @@ instead:: use Symfony\Component\Process\PhpProcess; $process = new PhpProcess(<< + EOF ); $process->run(); diff --git a/components/templating.rst b/components/templating.rst index 647b53f7a07..6d8fc3dac94 100644 --- a/components/templating.rst +++ b/components/templating.rst @@ -54,7 +54,7 @@ which uses the template reference to actually find and load the template:: .. code-block:: html+php - Hello, ! + Hello, ! The :method:`Symfony\\Component\\Templating\\PhpEngine::render` method parses the ``views/hello.php`` file and returns the output text. The second argument @@ -85,7 +85,7 @@ to render the template originally) inside the template to render another templat - render('hello.php', array('firstname' => $name)) ?> + render('hello.php', array('firstname' => $name)) ?> Global Variables @@ -103,7 +103,7 @@ In a template: .. code-block:: html+php -

The google tracking code is:

+

The google tracking code is:

.. caution:: @@ -123,13 +123,13 @@ JavaScript code isn't written out to your page. This will prevent things like XSS attacks. To do this, use the :method:`Symfony\\Component\\Templating\\PhpEngine::escape` method:: - escape($firstname) ?> + escape($firstname) ?> By default, the ``escape()`` method assumes that the variable is outputted within an HTML context. The second argument lets you change the context. For example, to output something inside JavaScript, use the ``js`` context:: - escape($var, 'js') ?> + escape($var, 'js') ?> The component comes with an HTML and JS escaper. You can register your own escaper using the diff --git a/components/templating/slotshelper.rst b/components/templating/slotshelper.rst index e368b83f86a..a5c1bd134ff 100644 --- a/components/templating/slotshelper.rst +++ b/components/templating/slotshelper.rst @@ -67,10 +67,10 @@ set in a slot is in the ``_content`` slot. set('title', $page->title) ?>

- title ?> + title ?>

- body ?> + body ?>

.. note:: diff --git a/create_framework/front_controller.rst b/create_framework/front_controller.rst index f11e8fde69b..b2acfc06ade 100644 --- a/create_framework/front_controller.rst +++ b/create_framework/front_controller.rst @@ -190,7 +190,7 @@ And the ``hello.php`` script can now be converted to a template:: get('name', 'World') ?> - Hello + Hello We have the first version of our framework:: diff --git a/create_framework/routing.rst b/create_framework/routing.rst index deaf9a02420..cafe4beb7ce 100644 --- a/create_framework/routing.rst +++ b/create_framework/routing.rst @@ -33,7 +33,7 @@ As we now extract the request query parameters, simplify the ``hello.php`` template as follows:: - Hello + Hello Now, we are in good shape to add new features. @@ -166,7 +166,7 @@ There are a few new things in the code: * Request attributes are extracted to keep our templates simple:: - Hello + Hello * Route configuration has been moved to its own file:: diff --git a/introduction/from_flat_php_to_symfony2.rst b/introduction/from_flat_php_to_symfony2.rst index ad3a2d7b19a..17907f1c047 100644 --- a/introduction/from_flat_php_to_symfony2.rst +++ b/introduction/from_flat_php_to_symfony2.rst @@ -593,7 +593,7 @@ database and the Templating component to render a template and return a