Merge pull request #5347 from kressi/docfix

cleanup up docs