Merge branch 'bp/fsmonitor' into maint

Doc update for a recently added feature.

* bp/fsmonitor:
fsmonitor: update documentation to remove reference to invalid config settings

diff --combined Documentation/git-update-index.txt
index bdb0342593229e32425bf73d17ad6fcdd0dd3732,2fec666ee39f78e103f3ed67bd89315394f90399..ad2383d7ed2197ed517eab04eed6712440137fa2
--- 1/Documentation/git-update-index.txt
--- 2/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -161,7 -161,7 +161,7 @@@ you will need to handle the situation m
  +
  Version 4 performs a simple pathname compression that reduces index
  size by 30%-50% on large repositories, which results in faster load
 -time. Version 4 is relatively young (first released in in 1.8.0 in
 +time. Version 4 is relatively young (first released in 1.8.0 in
  October 2012). Other Git implementations such as JGit and libgit2
  may not support it yet.
  
@@@ -484,8 -484,8 +484,8 @@@ the `core.fsmonitor` configuration vari
  linkgit:git-config[1]) than using the `--fsmonitor` option to
  `git update-index` in each repository, especially if you want to do so
  across all repositories you use, because you can set the configuration
- variable to `true` (or `false`) in your `$HOME/.gitconfig` just once
- and have it affect all repositories you touch.
+ variable in your `$HOME/.gitconfig` just once and have it affect all
+ repositories you touch.
  
  When the `core.fsmonitor` configuration variable is changed, the
  file system monitor is added to or removed from the index the next time