Add annotation to glossary#6177

Closed

DerStoffel wants to merge 5 commits intosymfony:2.3from

DerStoffel:add_annotation_to_glossary

Commits on Jan 21, 2016

added Annotation to glossary
DerStoffel
committed
reformatted annotation text
DerStoffel
committed
corrected wording
DerStoffel
committed
Merge branch '2.3' into add_annotation_to_glossary
DerStoffel
committed

Commits on Jan 22, 2016

updated definition of annotations
DerStoffel
committed