Trivial doc changes after recent prolificacy.

[originally from svn r6220]