Merge pull request #2433 from vincchan/fix-doc-links-anchors

fixes anchors and links in docs