It's 2013, even for a manpage
Merge branch 'PHP-5.3' into PHP-5.4
Document embedded server options in manpage
Merge branch 'PHP-5.4' into PHP-5.5