Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 3727776a0bf3196cd1d99ba4c2756767dca00567..4b8ec8a2005fe5704d43e1bab247d517e1218e5e 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -113,8 +113,7 @@ The --cc option must be repeated for each user you want on the cc list.
        is not set, this will be prompted for.
 
 --suppress-from, --no-suppress-from::
-        If this is set, do not add the From: address to the cc: list, if it
-        shows up in a From: line.
+        If this is set, do not add the From: address to the cc: list.
         Default is the value of 'sendemail.suppressfrom' configuration value;
         if that is unspecified, default to --no-suppress-from.
 
@@ -149,7 +148,7 @@ sendemail.identity::
        'sendemail.<identity>.<item>' will have higher precedence than
        'sendemail.<item>'. This is useful to declare multiple SMTP
        identities and to hoist sensitive authentication information
-       out of the repository and into the global configuation file.
+       out of the repository and into the global configuration file.
 
 sendemail.aliasesfile::
        To avoid typing long email addresses, point this to one or more
@@ -159,6 +158,9 @@ sendemail.aliasfiletype::
        Format of the file(s) specified in sendemail.aliasesfile. Must be
        one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
+sendemail.to::
+       Email address (or alias) to always send to.
+
 sendemail.cccmd::
        Command to execute to generate per patch file specific "Cc:"s.
 
@@ -194,4 +196,4 @@ Documentation by Ryan Anderson
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite