license updates.

LS-Lab · Sep 30, 2015 · cdf0623 · cdf0623
1 parent d442e5d
commit cdf0623
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 150 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,2 +1,30 @@
-These files are part of the KeYmaera X Prover.
-Copyright (c) Carnegie Mellon University, 2014-2015. Developed by Nathan Fulton, Stefan Mitsch, Jan-David Quesel, Marcus Volp, and Andre Platzer.
+KeYmaera X
+Copyright (C) 2014-2015 Andre Platzer, Nathan Fulton, Stefan Mitsch, Ran Ji
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+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.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact Information
+
+Electronic Mail: 
+  keymaerax@keymaerax.org
+
+Paper Mail:
+  Andre Platzer
+  Computer Science Department
+  5000 Forbes Ave.
+  Pittsburgh, PA
+  15213
+
+
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -276,64 +276,3 @@ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    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.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/keymaerax-webui/src/main/resources/partials/license_dialog.html b/keymaerax-webui/src/main/resources/partials/license_dialog.html
@@ -2,7 +2,8 @@
     <h3 class="modal-title"><!--<i class="glyphicon glyphicon-thumbs-down"></i>-->KeYmaera X License</h3>
 </div>
 <div class="modal-body">
-    KeYmaera X <br>
+    KeYmaera X version 4.0b1, Copyright (C) 2014-2015 Andre Platzer, Nathan Fulton, Stefan Mitsch, Ran Ji<br>
+    KeYmaera X comes with ABSOLUTELY NO WARRANTY. A full software license agreement follows.<br/>
     SOFTWARE LICENSE AGREEMENT<br>
     <!--ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY-->
     <div ng-show="noModalForHelpDialogHack"> <font color="#D000FF"><em>(scroll to the end for details)</em></font> </div>
@@ -401,92 +402,6 @@ <h3><a id="terms"></a><a id="SEC3">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTIO
     POSSIBILITY OF SUCH DAMAGES.
 </p>
 
-    <h3>END OF TERMS AND CONDITIONS</h3>
-
-    <h3><a id="howto"></a><a id="SEC4">How to Apply These Terms to Your New Programs</a></h3>
-
-    <p>
-        If you develop a new program, and you want it to be of the greatest
-        possible use to the public, the best way to achieve this is to make it
-        free software which everyone can redistribute and change under these terms.
-    </p>
-
-    <p>
-        To do so, attach the following notices to the program.  It is safest
-        to attach them to the start of each source file to most effectively
-        convey the exclusion of warranty; and each file should have at least
-        the "copyright" line and a pointer to where the full notice is found.
-    </p>
-
-<pre>
-<var>one line to give the program's name and an idea of what it does.</var>
-Copyright (C) <var>yyyy</var>  <var>name of author</var>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-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.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-</pre>
-
-    <p>
-        Also add information on how to contact you by electronic and paper mail.
-    </p>
-
-    <p>
-        If the program is interactive, make it output a short notice like this
-        when it starts in an interactive mode:
-    </p>
-
-<pre>
-Gnomovision version 69, Copyright (C) <var>year</var> <var>name of author</var>
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
-for details.
-</pre>
-
-    <p>
-        The hypothetical commands <samp>`show w'</samp> and <samp>`show c'</samp> should show
-        the appropriate parts of the General Public License.  Of course, the
-        commands you use may be called something other than <samp>`show w'</samp> and
-        <samp>`show c'</samp>; they could even be mouse-clicks or menu items--whatever
-        suits your program.
-    </p>
-
-    <p>
-        You should also get your employer (if you work as a programmer) or your
-        school, if any, to sign a "copyright disclaimer" for the program, if
-        necessary.  Here is a sample; alter the names:
-    </p>
-
-
-<pre>
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written
-by James Hacker.
-
-<var>signature of Ty Coon</var>, 1 April 1989
-Ty Coon, President of Vice
-</pre>
-
-    <p>
-        This General Public License does not permit incorporating your program into
-        proprietary programs.  If your program is a subroutine library, you may
-        consider it more useful to permit linking proprietary applications with the
-        library.  If this is what you want to do, use the
-        <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
-        instead of this License.
-    </p>
     <!--This is a license agreement ("Agreement") between your academic institution or non-profit organization or self (called "Licensee" or "You" in this Agreement) and Carnegie Mellon University (called "Licensor" in this Agreement).  All rights not specifically granted to you in this Agreement are reserved for Licensor. <br>-->
     <!--<br>-->
     <!--RESERVATION OF OWNERSHIP AND GRANT OF LICENSE: <br>-->