Minor apidoc updates
Merge pull request #1378 from fredj/apidoc

Minor apidoc updates