Merge branch '3.4' into 4.0

xabbuh · xabbuh · commit ad416679acd1 · 2018-07-09T20:54:28.000+02:00
* 3.4:
  render versionadded directive outside the code block
diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst
@@ -137,12 +137,6 @@ previous ``priceFilter()`` method::
         }
     }
 
-Register the Lazy-Loaded Extension as a Service
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- .. versionadded:: 3.4
-     The ``RuntimeExtensionInterface`` was introduced in Symfony 3.4.
-
 If you're using the default ``services.yaml`` configuration, this will already
 work! Otherwise, :ref:`create a service <service-container-creating-service>`
 for this class and :doc:`tag your service </service_container/tags>` with ``twig.runtime``.

Original file line number	Diff line number	Diff line change
@@ -137,12 +137,6 @@ previous ``priceFilter()`` method::
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-Register the Lazy-Loaded Extension as a Service`
`141`		`-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`142`		`-`
`143`		`- .. versionadded:: 3.4`
`144`		- The ``RuntimeExtensionInterface`` was introduced in Symfony 3.4.
`145`		`-`
`146`	`140`	If you're using the default ``services.yaml`` configuration, this will already
`147`	`141`	work! Otherwise, :ref:`create a service <service-container-creating-service>`
`148`	`142`	for this class and :doc:`tag your service </service_container/tags>` with ``twig.runtime``.