[1.6.x] Fixed #22546 -- Removed idioms in tutorial 2.

Thanks bjb at sourcerer.ca for the suggestion.

Backport of 927245ccd8 from master
[1.6.x] Fixed #22547 -- Added some links to tutorial 2.

Thanks bjb at sourcer.ca for the suggestion.

Backport of b0d032f9fc from master