X-Git-Url: http://git.steven-mcdonald.id.au/?p=www.git;a=blobdiff_plain;f=licence.shtml;h=25eec9a47f6833ca5c373829451806ebfcae1b7f;hp=43461254986cb72ca550aeff636767e3028ecd4b;hb=205dfbc4009faffce8083a90a02e73e5b8216651;hpb=2e9fd186fd6377e6a889162e5860d753ced4ec77 diff --git a/licence.shtml b/licence.shtml index 4346125..25eec9a 100755 --- a/licence.shtml +++ b/licence.shtml @@ -19,25 +19,26 @@

Unless otherwise noted, permission is granted to copy, distribute and/or - modify content on this website under the terms of the Creative Commons - 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. + 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.

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

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

Common Exceptions @@ -48,10 +49,6 @@ website. W3C® grants permission for their use on webpages which pass their HTML and CSS validators, respectively.

-

- These images are hosted under the non-free subdomain, this section is only - meant for clarity. -