From a4f5b0841591fee534082f9dd0a16be6c57269ea Mon Sep 17 00:00:00 2001 From: WouterJ Date: Thu, 20 Aug 2015 11:23:46 +0200 Subject: [PATCH] Move important information out of versionadded --- components/console/helpers/progressbar.rst | 6 +++++- cookbook/controller/service.rst | 10 +++++++--- reference/twig_reference.rst | 9 +++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/components/console/helpers/progressbar.rst b/components/console/helpers/progressbar.rst index 0e7900b4df0..3c97a53ec49 100644 --- a/components/console/helpers/progressbar.rst +++ b/components/console/helpers/progressbar.rst @@ -48,7 +48,8 @@ you can also set the current progress by calling the Prior to version 2.6, the progress bar only works if your platform supports ANSI codes; on other platforms, no output is generated. -.. versionadded:: 2.6 +.. tip:: + If your platform doesn't support ANSI codes, updates to the progress bar are added as new lines. To prevent the output from being flooded, adjust the @@ -56,6 +57,9 @@ you can also set the current progress by calling the accordingly. By default, when using a ``max``, the redraw frequency is set to *10%* of your ``max``. + .. versionadded:: 2.6 + The ``setRedrawFrequency()`` method was introduced in Symfony 2.6. + If you don't know the number of steps in advance, just omit the steps argument when creating the :class:`Symfony\\Component\\Console\\Helper\\ProgressBar` instance:: diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst index 94e4202f2a1..f8f2d24da30 100644 --- a/cookbook/controller/service.rst +++ b/cookbook/controller/service.rst @@ -122,9 +122,13 @@ the route ``_controller`` value: defined as a service. See the `FrameworkExtraBundle documentation`_ for details. -.. versionadded:: 2.6 - If your controller service implements the ``__invoke`` method, you can simply refer to the service id - (``app.hello_controller``). +.. tip:: + + If your controller implements the ``__invoke()`` method, you can simply + refer to the service id (``app.hello_controller``). + + .. versionadded:: 2.6 + Support for ``__invoke()`` was introduced in Symfony 2.6. Alternatives to base Controller Methods --------------------------------------- diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index 55e55195f2c..d5224d69915 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -719,11 +719,12 @@ The available attributes are: * ``app.session`` * ``app.environment`` * ``app.debug`` -* ``app.security`` +* ``app.security`` (deprecated as of 2.6) -.. versionadded:: 2.6 - The ``app.security`` global is deprecated as of 2.6. The user is already available - as ``app.user`` and ``is_granted()`` is registered as function. +.. caution:: + + The ``app.security`` global is deprecated as of 2.6. The user is already + available as ``app.user`` and ``is_granted()`` is registered as function. Symfony Standard Edition Extensions -----------------------------------