Backport devguidewordsmithing to 6.1.x

Hi Rich,

Sorry about those merge conflicts. I've resolved them and fixed some other things too.

This is ready for 6.1.x.

Thanks!