More api docblock fixes.
Merge pull request #3718 from ADmad/3.0-api-docs

More api docblock fixes.