Fix spelling of macro names (patch from #9071).
Regenerate docs.
Fixes #9071.

[SVN r85602]
Merge branch 'develop'