Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Note About Changing to MIT #9994

Closed
wants to merge 5 commits into from
Closed

Add Note About Changing to MIT #9994

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c3dd3e
Add Note About Changing to MIT
rhodrykorb Aug 21, 2013
c437f5c
Fixed typo
rhodrykorb Aug 21, 2013
616ee99
Adjusted note based on @juthilo's feedback
rhodrykorb Aug 21, 2013
4d860d1
Fixed MIT link
rhodrykorb Aug 21, 2013
be3ee83
Changed to dual-license text
rhodrykorb Aug 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably want to avoid having 2 conflicting "you agree to license your contribution under" sentences.
May want to combine them and rephrase it as dual licensing.


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.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some typos on this line - I would perhaps write:
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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair call and I agree.
Was just using wording previously suggested.

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
21 changes: 21 additions & 0 deletions MIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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).
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add new line perhaps?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-Jog 2013 Twitter, Inc. az az Apache 2.0 licenc