Skip to content

Commit

Permalink
minor #6624 remove versionadded directive for 2.x features (xabbuh)
Browse files Browse the repository at this point in the history
This PR was merged into the 3.0 branch.

Discussion
----------

remove versionadded directive for 2.x features

Commits
-------

96dbba8 remove versionadded directive for 2.x features
  • Loading branch information
xabbuh committed May 30, 2016
2 parents ad76b72 + 96dbba8 commit 8b2691a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions components/yaml/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ error occurred:
Objects for Mappings
....................

.. versionadded:: 2.7
Support for parsing mappings as objects was introduced in Symfony 2.7.

Yaml :ref:`mappings <yaml-format-collections>` are basically associative
arrays. You can instruct the parser to return mappings as objects (i.e.
``\stdClass`` instances) by setting the fourth argument to ``true``::
Expand Down
6 changes: 0 additions & 6 deletions reference/forms/types/entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,6 @@ Overridden Options
choice_name
~~~~~~~~~~~

.. versionadded:: 2.7
The ``choice_name`` option was introduced in Symfony 2.7.

**type**: ``string``, ``callable`` or :class:`Symfony\\Component\\PropertyAccess\\PropertyPath` **default**: id

By default the name of each field is the id of the entity, if it can be read
Expand All @@ -223,9 +220,6 @@ fall back to using increasing integers.
choice_value
~~~~~~~~~~~~

.. versionadded:: 2.7
The ``choice_value`` option was introduced in Symfony 2.7.

**type**: ``string``, ``callable`` or :class:`Symfony\\Component\\PropertyAccess\\PropertyPath` **default**: id

As for the ``choice_name`` option, ``choice_value`` uses the id by default.
Expand Down

0 comments on commit 8b2691a

Please sign in to comment.