X-Git-Url: http://git.steven-mcdonald.id.au/?p=www.git;a=blobdiff_plain;f=licence.shtml;h=d1c8e19d86c34f36fa8869cca7c02ce593c84f78;hp=64c1fb71844fb7817b053adaec938c7667fcae3f;hb=ac280ce1b7bc5bab433dd1b6fa6073cf63adfe9d;hpb=612dca6fe039ea525899b0d351235d33685439df diff --git a/licence.shtml b/licence.shtml old mode 100755 new mode 100644 index 64c1fb7..d1c8e19 --- a/licence.shtml +++ b/licence.shtml @@ -19,25 +19,24 @@

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. + 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.

- 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