From f5722a81faec8c4e0dafb93a5f8e2479b033eaed Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 12 Nov 2015 13:00:57 +0000
Subject: [PATCH] A+C: alter email-address description to cover more than two

Explictly list the alternative formats in each file.  In AUTHORS, refer
to CONTRIBUTORS' definition of multiple email addresses.  Indent with
four spaces;  AUTHORS used a tab, but CONTRIBUTORS used four spaces.
s/Rietveld/Gerrit/

Change the tab separating Sebastien Binet from his email address,
added in 2010's 18b02f6c.

Change-Id: Id52228ae6b62dd88ad8098110c22373bf14e068f
Reviewed-on: https://go-review.googlesource.com/16826
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 AUTHORS      | 10 ++++++----
 CONTRIBUTORS |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index acdb937cd9..c58a2bb1b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,9 +2,11 @@
 # This file is distinct from the CONTRIBUTORS files.
 # See the latter for an explanation.
 
-# Names should be added to this file as
-#	Name or Organization <email address>
-# The email address is not required for organizations.
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+# See CONTRIBUTORS for the meaning of multiple email addresses.
 
 # Please keep the list sorted.
 
@@ -528,7 +530,7 @@ Sanjay Menakuru <balasanjay@gmail.com>
 Scott Barron <scott.barron@github.com>
 Scott Ferguson <scottwferg@gmail.com>
 Scott Lawrence <bytbox@gmail.com>
-Sebastien Binet	<seb.binet@gmail.com>
+Sebastien Binet <seb.binet@gmail.com>
 Sébastien Paolacci <sebastien.paolacci@gmail.com>
 Sergei Skorobogatov <skorobo@rambler.ru>
 Sergey 'SnakE'  Gromov <snake.scaly@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0f370a5b8e..5b8d7a35a8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -22,12 +22,13 @@
 # individual or corporate CLA was used.
 
 # Names should be added to this file like so:
-#     Name <email address>
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
 #
-# An entry with two email addresses specifies that the
+# An entry with multiple email addresses specifies that the
 # first address should be used in the submit logs and
-# that the second address should be recognized as the
-# same person when interacting with Rietveld.
+# that the other addresses should be recognized as the
+# same person when interacting with Gerrit.
 
 # Please keep the list sorted.