From 44f21d729f308e13f46960cddce8068e4026013d Mon Sep 17 00:00:00 2001 From: "Jacob M. Roufa" Date: Wed, 7 Dec 2016 11:25:40 -0700 Subject: [PATCH] refs #18934, updates for JS Foundation rebrand and CLA process --- CONTRIBUTING.md | 14 ++++++-------- LICENSE | 6 +++--- README.md | 6 ++---- encoding/LICENSE | 2 +- sql/LICENSE | 2 +- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13cdf4f37c..39c47314df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,17 +27,16 @@ If your desired contribution is more than a non-trivial fix, you should discuss ## Contributor License Agreement -We require all contributions, to be covered under the Dojo Foundation's [Contributor License Agreement][cla]. This can +We require all contributions, to be covered under the JS Foundation's [Contributor License Agreement][cla]. This can be done electronically and essentially ensures that you are making it clear that your contributions are your -contributions, you have the legal right to contribute and you are transferring the copyright of your works to the Dojo +contributions, you have the legal right to contribute and you are transferring the copyright of your works to the JS Foundation. If you are an unfamiliar contributor to the committer assessing your pull request, it is best to make it clear how -you are covered by a CLA in the notes of the pull request. The committer will [verify][claCheck] your status. +you are covered by a CLA in the notes of the pull request. A bot will verify your status. -If your GitHub user id you are submitting your pull request from differs from the Dojo Community ID or e-mail address -which you have signed your CLA under, you should specifically note what you have your CLA filed under (and for CCLA -that you are listed under your companies authorised contributors). +If your GitHub user id you are submitting your pull request from differs from the e-mail address +which you have signed your CLA under, you should specifically note what you have your CLA filed under. # Submitting a Pull Request @@ -215,8 +214,7 @@ unfamiliar to those who are just starting to contribute. [bug database]: http://bugs.dojotoolkit.org/ [support forum]: http://dojotoolkit.org/community/ [dojo-contrib]: http://mail.dojotoolkit.org/mailman/listinfo/dojo-contributors -[cla]: http://dojofoundation.org/about/cla -[claCheck]: http://dojofoundation.org/about/claCheck +[cla]: http://js.foundation/CLA [Creating a Pull Request]: https://help.github.com/articles/creating-a-pull-request [Fork a Repo]: https://help.github.com/articles/fork-a-repo [Intern]: http://theintern.io/ diff --git a/LICENSE b/LICENSE index 0f27d7f3a1..f5c47f5b7f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Dojo is available under *either* the terms of the modified BSD license *or* the Academic Free License version 2.1. As a recipient of Dojo, you may choose which license to receive this code under (except as noted in per-module LICENSE -files). Some modules may not be the copyright of the Dojo Foundation. These +files). Some modules may not be the copyright of the JS Foundation. These modules contain explicit declarations of copyright in both the LICENSE files in the directories in which they reside and in the code itself. No external contributions are allowed under licenses which are fundamentally incompatible @@ -13,7 +13,7 @@ The text of the AFL and BSD licenses is reproduced below. The "New" BSD License: ********************** -Copyright (c) 2005-2016, The Dojo Foundation +Copyright (c) 2005-2016, The JS Foundation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Dojo Foundation nor the names of its contributors + * Neither the name of the JS Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/README.md b/README.md index bd676ce293..b08d2a277a 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ essentially abandoned. All of the packages require the Dojo Toolkit [core][] an You should read the ``README`` file contained in each sub-package to understand the status of the code contained within. -DojoX is currently not accepting any new sub-packages or projects. There are many community packages available at -[Dojo Foundation Packages][] and additional packages can be registered there as well. If you are interested in adding +DojoX is currently not accepting any new sub-packages or projects. If you are interested in adding to the community of packages, please discuss in the [Community Forum][]. ## Installing @@ -29,7 +28,7 @@ If you are starting out with Dojo, the following resources are available to you: ## License and Copyright The Dojo Toolkit (including this package) is dual licensed under BSD 3-Clause and AFL. For more information on the -license please see the [License Information][]. The Dojo Toolkit is Copyright (c) 2005-2016, The Dojo Foundation. All +license please see the [License Information][]. The Dojo Toolkit is Copyright (c) 2005-2016, The JS Foundation. All rights reserved. [core]: https://github.com/dojo/dojo/ @@ -40,4 +39,3 @@ rights reserved. [API Documentation]: http://dojotoolkit.org/api/ [Community Forum]: http://dojotoolkit.org/community/ [License Information]: http://dojotoolkit.org/license -[Dojo Foundation Packages]: http://packages.dojofoundation.org/ diff --git a/encoding/LICENSE b/encoding/LICENSE index f0a4be545a..ae8ce7d81c 100644 --- a/encoding/LICENSE +++ b/encoding/LICENSE @@ -1,6 +1,6 @@ License Disclaimer: -All contents of this directory are Copyright (c) the Dojo Foundation, with the +All contents of this directory are Copyright (c) the JS Foundation, with the following exceptions: ------------------------------------------------------------------------------- diff --git a/sql/LICENSE b/sql/LICENSE index 5c277ec9c8..ef0f52329b 100644 --- a/sql/LICENSE +++ b/sql/LICENSE @@ -1,6 +1,6 @@ License Disclaimer: -All contents of this directory are Copyright (c) the Dojo Foundation, with the +All contents of this directory are Copyright (c) the JS Foundation, with the following exceptions: -------------------------------------------------------------------------------