summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-10-15 16:51:53 -0700
committerRuss Cox <rsc@golang.org>2009-10-15 16:51:53 -0700
commit96c3809cb09820dd80548f1940a35e442c93c65d (patch)
tree9f35311262a0310a0dcf9d57e973608fd32f6007
parent73089ca4dad1dac613192c007ad4a674e92b2e83 (diff)
downloadgolang-96c3809cb09820dd80548f1940a35e442c93c65d.tar.gz
more explanatory text
R=r DELTA=11 (8 added, 0 deleted, 3 changed) OCL=35797 CL=35804
-rw-r--r--AUTHORS7
-rw-r--r--CONTRIBUTORS7
2 files changed, 11 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 067457a27..3071dd196 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,9 @@
# This is the official list of Go authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS files.
+# See the latter for an explanation.
-# Names should be added to this file like so:
-# Name or Organization <email address>
+# Names should be added to this file as
+# Name or Organization <email address>
+# The email address is not required for organizations.
Google Inc.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0dce856cc..f7619779f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -14,7 +14,12 @@
# http://code.google.com/legal/individual-cla-v1.0.html
# http://code.google.com/legal/corporate-cla-v1.0.html
#
-# The individual agreement can be filled out online.
+# The agreement for individuals can be filled out on the web.
+#
+# When adding J Random Contributor's name to this file,
+# either J's name or J's organization's name should be
+# added to the AUTHORS file, depending on whether the
+# individual or corporate CLA was used.
# Names should be added to this file like so:
# Name <email address>