Fixed a title and link
Merge pull request #817 from KevWright/master

Fixed a title and link
Fixed some title issues
Merge pull request #818 from KevWright/master

Fixed some title issues
Unpublish this file.

The content is incorrect by now. Follow up in Redmine #6117

Replace all CRLF with LF while I'm at it.
Merge remote-tracking branch 'upstream/master' into 3.6