From e6046e589e0741a1108b6c7e92e33d5fa55293d5 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Tue, 27 Apr 2010 16:38:30 +0000 Subject: [PATCH] updated license with clearer information --- LICENSE | 36 +++++++++++++++++------------------- NEWS.txt | 7 +++++++ README.txt | 4 ++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 7ba548c..ca2bfe1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,28 +1,26 @@ -This is the LICENSE file for JsonCpp, a C++ library implementing a -JSON format reader and writer. +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... -Author: Baptiste Lepilleur +The author (Baptiste Lepilleur) explicitly disclaims copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. -The license for this library's code is as follows: +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is +released under the terms of the MIT License (see below). - - If the code is used in a jurisdiction where Public Domain - property is regonized, then this code may be considered to be - in the Public Domain. Its author expressly disclaims copyright - in jurisdictions where such a disclaimer is allowed. +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. - - If the code is used in a jurisdiction which does not recognize - Public Domain, the code must be used in terms with the MIT license, - as described clearly and concisely at: +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: http://en.wikipedia.org/wiki/MIT_License - - and reproduced in full below. - - - If the code is used in a jurisdiction which recognizes Public - Domain, the user may instead use the code under the terms of the - MIT license. - - The MIT licensing terms follow: + +The full text of the MIT License follows: ======================================================================== Copyright (c) 2007-2010 Baptiste Lepilleur diff --git a/NEWS.txt b/NEWS.txt index 63b43b1..7c39c81 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -33,7 +33,14 @@ - The type Json::ArrayIndex is used for indexes of a JSON value array. It is an unsigned int (typically 32 bits). +* Tests + + - Added test to ensure that the escape sequence "\/" is corrected handled + by the parser. + * License - See file LICENSE for details. Basically JsonCpp is now licensed under MIT license, or public domain if desired and recognized in your jurisdiction. + Thanks to Stephan G. Beal [http://wanderinghorse.net/home/stephan/]) who + helped figuring out the solution to the public domain issue. diff --git a/README.txt b/README.txt index 5c3b334..dc4e341 100644 --- a/README.txt +++ b/README.txt @@ -79,6 +79,10 @@ python doxybuild.py --open --with-dot See doxybuild.py --help for options. +Notes that the documentation is also available for download as a tarball. +The documentation of the latest release is available online at: +http://jsoncpp.sourceforge.net/ + * Adding a reader/writer test: ============================