Fix typo and broken links. (rebased onto develop)



This is the same as gh-199 but rebased onto develop.

----

Problem noticed while reviewing Petr's PR.