From edaab1096ed41aba96ce248113902e96a26700a3 Mon Sep 17 00:00:00 2001 From: Victor Bocharsky Date: Sun, 2 Oct 2016 23:09:20 +0300 Subject: [PATCH] A few minor tweaks --- configuration.rst | 6 +++--- templating.rst | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configuration.rst b/configuration.rst index 7e4291849c8..31263244347 100644 --- a/configuration.rst +++ b/configuration.rst @@ -112,14 +112,14 @@ There are *two* ways to know *what* keys you can configure: #. Use the :doc:`Reference Section `; -#. Use the ``config:dump`` command; +#. Use the ``config:dump-reference`` command. For example, if you want to configure something in Twig, you can see an example dump of all available configuration options by running: .. code-block:: terminal - $ php app/console config:dump twig + $ php app/console config:dump-reference twig .. index:: single: Environments; Introduction @@ -183,7 +183,7 @@ can also load XML files or PHP files. .. _config-parameter-intro: -The parameters key: Parameters (Variables) +The parameters Key: Parameters (Variables) ------------------------------------------ Another special key is called ``parameters``: it's used to define *variables* that diff --git a/templating.rst b/templating.rst index 50ad22ee7ca..f200647a58f 100644 --- a/templating.rst +++ b/templating.rst @@ -575,7 +575,7 @@ Creating links to other pages in your application is one of the most common jobs for a template. Instead of hardcoding URLs in templates, use the ``path`` Twig function (or the ``router`` helper in PHP) to generate URLs based on the routing configuration. Later, if you want to modify the URL of a particular -page, all you'll need to do is change the routing configuration; the templates +page, all you'll need to do is change the routing configuration: the templates will automatically generate the new URL. First, link to the "_welcome" page, which is accessible via the following routing @@ -706,7 +706,7 @@ route: In this case, you need to specify both the route name (``article_show``) and a value for the ``{slug}`` parameter. Using this route, revisit the -``recent_list`` template from the previous section and link to the articles +``recent_list.html.twig`` template from the previous section and link to the articles correctly: .. configuration-block:: @@ -905,14 +905,14 @@ block of the base template. You can also include assets located in your bundles' ``Resources/public`` folder. You will need to run the ``php app/console assets:install target [--symlink]`` -command, which moves (or symlinks) files into the correct location. (target +command, which copies (or symlinks) files into the correct location. (target is by default "web"). .. code-block:: html+twig -The end result is a page that includes both the ``main.css`` and ``contact.css`` +The end result is a page that includes ``main.js`` and both the ``main.css`` and ``contact.css`` stylesheets. Referencing the Request, User or Session @@ -934,7 +934,7 @@ Suppose ``description`` equals ``I <3 this product``: .. code-block:: twig - {{ description }} + {{ description }} {{ description|raw }}