aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorBartosz Dziewoński <matma.rex@gmail.com>2016-11-21 15:48:24 +0100
committerBartosz Dziewoński <matma.rex@gmail.com>2016-11-21 16:02:39 +0100
commite1ae2966675514b67fb914eae8774818a80db057 (patch)
tree2bddfa181e086b1d5fd6e2369fcdc893f703b57a /.mailmap
parent2f5ee9518857b4384518a283ff2d963145a8b119 (diff)
downloadmediawikicore-e1ae2966675514b67fb914eae8774818a80db057.tar.gz
mediawikicore-e1ae2966675514b67fb914eae8774818a80db057.zip
.mailmap: Correct typos in introduction
Change-Id: Ib37b486639ab43aeb158b7ff36cecdff8fd0e571
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 5 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap
index 6d9f8e8bcb78..02cd003beab5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,18 +3,18 @@
#
# To update the CREDITS file, run maintenance/updateCredits.php
#
-# Two types of entries are useful here. The first sets a cannonical author
+# Two types of entries are useful here. The first sets a canonical author
# name for a given email address:
#
-# Cannonical Author Name <author email>
+# Canonical Author Name <author email>
#
# The second allows collecting alternate email addresses into a single
-# cannonical author name and email address:
+# canonical author name and email address:
#
-# Cannonical Author Name <author email> <alternate email>
+# Canonical Author Name <author email> <alternate email>
#
# Mappings are only needed for authors who have used multiple author names
-# and/or author emails for revisions over time. Author names begenning with
+# and/or author emails for revisions over time. Author names beginning with
# "[BOT]" will be omitted from the CREDITS file.
#
# See also: https://git-scm.com/docs/git-shortlog#_mapping_authors