summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:13 (GMT)
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:13 (GMT)
commit7b127caba3ddc39a5a70628c831953bb870f4b52 (patch)
tree8a6f474fd7af362acd524d9bdd764177fef4bd2b /src
parent2bcabdd8e2f5e70b32145353e98dd83e527685fe (diff)
downloadmocca-7b127caba3ddc39a5a70628c831953bb870f4b52.zip
mocca-7b127caba3ddc39a5a70628c831953bb870f4b52.tar.gz
mocca-7b127caba3ddc39a5a70628c831953bb870f4b52.tar.bz2
website updates
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@975 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'src')
-rw-r--r--src/site/apt/download.apt2
-rw-r--r--src/site/apt/index.apt9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index c6a985b..0f30153 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -10,7 +10,7 @@ Download MOCCA
* <<MOCCA Local>>
- Current stable releases are 1.2.x.
+ Current stable releases are 1.3.x.
<<To install please go to {{http://webstart.buergerkarte.at}}>>!
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 835fccc..0abb392 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -33,8 +33,11 @@ Releases
Licensing
- The MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}.
+ Since version 1.3.6, the MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://osor.eu/eupl}EUPL v1.1}}.
- MOCCA also requires software provided by third parties. Most of this software is free and open source. Some required software is licensed under a commercial license. This includes software provided by {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}}, which however grants a free-of-charge license for the use of their software together with the unchanged software provided by the MOCCA project.
+ Up to and including version 1.3.6 of this product were published under an {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}.
+
+ This product includes software developed by third parties and provided under an {{{http://www.opensource.org}open source license}}.
+
+ This product includes software provided by {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}}
- {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}} also offers a free-of-charge {{{http://jce.iaik.tugraz.at/sic/Sales/Licences/License-for-Open-Source-Projects}license for open source projects}} which are released under {{{http://www.fsf.org/licenses/gpl.html}GPL Version 2.0}}. This allows open source projects to change or extend software developed by the MOCCA project and obtain a free-of-charge license for software required by MOCCA, as long as such projects are released under GPL Version 2.0. The licensee is responsible for obtaining any required licenses. \ No newline at end of file