Skip to content

Commit

Permalink
minor #5641 Move important information out of versionadded (WouterJ)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.7 branch.

Discussion
----------

Move important information out of versionadded

Unfortunately, 2.6 is closed so this has to be merged into the 2.7 branch.

| Q | A
| --- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | 2.6+
| Fixed tickets | -

Commits
-------

a4f5b08 Move important information out of versionadded
  • Loading branch information
wouterj committed Sep 5, 2015
2 parents 0340e1f + a4f5b08 commit a1cf5e9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
6 changes: 5 additions & 1 deletion components/console/helpers/progressbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,18 @@ 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
:method:`Symfony\\Component\\Console\\Helper\\ProgressBar::setRedrawFrequency`
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::
Expand Down
10 changes: 7 additions & 3 deletions cookbook/controller/service.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions reference/twig_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -724,11 +724,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
-----------------------------------
Expand Down

0 comments on commit a1cf5e9

Please sign in to comment.