Some more things around the license.

git-svn-id: https://svn.dealii.org/trunk@2364 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index b0e23b6cab4b1288158a938311d2ff77afa047ef..e495f004fd38807e53d4c601e3e07c1fae2a0083 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -376,17 +376,24 @@
     <a name="license">
     <h2>License</h2>
 
-    Note that we have not yet fully finished the license under which
-    we will distribute the library. However, we will keep to the
-    following principles:
+    <p>
+    We have placed <acronym>deal.II</acronym> under an
+    <a href="http://www.opensource.org" target="_top">Open Source</a>
+    license, which allows you to use the library free of charge for
+    non-commercial purposes. You are guaranteed full access to the
+    source code and are encouraged to help in the further development
+    of the library. To read the full text of the library, follow
+    <a href="license.html" target="body">this link</a>.
+    </p>
 
+    <p>
+    The basics of the license are in short:
     <ul>
       <li>
         The library comes free of charge for non-commercial users, but
          we keep a copyright in it. We will grant everyone access to
-         the library but we would like to ask you to not further
-         distribute it yourself. This is to keep an overview over the
-         number of users and to provide information on further development.
+         the library and its source code, provided they keep to the
+         <a href="license.html" target="body">license</a>.
 
       <li>
         The libraries may not be stripped of our copyright and shall
@@ -397,22 +404,16 @@
         Scientific publications presenting results obtained with these
         libraries shall state the names of the library and their
         principle authors (at present Wolfgang Bangerth and Guido
-        Kanschat). All written publications are requested to cite the
-        article <a
-        href="http:reports/deal.II-paper/index.html"><EM>W. Bangerth,
-        G. Kanschat: Concepts for Object-Oriented Finite Element
-        Software - the deal.II Library</EM></a>. It has appeared as
-        Preprint 99-43 at the IWR, Universit&auml;t Heidelberg.
+        Kanschat).
     </ul>
 
     Note that since our institute is evaluated at regular intervals,
     we are interested in documenting the use of the programs and
-    libraries we create. This is the reason for not allowing to freely
-    re-distribute them. We would also be interested in collecting
+    libraries we create. We are therefore interested in collecting
     publications with results obtained with the aid of these libraries
     and would therefore like to ask you to drop us a note about every
-    such publication. Your publication will then be listed on the DEAL
-    homepage. You see, it works both ways.
+    such publication. Your publication will then be listed on the
+    project homepage.
 
 
     <hr>

diff --git a/deal.II/doc/toc.html b/deal.II/doc/toc.html
index 804c6476a57cde385b02f3db2008999b6252a374..39f9b3ebae63e3e34f5d1b36a4fdfeef43313d11 100644 (file)
--- a/deal.II/doc/toc.html
+++ b/deal.II/doc/toc.html
@@ -130,16 +130,14 @@
     <H2>License</H2>
 
     <p>
-    <acronym>deal.II</acronym> is copyrighted by the authors and by
-    the university of Heidelberg. However, it is Open Source, in the
+    <acronym>deal.II</acronym> is Open Source, in the
     sense advocated by the 
     <a href="http://www.opensource.org" target="_top">Open Source
     Initiative</a>. You are free to use it in non-commercial ways,
     i.e. in particular in research and education, and you are
-    guaranteed full access to the source code. The license for
-    <acronym>deal.II</acronym> is based on the QPL, and the
-    <a href="license.html" target="body">full text of the license</a>
-    is also available, of course.
+    guaranteed full access to the source code. For the details, see
+    the <a href="readme.html#license" target="body">ReadMe</a> file, and the
+    <a href="license.html" target="body">full text of the license</a>.
     </p>