Trunk dev guide fixes

I propagated the dev guide fixes from 6.1.x to trunk. Thanks.