Merge branch 'lt/bool-on-off'

* lt/bool-on-off:
  Documentation: boolean value may be given by on/off
  Allow users to un-configure rename detection

diff --cc Documentation/config.txt
Simple merge

diff --cc config.c
Simple merge