Skip to content

Commit

Permalink
feature #6230 Add annotation to glossary (rebased) (DerStoffel)
Browse files Browse the repository at this point in the history
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #6230).

Discussion
----------

Add annotation to glossary (rebased)

Commits
-------

914523c Add annotation to glossary (rebased)
  • Loading branch information
wouterj committed Feb 6, 2016
2 parents 84249ad + 914523c commit a25685e
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ Glossary
Symfony's configuration files. See the :doc:`/components/yaml/introduction`
chapter.

Annotation
Annotations are metadata written alongside your code. They can either be explanatory and will be
ignored during execution or add functionality to the line of code directly below as a means of
configuration. For example, the annotation ``@var`` describes the type of a variable, whereas in
Symfony2 ``@Assert`` can add validation to a member variable of a class (see :doc:`/book/validation` chapter).

.. _`service-oriented architecture`: https://wikipedia.org/wiki/Service-oriented_architecture
.. _`HTTP Wikipedia`: https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol
Expand Down

0 comments on commit a25685e

Please sign in to comment.