Merge "Fix a few grammatical errors in docs"