Merge branch 'jj/command-line-adjective'

* jj/command-line-adjective:
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge