For Trunk - DEVGUIDEwordsmith branches merged

This contains the latest of the word-smithing branches from all of us. I didn't do any cherry-picking ... just took in all of our commits and did a sanity check on the HTML. I've merged it with master, so it is good to merge into upstream master. Thanks.

@rbohl