From ba026a541e280bb94c4625eed89b881a75f11720 Mon Sep 17 00:00:00 2001
From: guido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 2 Oct 2001 10:52:45 +0000
Subject: [PATCH] Revert to QPL

git-svn-id: https://svn.dealii.org/trunk@5129 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/doc/license.html | 89 +++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html
index 3f80b116b5..cde603869d 100644
--- a/deal.II/doc/license.html
+++ b/deal.II/doc/license.html
@@ -23,16 +23,10 @@
   </p>
 
   <p>
-  <acronym>deal.II</acronym> is distributed under the license below.
-  It is based on the Q Public License (or "QPL"), which qualifies as
-  an <a href="http://www.opensource.org/osd.html" target="_top">Open
-  Source license</a>. It differs in two points in section <em>Granted
-  Rights</em>, defining non-commercial use. The
-  <acronym>deal.II</acronym> license is more restrictive in the sense
-  that even generation of data by applications based on
-  <acronym>deal.II</acronym> for commercial purposes requires a
-  commercial license.
-  It is appropriate for people wishing to write
+  <acronym>deal.II</acronym> is distributed under the Q Public License
+  (or "QPL"), which qualifies as an <a
+  href="http://www.opensource.org/osd.html" target="_top">Open Source
+  license</a>. It is thus appropriate for people wishing to write
   software under the <a href="http://www.opensource.org"
   target="_top">Open Source</a> model where all source code to the
   software is made available to all users and can be freely modified
@@ -43,18 +37,37 @@
   </p>
 
   <p>
-  The <acronym>deal.II</acronym> Public License prohibits development
-  of proprietary software and generation of proprietary data. If you
-  intend to develop commercial software based on
-  <acronym>deal.II</acronym> or plan to generate data for commercial
-  use by programs based on <acronym>deal.II</acronym>, we are willing
-  to negotiate a suitable agreement. Feel free to contact us in this
-  case.
+  The QPL prohibits development of proprietary software. If you intend
+  to develop commercial software based on <acronym>deal.II</acronym>,
+  we are willing to negotiate a suitable agreement. Feel free to
+  contact us in this case.
   </p>
 
   <p>
+  For more information on the QPL, please see also the following
+  links:
+  <br>
+  &nbsp &nbsp
+  &nbsp &nbsp
+  <a href="http://www.troll.no/qpl/annotated.html" target="_top">Annotated version</a>
+  &nbsp &nbsp
+  <a href="http://www.troll.no/qpl/plaintext.txt" target="_top">Plain text version</a>
+  &nbsp &nbsp
+  <a href="http://www.troll.no/announce/qpl.html" target="_top">Announcement</a>
+  &nbsp &nbsp
+  <a href="http://www.troll.no/qpl/comments.html" target="_top">Comments</a>
+  </p>
+
+
+  <p>
+  In addition to the terms imposed by the QPL, we have one restriction
+  on the use of the library:
   <ul>
-  <li>  This
+  <li> Every publication presenting numerical results obtained with
+       the help of <acronym>deal.II</acronym> shall state the name of
+       the library and its principle authors (at present Wolfgang
+       Bangerth and Guido Kanschat), as well as cite at least one of
+       the papers by these authors on <acronym>deal.II</acronym>. This
        is the usual, fair way of giving credits to contributors to a
        scientific result, and using a complex programming environment
        like <acronym>deal.II</acronym> should be considered a
@@ -75,12 +88,12 @@
 
 <hr>
 <h1 align=center>
-The <acronym>deal.II</acronym> Public License
+THE Q PUBLIC LICENSE
 version 1.0
 <br>
 <br>
 <small>
-Copyright (C) 2001 The <acronym>deal.II</acronym> Authors
+Copyright (C) 1999 Troll Tech AS, Norway.
 <br>
 <small>
 Everyone is permitted to copy and
@@ -103,19 +116,18 @@ and development of free software which uses the Software.
 Granted Rights
 </h2>
 <p>
-<ol>
-<li> You are granted the non-exclusive rights set forth in this license
+1. You are granted the non-exclusive rights set forth in this license
 provided you agree to and comply with any and all conditions in this
 license. Whole or partial distribution of the Software, or software
 items that link with the Software, in any form signifies acceptance of
 this license.
 <p>
-<li> You may copy and distribute the Software in unmodified form provided
+2. You may copy and distribute the Software in unmodified form provided
 that the entire package, including - but not restricted to - copyright,
 trademark notices and disclaimers, as released by the initial developer
 of the Software, is distributed.
 <p>
-<li> You may make modifications to the Software and distribute your
+3. You may make modifications to the Software and distribute your
 modifications, in a form that is separate from the Software, such as
 patches. The following restrictions apply to modifications:
 <blockquote>
@@ -131,7 +143,7 @@ available under these terms in addition to any other license(s) of
 the initial developer.
 </blockquote>
 <p>
-<li> You may distribute machine-executable forms of the Software or
+4. You may distribute machine-executable forms of the Software or
 machine-executable forms of modified versions of the Software, provided
 that you meet these restrictions:
 <blockquote>
@@ -149,46 +161,31 @@ machine-executable forms are available under the terms of this
 license.
 </blockquote>
 <p>
-<li> You may use the original or modified versions of the Software to
+5. You may use the original or modified versions of the Software to
 compile, link and run application programs legally developed by you
-or by others for non-profit purposes only.
+or by others.
 <p>
-<li> You may develop application programs, reusable components and other
+6. You may develop application programs, reusable components and other
 software items that link with the original or modified versions of the
 Software. These items, when distributed, are subject to the following
 requirements:
 <blockquote>
 <p>
-a. All forms of these items, including machine-executable and
-machine-readable or human-readable source code, must be distributed
-without any charge beyond the costs of data transfer.
-<p>
-b. You must ensure that all recipients of machine-executable forms of
+a. You must ensure that all recipients of machine-executable forms of
 these items are also able to receive and use the complete
 machine-readable source code to the items without any charge
 beyond the costs of data transfer.
 <p>
-c. You must explicitly license all recipients of your items to use
+b. You must explicitly license all recipients of your items to use
 and re-distribute original and modified versions of the items in
 both machine-executable and source code forms. The recipients must
 be able to do so without any charges whatsoever, and they must be
 able to re-distribute to anyone they choose.
 <p>
-d. If the items are not available to the general public, and the
+c. If the items are not available to the general public, and the
 initial developer of the Software requests a copy of the items,
 then you must supply one.
-<p>
-
 </blockquote>
-
-<li> Publications presenting applications or results obtained with the
-       help of the software are allowed, provided that they state the
-       name of the software and its principle authors (at present
-       Wolfgang Bangerth, Ralf Hartmann and Guido Kanschat), as well
-       as cite at least one of the papers by these authors on
-       <acronym>deal.II</acronym>. These publications should be
-       announced on the <acronym>deal.II</acronym> mailing list.
-</ol>
 <h2 align=center>
 Limitations of Liability
 </h2>
-- 
2.39.5