From: kanschat Date: Fri, 27 Oct 2006 20:42:43 +0000 (+0000) Subject: some minor changes and update of QPL link X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e2b61de2ee8c6a7e1b05360445a93cd755ed0bc;p=dealii-svn.git some minor changes and update of QPL link git-svn-id: https://svn.dealii.org/trunk@14106 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/license.html b/deal.II/doc/license.html index 321dfbb86b..f401d9fa9f 100644 --- a/deal.II/doc/license.html +++ b/deal.II/doc/license.html @@ -16,25 +16,25 @@

The deal.II license

- The deal.II library has been placed under an Open Source - license, in the sense advocated by the - Open Source + The deal.II library has been placed under an Open + Source license, in the sense advocated by the Open Source Initiative. You are thus free to copy and use it, and you have free access to all source codes. However, deal.II - is not in the public domain, it is property of and copyrighted by the - deal.II authors, and there are restrictions on - its use. The legally binding license is - given at the bottom of this page. - Furthermore, deal.II distributions come bundled with some third - party software for which the deal.II authors do not own the - copyright. The licenses of these parts are discussed below. + is not in the public domain, it is property of and copyrighted by + the deal.II authors, and there are restrictions + on its use. We will give some hints on license issues first. The + legally binding license is the Q Public + License (QPL) at the bottom of this page. Furthermore, deal.II + distributions come bundled with some third party software for which + the deal.II authors do not own the copyright. The licenses of these + parts are discussed below.

In this document, as well as in the program files, the terms authors of deal.II and deal.II authors generally refer to the - principal authors of the library. These are presently Wolfgang + principal authors of the library. These are Wolfgang Bangerth, Guido Kanschat and Ralf Hartmann.

@@ -102,10 +102,14 @@ Some of the files in the contrib/ subdirectory are by other people, and are distributed under separate licenses. These files are not part of the deal.II library, but - they are distributed together. They are generally available for use - in non-commercial academic settings. For commercial use and if you - want to distribute your codes, please consult the licenses of these - parts of the deal.II distribution. + they are part of our distribution. They are generally available for + use in non-commercial academic settings. For commercial use and if + you want to distribute your codes, please consult the licenses of + these parts of the deal.II distribution. For those codes governed by + a license critical for commercial use, we made sure that they can be + disabled upon configuration of deal.II without + unnecessarily restricting the functionality of the remainder of the + library.

@@ -141,14 +145,8 @@ Troll Tech for their Qt program library, but has since gained some support by other library authors as well. - For more information on the QPL, please also consult the following - links: -
-     -     - Annotated version -     - Plain text version + For more information on the QPL, please follow + this link.