Finished #3886

Replaces https://github.com/symfony/symfony-docs/pull/3886