Backport devguide wordsmithing to 6.1.x

Here are all our wonderful changes merged into the 6.1.x branch! thanks :-)

@rbohl