diff --git a/.gitignore b/.gitignore index bd3f1fa..460916b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /_site/ +*.DS_Store diff --git a/LICENSE b/LICENSE index ec361cb..e03e9bc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,3 @@ Copyright (c) 2012 Josh Lockhart -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. +http://creativecommons.org/licenses/by-nc-sa/3.0/ diff --git a/README.md b/README.md index 9095f34..7003f42 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,6 @@ There's been a lot of discussion lately about how the PHP community lacks suffic My name is [Josh Lockhart](http://twitter.com/codeguy). I'm the author of the [Slim Framework](http://www.slimframework.com/), and I work for [New Media Campaigns](http://www.newmediacampaigns.com/). -## Copyright +## License -[MIT](http://opensource.org/licenses/MIT) +[Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License][http://creativecommons.org/licenses/by-nc-sa/3.0/] diff --git a/_includes/welcome.md b/_includes/welcome.md index 080cd94..5fbe7f2 100644 --- a/_includes/welcome.md +++ b/_includes/welcome.md @@ -1,6 +1,6 @@ # Welcome -There's a lot of bad information on the Web (I'm looking at you, W3Schools) that leads new PHP users astray, propagating bad practices and bad code. This must stop. _PHP: The Right Way_ is an easy-to-read, quick reference for PHP best practices, accepted coding standards, and links to authoritative tutorials around the Web. +There's a lot of outdated information on the Web that leads new PHP users astray, propagating bad practices and bad code. This must stop. _PHP: The Right Way_ is an easy-to-read, quick reference for PHP best practices, accepted coding standards, and links to authoritative tutorials around the Web. It is important to understand _there is no canonical way to use PHP_. That's the beauty of it. This website introduces new PHP developers to best practices, available options, and good information. diff --git a/_layouts/default.html b/_layouts/default.html index 7106a65..e4478f7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -62,9 +62,13 @@

Project sponsors

-