Misc updates

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329701 c90b9560-bf6c-de11-be94-00142212c4b1