Add a 'Licensing' help doc, link from main page

git-svn-id: https://supercollider.svn.sourceforge.net/svnroot/supercollider/trunk@9699 a380766d-ff14-0410-b294-a243070f3f08
supercollider · Jan 24, 2010 · 043be07 · 043be07
1 parent 93ee69e
commit 043be07
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/build/Help/Help.html b/build/Help/Help.html
@@ -549,6 +549,7 @@
 </tbody>
 </table>
 <p class="p8"><br></p>
-<p class="p9"><i>SuperCollider help docs are published under the </i><a href="Other Topics/HelpDocsLicensing.html"><span class="s2"><i>Creative Commons CC-BY-SA-3 license</i></span></a></p>
+<p class="p9"><i>SuperCollider is </i><a href="Other Topics/Licensing.html"><span class="s2"><i>free software published under the GPL</i></span></a>.<br/>
+SuperCollider help docs are published under the </i><a href="Other Topics/HelpDocsLicensing.html"><span class="s2"><i>Creative Commons CC-BY-SA-3 license</i></span></a></p>
 </body>
 </html>
diff --git a/build/Help/Other Topics/HelpDocsLicensing.html b/build/Help/Other Topics/HelpDocsLicensing.html
@@ -15,7 +15,7 @@
 
 <p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="ccbysa3_88x31.png" style="float:left;" /></a> <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type"><a href="../Help.html">SuperCollider help documentation</a></span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.</p>
 
-<p>Executable SuperCollider code remains under the GPL as stated in SuperCollider's main license conditions.</p>
+<p>Executable SuperCollider code remains under the GPL as stated in SuperCollider's main <a href="Licensing.html">license conditions</a>.</p>
 
 <p>To supply attribution for a help document (which may have multiple contributors), unless otherwise indicated you may credit "SuperCollider 3 documentation contributors".</p>
 

diff --git a/build/Help/Other Topics/Licensing.html b/build/Help/Other Topics/Licensing.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<title></title>
+<meta name="Generator" content="Cocoa HTML Writer">
+<meta name="CocoaVersion" content="824.48">
+<style type="text/css">
+p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 19.0px Helvetica}
+p.p2 {margin: 0.0px 0.0px 12.0px 0.0px; font: 12.0px Lucida Grande}
+p.p3 {margin: 0.0px 0.0px 12.0px 0.0px; font: 12.0px Helvetica}
+p.p4 {margin: 0.0px 0.0px 12.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
+span.s1 {font: 12.0px Helvetica}
+span.s2 {text-decoration: underline ; color: #0021e7}
+span.s3 {text-decoration: underline ; color: #0039da}
+</style>
+</head>
+<body>
+<p class="p1"><b>SuperCollider Licensing</b><span class="s1"> </span></p>
+<p class="p2">SuperCollider is copyright © James McCartney and many other contributors.</p>
+<p class="p3">SuperCollider is free software: you can redistribute it and/or modify it under the terms of the <b>GNU General Public License</b> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p>
+<p class="p3">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.<span class="Apple-converted-space">  </span>See the GNU General Public License for more details.</p>
+<p class="p3">You should have received a copy of <a href="../../../COPYING"><span class="s2">the GNU General Public License</span></a> along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</p>
+<p class="p4"><br></p>
+<p class="p3">--</p>
+<p class="p3"><b>Some further notes:</b></p>
+<p class="p3">SuperCollider was originally published under the terms of <b><i>version 2 or later</i></b> of the GPL, but the application now includes some GPL3-licensed code. If you have a need specifically for GPL2 compatibility then it is possible to recompile SuperCollider from source without the GPL3 elements.</p>
+<p class="p3">SuperCollider's help documentation is published under <a href="HelpDocsLicensing.html"><span class="s3">a Creative Commons license</span></a>.</p>
+</body>
+</html>