From 86092c9ad71bb5ce4573ccd0f51bc166c26819b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= Date: Tue, 27 May 2014 15:25:39 -0400 Subject: [PATCH] Build: Update license --- LICENSE-MIT.txt => LICENSE.txt | 25 +++++++++++++++++++++++-- page/about.md | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) rename LICENSE-MIT.txt => LICENSE.txt (63%) diff --git a/LICENSE-MIT.txt b/LICENSE.txt similarity index 63% rename from LICENSE-MIT.txt rename to LICENSE.txt index e664703e..2e50ad88 100644 --- a/LICENSE-MIT.txt +++ b/LICENSE.txt @@ -1,8 +1,14 @@ -Copyright (c) 2013 jQuery Foundation, http://jquery.org/ +Copyright 2009, 2014 jQuery Foundation and other contributors, +https://jquery.org/ This software consists of voluntary contributions made by many individuals. For exact contribution history, see the revision history -and logs, available at http://github.com/jquery/learn.jquery.com +available at https://github.com/jquery/learn.jquery.com + +The following license applies to all parts of this software except as +documented below: + +==== Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -22,3 +28,18 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +==== + +Copyright and related rights for sample code are waived via CC0. Sample +code is defined as all source code displayed within the prose of the +documentation. + +CC0: http://creativecommons.org/publicdomain/zero/1.0/ + +==== + +All files located in the node_modules directory are externally +maintained libraries used by this software which have their own +licenses; we recommend you read them, as their terms may differ from the +terms above. diff --git a/page/about.md b/page/about.md index c9e1ff25..dc583d53 100644 --- a/page/about.md +++ b/page/about.md @@ -18,7 +18,7 @@ documentation" to our community and serve the following goals: 2. Provide our **contributors** a central, open place to collaborate and provide a dependable, highly sharable resource that will improve our users' support experiences. 3. Foster an environment by which users are encouraged to become contributors and build the skills to help them work on jQuery – or any other open source project! -In order to achieve these goals, all of [this site's content is maintained publicly on GitHub](https://github.com/jquery/learn.jquery.com) and is licensed under the [MIT License](https://github.com/jquery/learn.jquery.com/blob/master/LICENSE-MIT.txt). To learn more about how the site works, take a look at our [contributing guide](/contributing/). +In order to achieve these goals, all of [this site's content is maintained publicly on GitHub](https://github.com/jquery/learn.jquery.com) and is licensed under the [MIT License](https://github.com/jquery/learn.jquery.com/blob/master/LICENSE.txt). To learn more about how the site works, take a look at our [contributing guide](/contributing/). ## History