Move versionadded directives for consistency
fix docstring
Merge pull request #11662 from terminalmage/issue11560

Docstring fixes