Merge branch 'maint'

* maint:
Use =20 when rfc2047 encoding spaces.
Create a new manpage for the gitignore format, and reference it elsewhere
Documentation: robustify asciidoc GIT_VERSION replacement

diff --cc Documentation/config.txt
Simple merge