Updates for ApiGen and other general edits
Fix asterisk spacing cs error
Merge pull request #2700 from bcrowe/3.0-doc-errors

3.0 - Updates for ApiGen and other general edits