diff --git a/CHANGELOG b/CHANGELOG.md similarity index 97% rename from CHANGELOG rename to CHANGELOG.md index a31ce3b..85d5dd0 100644 --- a/CHANGELOG +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ == HEAD * Add bundled docs (#1154). +* Add MIT license (#1139). * Code format and consistency changes (#1112). * Improve `console.log` protection (#1107). * Replace hot pink text selection color with a neutral color. @@ -30,7 +31,8 @@ * Revert to async snippet for the Google Analytics script. * Remove the ant build script (#826). * Remove Respond.js (#816). -* Remove the `test/` directory. +* Remove the `demo/` directory (#808). +* Remove the `test/` directory (#808). * Remove Google Chrome Frame script for IE6 users; replace with links to Chrome Frame and options for alternative browsers. * Remove `initial-scale=1` from the viewport `meta`** (#824). * Remove `defer` from all scripts to avoid legacy IE bugs. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..294e91d --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,19 @@ +Copyright (c) HTML5 Boilerplate + +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. diff --git a/README.md b/README.md index c96a949..af3f211 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,3 @@ want to write about your project. Anyone and everyone is welcome to [contribute](/h5bp/html5-boilerplate/blob/master/doc/contribute.md). Hundreds of developers have helped make the HTML5 Boilerplate what it is today. - - -## License - -The Unlicense (aka: public domain)