diff options
author | Allen Winter <allen.winter@kdab.com> | 2017-05-07 17:07:02 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2017-05-07 17:07:02 -0400 |
commit | 878f1ea29a9d8999979c9acbf3f6a6b2f7132974 (patch) | |
tree | 4b56b6fff6641693adbd0411cbdf53c7e570ed76 /doc | |
parent | fa187649dbca12042565625b1671220b3382a983 (diff) | |
download | libical-git-878f1ea29a9d8999979c9acbf3f6a6b2f7132974.tar.gz |
Relicense to MPL 2.0 instead of MPL 1.0
fix urls. make source license headers consistent
GNU "Lesser" vs. GNU "Library"
etc.
issue: #297
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Mainpage.dox | 6 | ||||
-rw-r--r-- | doc/UsingLibical.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/Mainpage.dox b/doc/Mainpage.dox index d9fed2bf..8a13de47 100644 --- a/doc/Mainpage.dox +++ b/doc/Mainpage.dox @@ -6,15 +6,15 @@ Libical is an Open Source implementation of the iCalendar protocols and protocol data units. The iCalendar specification describes how calendar clients can communicate with calendar servers so users can -store their calendar data and arrange meetings with other users. +store their calendar data and arrange meetings with other users. Libical implements RFC2445, RFC2446 and some of RFC2447. @section license License The code and datafiles in this distribution are licensed under the -Mozilla Public License (MPL) v1.0. See http://www.mozilla.org/MPL/1.0 -for a copy of the license. +Mozilla Public License (MPL) v2.0. See http://www.mozilla.org/MPL +for a copy of the license. Alternately, you may use libical under the terms of the GNU Library General Public License (LGPL) v2.1. See http://www.gnu.org/licenses/lgpl-2.1.txt diff --git a/doc/UsingLibical.txt b/doc/UsingLibical.txt index 69cdd443..f320ee06 100644 --- a/doc/UsingLibical.txt +++ b/doc/UsingLibical.txt @@ -32,10 +32,10 @@ to the project, visit http://libical.github.io/libical/ 1.2 License The code and datafiles in this distribution are licensed under the -Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html +Mozilla Public License version 2.0. See http://www.mozilla.org/MPL for a copy of the license. Alternately, you may use libical under -the terms of the GNU Library General Public License. See -http://www.fsf.org/copyleft/lesser.html for a copy of the LGPL. +the terms of the GNU Lesser General Public License, version 2.1. +See http://www.gnu.org/licenses/lgpl-2.1.html for a copy of the LGPL. This dual license ensures that the library can be incorporated into both proprietary code and GPL'd programs, and will benefit from improvements |