Included a bunch of fixes suggested by the awesome Symfony doc reviewers