about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-12-16 17:20:53 -0800
committerGraydon Hoare <graydon@mozilla.com>2011-12-16 17:21:28 -0800
commit0ca50a28288563ac836c0af2a1f49dc69a425fdf (patch)
tree2f259655c5cef571c7a495ace83aa80128668696
parent1477fb3f2bc105978e1ffb40efa0fbfbd5ef3a5c (diff)
downloadrust-0ca50a28288563ac836c0af2a1f49dc69a425fdf.tar.gz
rust-0ca50a28288563ac836c0af2a1f49dc69a425fdf.zip
Add additional pretend legalese to cover not-mozilla and not-otherwise-mentioned copyright holders.
-rw-r--r--LICENSE.txt25
1 files changed, 24 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index fae921844d8..290debb1b63 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -223,9 +223,32 @@ included:
   details.
 
 
+* Additional copyright may be retained by contributors other
+  than Mozilla or the parties enumerated in this file. Such
+  copyright can be determined on a case-by-case basis by
+  examining the author of each portion of a file in the
+  revision-control commit records of the project, or by
+  consulting representative comments claiming copyright
+  ownership for a file.
+
+   For example, the text:
+
+      "Copyright (c) 2011 Google Inc."
+
+   appears in some files, and these files thereby denote
+   that their author and copyright-holder is Google Inc.
+
+   In all such cases, the absence of explicit licensing text
+   indicates that the contributor chose to license their
+   work for distribution under identical terms to those
+   Mozilla has chosen for the collective work, enumerated
+   below.  The only difference is the retention of copyright
+   itself, held by the contributor.
+
+
 The remaining code and documentation in the collective work
 presented here, as well as the collective work itslf, is
-distributed under the following terms:
+distributed under the following terms ("The Rust License"):
 
     Copyright (c) 2006-2011 Graydon Hoare
     Copyright (c) 2009-2011 Mozilla Foundation