Backport devguide wordsmithing to 6.1.x