Merge branch 'js/ls-files-x-doc'

* js/ls-files-x-doc:
  ls-files documentation: reword for consistency
  git-ls-files.txt: clarify -x/--exclude option

Conflicts:
	Documentation/git-ls-files.txt

diff --cc Documentation/git-ls-files.txt
index 15aee2f9532e66e46c83e4cef908c0a4f87fadd9,44b6480c0f7f71fcbb5adc2ccc9c319ca440b533..347f4479865419d010b874bc8b26f5f1b40a6f61
--- 1/Documentation/git-ls-files.txt
--- 2/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@@ -192,8 -178,8 +193,8 @@@ These exclude patterns come from these 
       file containing a list of patterns.  Patterns are ordered
       in the same order they appear in the file.
  
-   3. command line flag --exclude-per-directory=<name> specifies
+   3. The command line flag --exclude-per-directory=<name> specifies
 -     a name of the file in each directory 'git-ls-files'
 +     a name of the file in each directory 'git ls-files'
       examines, normally `.gitignore`.  Files in deeper
       directories take precedence.  Patterns are ordered in the
       same order they appear in the files.