Merge branch 'ml/maint-grep-doc' into maint

* ml/maint-grep-doc:
  grep documentation: clarify what files match

diff --cc Documentation/git-grep.txt
Simple merge