From: Steven McDonald Date: Sun, 10 Jul 2011 00:27:12 +0000 (+1000) Subject: Revert "Added GPL option and clarification on reason for licensing terms." X-Git-Url: http://git.steven-mcdonald.id.au/?a=commitdiff_plain;h=93eed7401525aafe89962377fb2e9364da05c089;p=www.git Revert "Added GPL option and clarification on reason for licensing terms." Also discovered why commits should have only one change at a time, as I only wanted to remove GPL option and leave clarification :) --- diff --git a/main/licence.shtml b/main/licence.shtml index f567248..4346125 100755 --- a/main/licence.shtml +++ b/main/licence.shtml @@ -19,28 +19,25 @@

Unless otherwise noted, permission is granted to copy, distribute and/or - modify content on this website under the terms of either the Creative Commons - Attribution-Sharealike Unported License, version 3.0 or any later - version published by Creative Commons, or the GNU General - Public License, version 2 or any later version published by the Free - Software Foundation. For the avoidance of doubt, "this website" means any - content accessible via HTTP under the www.steven-mcdonald.id.au domain, - and does not include content under the images, non-free or any other - subdomain. + Attribution-Sharealike Unported License, Version 3.0 or any later + version published by Creative Commons. For the avoidance of doubt, "this + website" means any content accessible via HTTP under the + www.steven-mcdonald.id.au domain, and does not include content under the + images, non-free or any other subdomain.

- The latter option is provided mainly for compatibility with many existing - free software projects; if you would like to use anything published here in - a project which is licensed incompatibly with both of the licences above, - please feel free to email me. + If you would like to use anything published here in a project which is + licensed incompatibly with the licence above, please feel free to email me. If it's for a project whose goals are + friendly to the free software and/or free culture movements, it's probably + fine.

- It's not required by either of the licences, but if you do use a - substantial portion of anything I've published here in a derived work or - publish it elsewhere, I would appreciate it if you could tell me about it. - :-) + It's not required by the licence, but if you do use a substantial portion + of anything I've published here in a derived work or publish it elsewhere, + I would appreciate it if you could tell me about it. :-)

Common Exceptions