updating from symfony-docs 2.3
Merge pull request #287 from gregquat/origin/2.3

updating from symfony-docs 2.3