Merge branch 'maint'

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

diff --combined Documentation/config.txt
index af57d943049d5cf39b9681004cb0c7fd30a70c94,3727239891321a52d16fa7f9ed73bf172b758c48..ed3285f89927e1d988527ae5b67a5bea357d30e0
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -572,10 -572,6 +572,10 @@@ diff.autorefreshindex:
        affects only 'git-diff' Porcelain, and not lower level
        'diff' commands, such as 'git-diff-files'.
  
 +diff.suppress-blank-empty::
 +      A boolean to inhibit the standard behavior of printing a space
 +      before each empty output line. Defaults to false.
 +
  diff.external::
        If this config variable is set, diff generation is not
        performed using the internal diff machinery, but using the
@@@ -697,7 -693,7 +697,7 @@@ gitcvs.logfile:
        Path to a log file where the CVS server interface well... logs
        various stuff. See linkgit:git-cvsserver[1].
  
- gitcvs.usecrlfattr
+ gitcvs.usecrlfattr::
        If true, the server will look up the `crlf` attribute for
        files to determine the '-k' modes to use. If `crlf` is set,
        the '-k' mode will be left blank, so cvs clients will

diff --combined Documentation/gitattributes.txt
index 1f23d27a61dc01a5d3988afe4593f61ee3434c4d,49a167f241f0832e62fb905390715e45ef5be3c4..5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -7,7 -7,7 +7,7 @@@ gitattributes - defining attributes pe
  
  SYNOPSIS
  --------
- $GIT_DIR/info/attributes, gitattributes
+ $GIT_DIR/info/attributes, .gitattributes
  
  
  DESCRIPTION
@@@ -315,14 -315,10 +315,14 @@@ patterns are available
  
  - `pascal` suitable for source code in the Pascal/Delphi language.
  
 +- `python` suitable for source code in the Python language.
 +
  - `ruby` suitable for source code in the Ruby language.
  
  - `tex` suitable for source code for LaTeX documents.
  
 +- `html` suitable for HTML/XHTML documents.
 +
  
  Performing a three-way merge
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~