From 2b312bf3c12772aa9d9c58ead289068374ed0e33 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Wed, 18 Dec 2013 22:58:13 +0100 Subject: Revert commits Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team. This undoes the changes introduced by the following commits: https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 7d342d7a7..492c430fe 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Keep track of development and community news. ## Versioning -For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. +For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format: @@ -139,9 +139,9 @@ Releases will be numbered with the following format: And constructed with the following guidelines: -* Breaking backward compatibility bumps the major (and resets the minor and patch) -* New additions without breaking backward compatibility bumps the minor (and resets the patch) -* Bug fixes and misc changes bumps the patch +* Breaking backwards compatibility bumps the major +* New additions without breaking backwards compatibility bumps the minor +* Bug fixes and misc changes bump the patch For more information on SemVer, please visit . -- cgit v1.2.3 From 0a955844ab333283657f367eef3d6031d2500a44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:24:59 -0800 Subject: rewrite readme to restore lost information, only with a bit more formatting consistency --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 492c430fe..4379a4833 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ To get started, check out ! Three quick start options are available: -* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip). -* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. -* Install with [Bower](http://bower.io): `bower install bootstrap`. +- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip). +- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. +- Install with [Bower](http://bower.io): `bower install bootstrap`. Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. @@ -122,16 +122,16 @@ With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap c Keep track of development and community news. -* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap). -* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). -* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel. +- Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap). +- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). +- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel. ## Versioning -For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. +For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under the Semantic Versioning guidelines. Sometimes we screw up, but we'll adhere to these rules whenever possible. Releases will be numbered with the following format: @@ -139,9 +139,9 @@ Releases will be numbered with the following format: And constructed with the following guidelines: -* Breaking backwards compatibility bumps the major -* New additions without breaking backwards compatibility bumps the minor -* Bug fixes and misc changes bump the patch +- **Breaking backwards compatibility **bumps the major** while resetting minor and patch +- New additions without breaking backwards compatibility **bumps the minor** while resetting the patch +- Bug fixes and misc changes **bumps only the patch** For more information on SemVer, please visit . @@ -151,13 +151,13 @@ For more information on SemVer, please visit . **Mark Otto** -+ -+ +- +- **Jacob Thornton** -+ -+ +- +- -- cgit v1.2.3 From 79e97fef40ea0f4373b39ad728a313c608b06a60 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:37:30 -0800 Subject: derp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 4379a4833..18e8afea5 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ Releases will be numbered with the following format: And constructed with the following guidelines: -- **Breaking backwards compatibility **bumps the major** while resetting minor and patch +- Breaking backwards compatibility **bumps the major** while resetting minor and patch - New additions without breaking backwards compatibility **bumps the minor** while resetting the patch - Bug fixes and misc changes **bumps only the patch** -- cgit v1.2.3 From 56c36346c189f83c225d867beac0ed8337165a31 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:38:10 -0800 Subject: drop the the, it's cleaner --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 18e8afea5..f808f08d3 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ Releases will be numbered with the following format: And constructed with the following guidelines: -- Breaking backwards compatibility **bumps the major** while resetting minor and patch -- New additions without breaking backwards compatibility **bumps the minor** while resetting the patch +- Breaking backward compatibility **bumps the major** while resetting minor and patch +- New additions without breaking backward compatibility **bumps the minor** while resetting the patch - Bug fixes and misc changes **bumps only the patch** For more information on SemVer, please visit . -- cgit v1.2.3 From cb40a2ee8c88efdec0c35adf173cc96ba25db21e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:54:24 -0800 Subject: Punt Apache license information and stick with MIT --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index f808f08d3..101b58185 100644 --- a/README.md +++ b/README.md @@ -163,4 +163,4 @@ For more information on SemVer, please visit . ## Copyright and license -Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). +Copyright 2013 Twitter, Inc under [the MIT license](LICENSE). -- cgit v1.2.3 From e8e60ae4bce85eed17c7e6801b72404494ef436a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:56:08 -0800 Subject: version bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 101b58185..64c88b356 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To get started, check out ! Three quick start options are available: -- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip). +- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.1.0.zip). - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Install with [Bower](http://bower.io): `bower install bootstrap`. -- cgit v1.2.3 From 629a4743f0740c924ce6c9ab95c614ef6f4db939 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 15:08:38 -0800 Subject: remove license readme mention --- README.md | 1 - 1 file changed, 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 64c88b356..b973ff48a 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,6 @@ 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 . -With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information. ## Community -- cgit v1.2.3