Merge pull request #12668 from Quy/master

Reorder links
Update docs prefixing