Merge branch 'maint'

* maint:
  Document sendemail.envelopesender configuration
  Document clarification: gitmodules, gitattributes
  config.txt: Add missing colons after option name

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge