merge from 3.5

Issue25917 : Fix howto links in docs. Point the reference documentation instead of wiki.