Merge pull request #6510 from terminalmage/docs

Documentation corrections and additions
Merge pull request #6511 from terminalmage/docs

Fix broken doc links and quiet more sphinx warnings
Fix additional broken links

This takes care of the last of the warnings generated by sphinx when
building the HTML docs.