[m-rev.] for review [www]: Try to clarify licensing.

Peter Wang novalazy at gmail.com
Thu Apr 18 14:43:09 AEST 2013 

Also trying to think up a slogan for the main page.
---

Branch: redesign-proposal

The main download page simplified the licensing terms.  The separate
'license' page stated the full situation but included a full copy of
only the GPL which may be misleading.  Including both the GPL
and LGPL would be too much.

include/download.inc:
	Move the licensing statement to the top of the main download
	page.

	Link to the (text) copies of the GPL and LGPL instead of
	reproducing them inline.

download/COPYING:
download/COPYING.LIB:
	Add these files from the Mercury distribution.

download/license.php:
include/menubar.inc:
	Delete separate license page.

diff --git a/download/COPYING b/download/COPYING
new file mode 100644
index 0000000..a43ea21
--- /dev/null
+++ b/download/COPYING
[snip]

diff --git a/download/COPYING.LIB b/download/COPYING.LIB
new file mode 100644
index 0000000..eb685a5
--- /dev/null
+++ b/download/COPYING.LIB
[snip]

diff --git a/download/include/license.inc b/download/include/license.inc
index 6d95c2d..aeb708c 100644
--- a/download/include/license.inc
+++ b/download/include/license.inc
@@ -5,7 +5,7 @@ The Mercury implementation is free software, but it is Copyright
 (C) 1993-2013 The University of Melbourne.  It is distributed
 under the terms of the
 <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License (GPL)</a>.
-See the file COPYING for copying permission.
+See the file <a href="/download/COPYING">COPYING</a> for copying permission.
 </p>
 
 <p>
[snip]

diff --git a/download/license.php b/download/license.php
deleted file mode 100644
index 73d7485..0000000
--- a/download/license.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<?php
-    $menu="Download";
-    $title="License";
-    $dir="download";
-    $root="..";
-    $include="license.inc";
-    include "$root/include/template.inc"
-?>
-</HTML>
diff --git a/include/download.inc b/include/download.inc
index 759dcc3..d7c886f 100644
--- a/include/download.inc
+++ b/include/download.inc
@@ -1,9 +1,5 @@
 <H2>Download</H2>
 <?php $next_beta_version="" ?>
-<p>
-The Mercury compiler is free software, and is distributed under the
-terms of the GNU General Public License.
-</p>
 
 <p>
 Source downloads are available from
@@ -13,6 +9,24 @@ project's hosting,
 we hope to improve this in the future.
 </p>
 
+<H3> License </H3>
+
+<p>
+The Mercury implementation is free software, but it is Copyright
+(C) 1993-2013 The University of Melbourne.  It is distributed
+under the terms of the
+<a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License (GPL)</a>.
+See the file <a href="download/COPYING">COPYING</a> for copying permission.
+</p>
+
+<p>
+The Mercury libraries and runtime (the files in the library, trace,
+browser, ssdb, mdbcomp and runtime subdirectories) are distributed
+under the terms of the
+<a href="http://www.gnu.org/licenses/lgpl-2.0.html">GNU Library General Public License (LGPL)</a>.
+See the file <a href="download/COPYING.LIB">COPYING.LIB</a> for copying permissions for those files.
+</p>
+
 <H3> Stable Release </H3>
 
 <?php
diff --git a/include/menubar.inc b/include/menubar.inc
index 0f76e86..c8502c5 100644
--- a/include/menubar.inc
+++ b/include/menubar.inc
@@ -30,10 +30,6 @@
 	<?php
 	if($menu == "Download") { ?>
 	<ul class="submenu">
-	<li><a href="<?php echo $root?>/download/license.html">
-	<div <?php if($include=="license.inc"){ ?> class="submenucurrent" <?php } ?>>
-	license</div></a></li>
-	<hr/>
 	<li><a href="<?php echo $root?>/download/releases.html">
 	<div <?php if($include=="releases.inc"){ ?> class="submenucurrent" <?php } ?>>
 	releases</div></a></li>

More information about the reviews mailing list