diff --git a/CHANGELOG.md b/CHANGELOG.md index 1004ddb..f7a01ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Add MIT License * Implement scribu's [Theme Wrapper](http://scribu.net/wordpress/theme-wrappers.html) (see `base.php`) * Move templates, `comments.php`, and `searchform.php` to `templates/` folder * Rename `loop-` files to `content-` diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..579d95c --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,19 @@ +Copyright (c) 2012 Ben Word and Scott Walkinshaw + +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 dd1327d..d3d3e1f 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Edit `inc/config.php` to enable support for major functionality and to define co * HTML5 Boilerplate’s markup and `.htaccess` * Bootstrap from Twitter +* Theme wrapper * Root relative URLs * Clean URLs (no more `/wp-content/`) * All static theme assets are rewritten to the website root (`/css/`, `/img/`, and `/js/`) @@ -42,18 +43,4 @@ Everyone is welcome to help improve this project. There are several ways you can * Docs: [https://github.com/retlehs/roots/wiki](https://github.com/retlehs/roots/wiki) * Mailing list: [http://groups.google.com/group/roots-theme](http://groups.google.com/group/roots-theme) * Twitter: [@retlehs](https://twitter.com/#!/retlehs) -* Contributors: [https://github.com/retlehs/roots/contributors](https://github.com/retlehs/roots/contributors) - -## License - -### Major components: - -* HTML5 Boilerplate: The Unlicense -* Modernizr: MIT/BSD license -* jQuery: MIT/GPL license -* Normalize.css: Public Domain -* Bootstrap: Apache 2.0 license - -### Everything else: - -The Unlicense (aka: public domain) \ No newline at end of file +* Contributors: [https://github.com/retlehs/roots/contributors](https://github.com/retlehs/roots/contributors) \ No newline at end of file diff --git a/style.css b/style.css index d9e28b2..c49e709 100644 --- a/style.css +++ b/style.css @@ -6,6 +6,5 @@ Version: 5.2.0 Author: Ben Word Author URI: http://benword.com/ -License: The Unlicense -License URI: http://unlicense.org/ -*/ +License: MIT License +*/ \ No newline at end of file