API Doc Generation 2

Cleaned up commits from #747