From 0c3dd3e54e51c4c99ce1f19e106d8e044b4f5c61 Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Wed, 21 Aug 2013 22:47:22 +0800 Subject: [PATCH 1/5] Add Note About Changing to MIT --- CONTRIBUTING.md | 4 ++++ MIT | 21 +++++++++++++++++++++ README.md | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 MIT diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cbd6e32c2a2..0fdf4d2f7e6b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,3 +56,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE + +NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of getting approval of all commiteers of coder in the version 3.x code base. +By contributing your code, you agree to license your contirbution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/LICENSE +For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 \ No newline at end of file diff --git a/MIT b/MIT new file mode 100644 index 000000000000..ae039ac75888 --- /dev/null +++ b/MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Twitter, Inc + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND 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. \ No newline at end of file diff --git a/README.md b/README.md index 03f8f3362bf5..60daeafdc878 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ More over, if your pull request contains JavaScript patches or features, you mus Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org). +For v3.1 we will be changing the license from Apache to MIT, please refer to CONTRIBUTING for more information. ## Community @@ -138,4 +139,4 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ## Copyright and license -Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). +Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). \ No newline at end of file From c437f5c9e85148e3ee96339ece0e5de89a9b900f Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Wed, 21 Aug 2013 23:05:42 +0800 Subject: [PATCH 2/5] Fixed typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0fdf4d2f7e6b..22c54fb15f6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,5 +58,5 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of getting approval of all commiteers of coder in the version 3.x code base. -By contributing your code, you agree to license your contirbution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/LICENSE +By contributing your code, you agree to license your contribution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/LICENSE For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 \ No newline at end of file From 616ee9915c1b2519a119b954751739ea54907738 Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Wed, 21 Aug 2013 23:11:22 +0800 Subject: [PATCH 3/5] Adjusted note based on @juthilo's feedback --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22c54fb15f6c..e5fb7dccfe70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE -NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of getting approval of all commiteers of coder in the version 3.x code base. +NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of collecting permissions to do so from all authors of Bootstrap code that is still in the current code base. By contributing your code, you agree to license your contribution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/LICENSE For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 \ No newline at end of file From 4d860d17c4f99769e6751b937634ac1c04bad791 Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Wed, 21 Aug 2013 23:22:40 +0800 Subject: [PATCH 4/5] Fixed MIT link --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5fb7dccfe70..babab59e4f0d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,5 +58,5 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of collecting permissions to do so from all authors of Bootstrap code that is still in the current code base. -By contributing your code, you agree to license your contribution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/LICENSE +By contributing your code, you agree to license your contribution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/MIT For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 \ No newline at end of file From be3ee836dc329b7853a98a9cd98031fde0154d06 Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Thu, 22 Aug 2013 07:08:29 +0800 Subject: [PATCH 5/5] Changed to dual-license text --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index babab59e4f0d..4b11566e009c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,8 +55,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE +For v3.1 we will be changing the license from Apache to MIT and are in the process of collecting permissions to do so from all authors of Bootstrap code that is still in the current code base. +For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 -NOTE FOR VERSION 3.0.1: For v3.1 we will be changing the license from Apache to MIT and are in the process of collecting permissions to do so from all authors of Bootstrap code that is still in the current code base. -By contributing your code, you agree to license your contribution under the terms of the MIT License: https://github.com/twbs/bootstrap/blob/master/MIT -For details please see issue #2054 at https://github.com/twbs/bootstrap/issues/2054 \ No newline at end of file +By contributing your code, you agree to dual-license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE and MIT License: https://github.com/twbs/bootstrap/blob/master/MIT