Merge "Fix some documentation typos."