[PATCH] Shorten and simplify sendemail.alias* configuration variables.

[Xavier Maillard <xma@gnu.org>]

I find it more consistent and less error prone to have aliasfile
instead of aliasesfile and aliastype instead of aliasfiletype.

Documentation is also updated to reflect the changes.

Signed-off-by: Xavier Maillard <xma@gnu.org>
---
 Documentation/git-send-email.txt |    8 ++++----
 git-send-email.perl              |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 336d797..33fd589 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -192,12 +192,12 @@ sendemail.identity::
 	identities and to hoist sensitive authentication information
 	out of the repository and into the global configuration file.
 
-sendemail.aliasesfile::
+sendemail.aliasfile::
 	To avoid typing long email addresses, point this to one or more
-	email aliases files.  You must also supply 'sendemail.aliasfiletype'.
+	email aliases files.  You must also supply 'sendemail.aliastype'.
 
-sendemail.aliasfiletype::
-	Format of the file(s) specified in sendemail.aliasesfile. Must be
+sendemail.aliastype::
+	Format of the file(s) specified in sendemail.aliasfile. Must be
 	one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
 sendemail.to::
diff --git a/git-send-email.perl b/git-send-email.perl
index be4a20d..1d8bb8e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -203,9 +203,9 @@ my %config_settings = (
     "smtppass" => \$smtp_authpass,
     "to" => \@to,
     "cccmd" => \$cc_cmd,
-    "aliasfiletype" => \$aliasfiletype,
+    "aliastype" => \$aliasfiletype,
     "bcc" => \@bcclist,
-    "aliasesfile" => \@alias_files,
+    "aliasfile" => \@alias_files,
     "suppresscc" => \@suppress_cc,
 );
 
-- 
1.5.4.4.685.g64f14.dirty