Skip to content

Commit 36a06e6

Browse files
committed
minor #7028 A few minor tweaks (bocharsky-bw)
This PR was merged into the 2.7 branch. Discussion ---------- A few minor tweaks Commits ------- edaab10 A few minor tweaks
2 parents 5fa2417 + edaab10 commit 36a06e6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ There are *two* ways to know *what* keys you can configure:
112112

113113
#. Use the :doc:`Reference Section </reference/index>`;
114114

115-
#. Use the ``config:dump`` command;
115+
#. Use the ``config:dump-reference`` command.
116116

117117
For example, if you want to configure something in Twig, you can see an example
118118
dump of all available configuration options by running:
119119

120120
.. code-block:: terminal
121121
122-
$ php app/console config:dump twig
122+
$ php app/console config:dump-reference twig
123123
124124
.. index::
125125
single: Environments; Introduction
@@ -183,7 +183,7 @@ can also load XML files or PHP files.
183183

184184
.. _config-parameter-intro:
185185

186-
The parameters key: Parameters (Variables)
186+
The parameters Key: Parameters (Variables)
187187
------------------------------------------
188188

189189
Another special key is called ``parameters``: it's used to define *variables* that

templating.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ Creating links to other pages in your application is one of the most common
575575
jobs for a template. Instead of hardcoding URLs in templates, use the ``path``
576576
Twig function (or the ``router`` helper in PHP) to generate URLs based on
577577
the routing configuration. Later, if you want to modify the URL of a particular
578-
page, all you'll need to do is change the routing configuration; the templates
578+
page, all you'll need to do is change the routing configuration: the templates
579579
will automatically generate the new URL.
580580

581581
First, link to the "_welcome" page, which is accessible via the following routing
@@ -706,7 +706,7 @@ route:
706706
707707
In this case, you need to specify both the route name (``article_show``) and
708708
a value for the ``{slug}`` parameter. Using this route, revisit the
709-
``recent_list`` template from the previous section and link to the articles
709+
``recent_list.html.twig`` template from the previous section and link to the articles
710710
correctly:
711711

712712
.. configuration-block::
@@ -905,14 +905,14 @@ block of the base template.
905905

906906
You can also include assets located in your bundles' ``Resources/public`` folder.
907907
You will need to run the ``php app/console assets:install target [--symlink]``
908-
command, which moves (or symlinks) files into the correct location. (target
908+
command, which copies (or symlinks) files into the correct location. (target
909909
is by default "web").
910910

911911
.. code-block:: html+twig
912912

913913
<link href="{{ asset('bundles/acmedemo/css/contact.css') }}" rel="stylesheet" />
914914

915-
The end result is a page that includes both the ``main.css`` and ``contact.css``
915+
The end result is a page that includes ``main.js`` and both the ``main.css`` and ``contact.css``
916916
stylesheets.
917917

918918
Referencing the Request, User or Session
@@ -934,7 +934,7 @@ Suppose ``description`` equals ``I <3 this product``:
934934
.. code-block:: twig
935935
936936
<!-- output escaping is on automatically -->
937-
{{ description }} <!-- I &lt3 this product -->
937+
{{ description }} <!-- I &lt;3 this product -->
938938
939939
<!-- disable output escaping with the raw filter -->
940940
{{ description|raw }} <!-- I <3 this product -->

0 commit comments

Comments
 (0)