From 00b7fe599d04ba38cf954ec382a37f5c5c133ef7 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 20 Feb 2001 14:53:39 +0000 Subject: [PATCH] Take over changes from main branch. git-svn-id: https://svn.dealii.org/branches/Branch-3-1@3986 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/license.html | 95 ++++++++++++----------- deal.II/doc/news/2000/3.0.0-vs-3.1.0.html | 6 ++ deal.II/doc/toc.html | 22 +++--- 3 files changed, 64 insertions(+), 59 deletions(-) diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html index 70eba0d845..3f80b116b5 100644 --- a/deal.II/doc/license.html +++ b/deal.II/doc/license.html @@ -5,7 +5,7 @@ The deal.II Readme - + @@ -23,51 +23,38 @@

- deal.II is distributed under the Q Public License - (or "QPL"), which qualifies as an Open Source - license. It is thus appropriate for people wishing to write + deal.II is distributed under the license below. + It is based on the Q Public License (or "QPL"), which qualifies as + an Open + Source license. It differs in two points in section Granted + Rights, defining non-commercial use. The + deal.II license is more restrictive in the sense + that even generation of data by applications based on + deal.II for commercial purposes requires a + commercial license. + It is appropriate for people wishing to write software under the Open Source model where all source code to the software is made available to all users and can be freely modified - and redistributed. The QPL was originally developed by + and redistributed. QPL was originally developed by Troll Tech for their Qt program library, but has since gained some support by other library authors as well.

- The QPL prohibits development of proprietary software. If you intend - to develop commercial software based on deal.II, - we are willing to negotiate a suitable agreement. Feel free to - contact us in this case. + The deal.II Public License prohibits development + of proprietary software and generation of proprietary data. If you + intend to develop commercial software based on + deal.II or plan to generate data for commercial + use by programs based on deal.II, we are willing + to negotiate a suitable agreement. Feel free to contact us in this + case.

- For more information on the QPL, please see also the following - links: -
-     -     - Annotated version -     - Plain text version -     - Announcement -     - Comments -

- - -

- In addition to the terms imposed by the QPL, we have one restriction - on the use of the library: