diff options
author | Josh Triplett <josh@joshtriplett.org> | 2017-07-26 16:45:28 -0700 |
---|---|---|
committer | Josh Triplett <josh@joshtriplett.org> | 2017-07-26 16:52:15 -0700 |
commit | f1de27fe6b73a8463fb49d4d2c88a24fa7031b82 (patch) | |
tree | 7bb68b77b0646fd4c4bfc4eb37703c3d2ea63940 | |
parent | 2a8807e889a43c6b89eb6f2736907afa87ae592f (diff) | |
download | rust-f1de27fe6b73a8463fb49d4d2c88a24fa7031b82.tar.gz |
COPYRIGHT: Provide a better explanation of Rust copyrights
Avoid implying that any copyrights have been assigned to a separate
entity (such as "The Rust Project Developers") Rust contributors retain
their copyrights, and do not assign them to anyone by contributing.
Remove the inaccurate notice, and provide a clear explanation. Avoid
stating that all files contain copyright notices and/or license notices,
and especially avoid suggesting that the license terms only apply to
files marked as such.
In the process, this also drops a separate notice that implies only some
copyrights are retained by contributors (suggesting that others are
not).
-rw-r--r-- | COPYRIGHT | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/COPYRIGHT b/COPYRIGHT index 3c2786b8f8e..f8b637d204a 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -6,16 +6,17 @@ terms. Longer version: -The Rust Project is copyright 2010, The Rust Project -Developers. +Copyrights in the Rust project are retained by their contributors. No +copyright assignment is required to contribute to the Rust project. -Licensed under the Apache License, Version 2.0 -<LICENSE-APACHE or -http://www.apache.org/licenses/LICENSE-2.0> or the MIT -license <LICENSE-MIT or http://opensource.org/licenses/MIT>, -at your option. All files in the project carrying such -notice may not be copied, modified, or distributed except -according to those terms. +Some files include explicit copyright notices and/or license notices. +For full authorship information, see AUTHORS.txt and the version control +history. + +Except as otherwise noted (below and/or in individual files), Rust is +licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or +<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option. The Rust Project includes packages written by third parties. @@ -282,25 +283,3 @@ their own copyright notices and license terms: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -* Additional copyright may be retained by contributors other - than Mozilla, the Rust Project Developers, 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 at the top - of this file. The only difference is the retention of - copyright itself, held by the contributor. |