Bring API docs inline with 1.3

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Merge pull request #8683 from cpuguy83/fix_api_docs

Bring API docs inline with 1.3