Fix additional broken links

This takes care of the last of the warnings generated by sphinx when
building the HTML docs.
Merge pull request #6514 from terminalmage/docs

Fix additional broken links