Fix typos.
Merge remote-tracking branch 'origin/refguide' into refguide