update mdbook

[rust.git] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 3c2786b8f8ee065b0eb957c1bed85f152dae6dbb..9bc018d983d7d7822cda2149245cc5eb08e3292b 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -6,16 +6,17 @@ terms.
 
 Longer version:
 
 
 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.
 
 
 The Rust Project includes packages written by third parties.


@@ -191,28 +192,6 @@ their own copyright notices and license terms:
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
     OF SUCH DAMAGE.
 
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
     OF SUCH DAMAGE.
 

-* Hoedown, the markdown parser, under src/rt/hoedown, is
-  licensed as follows.
-
-    Copyright (c) 2008, Natacha Porté
-    Copyright (c) 2011, Vicent Martí
-    Copyright (c) 2013, Devin Torres and the Hoedown authors
-
-    Permission to use, copy, modify, and distribute this
-    software for any purpose with or without fee is hereby
-    granted, provided that the above copyright notice and
-    this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR
-    DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
-    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-    SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR
-    ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-    OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-    OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-    CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-

 * libbacktrace, under src/libbacktrace:
 
     Copyright (C) 2012-2014 Free Software Foundation, Inc.
 * libbacktrace, under src/libbacktrace:
 
     Copyright (C) 2012-2014 Free Software Foundation, Inc.


@@ -282,25 +261,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.
     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.