8000 Merge branch '4.2' · symfony/symfony-docs@be45e46 · GitHub
[go: up one dir, main page]
Skip to content

Commit be45e46

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.2'
* 4.2: js -> javascript & jinja -> twig code blocks use max 2 blank lines
2 parents 4d44afa + d44a489 commit be45e46

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

‎cache.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
324324
],
325325
]);
326326
327-
328-
329327
Creating a Cache Chain
330328
----------------------
331329

‎frontend/encore/installation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Creating the webpack.config.js File
5151
Next, create a new ``webpack.config.js`` file at the root of your project. This
5252
is the main config file for both Webpack and Webpack Encore:
5353

54-
.. code-block:: js
54+
.. code-block:: javascript
5555
5656
var Encore = require('@symfony/webpack-encore');
5757

‎reference/twig_reference.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ information in :ref:`templating-pages`.
253253
absolute_url
254254
~~~~~~~~~~~~
255255

256-
.. code-block:: jinja
256+
.. code-block:: twig
257257
258258
{{ absolute_url(path) }}
259259
@@ -264,7 +264,7 @@ Returns the absolute URL from the passed relative path. For example, assume
264264
you're on the following page in your app:
265265
``http://example.com/products/hover-board``.
266266

267-
.. code-block:: jinja
267+
.. code-block:: twig
268268
269269
{{ absolute_url('/human.txt') }}
270270
{# http://example.com/human.txt #}
@@ -275,7 +275,7 @@ you're on the following page in your app:
275275
relative_path
276276
~~~~~~~~~~~~~
277277

278-
.. code-block:: jinja
278+
.. code-block:: twig
279279
280280
{{ relative_path(path) }}
281281
@@ -286,7 +286,7 @@ Returns the relative path from the passed absolute URL. For example, assume
286286
you're on the following page in your app:
287287
``http://example.com/products/hover-board``.
288288

289-
.. code-block:: jinja
289+
.. code-block:: twig
290290
291291
{{ relative_path('http://example.com/human.txt') }}
292292
{# ../human.txt #}
@@ -619,7 +619,7 @@ This will set the default domain in the current template.
619619
stopwatch
620620
~~~~~~~~~
621621

622-
.. code-block:: jinja
622+
.. code-block:: twig
623623
624624
{% stopwatch 'name' %}...{% endstopwatch %}
625625

0 commit comments

Comments
 (0)
0