mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2024-12-26 18:51:04 +08:00
updated license with clearer information
This commit is contained in:
parent
402c13eb3d
commit
e6046e589e
36
LICENSE
36
LICENSE
@ -1,28 +1,26 @@
|
|||||||
This is the LICENSE file for JsonCpp, a C++ library implementing a
|
The JsonCpp library's source code, including accompanying documentation,
|
||||||
JSON format reader and writer.
|
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
|
In jurisdictions which recognize Public Domain property, the user of this
|
||||||
property is regonized, then this code may be considered to be
|
software may choose to accept it either as 1) Public Domain, 2) under the
|
||||||
in the Public Domain. Its author expressly disclaims copyright
|
conditions of the MIT License (see below), or 3) under the terms of dual
|
||||||
in jurisdictions where such a disclaimer is allowed.
|
Public Domain/MIT License conditions described here, as they choose.
|
||||||
|
|
||||||
- If the code is used in a jurisdiction which does not recognize
|
The MIT License is about as close to Public Domain as a license can get, and is
|
||||||
Public Domain, the code must be used in terms with the MIT license,
|
described in clear, concise terms at:
|
||||||
as described clearly and concisely at:
|
|
||||||
|
|
||||||
http://en.wikipedia.org/wiki/MIT_License
|
http://en.wikipedia.org/wiki/MIT_License
|
||||||
|
|
||||||
and reproduced in full below.
|
The full text of the MIT License follows:
|
||||||
|
|
||||||
- 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:
|
|
||||||
|
|
||||||
========================================================================
|
========================================================================
|
||||||
Copyright (c) 2007-2010 Baptiste Lepilleur
|
Copyright (c) 2007-2010 Baptiste Lepilleur
|
||||||
|
7
NEWS.txt
7
NEWS.txt
@ -33,7 +33,14 @@
|
|||||||
- The type Json::ArrayIndex is used for indexes of a JSON value array. It
|
- The type Json::ArrayIndex is used for indexes of a JSON value array. It
|
||||||
is an unsigned int (typically 32 bits).
|
is an unsigned int (typically 32 bits).
|
||||||
|
|
||||||
|
* Tests
|
||||||
|
|
||||||
|
- Added test to ensure that the escape sequence "\/" is corrected handled
|
||||||
|
by the parser.
|
||||||
|
|
||||||
* License
|
* License
|
||||||
|
|
||||||
- See file LICENSE for details. Basically JsonCpp is now licensed under
|
- See file LICENSE for details. Basically JsonCpp is now licensed under
|
||||||
MIT license, or public domain if desired and recognized in your jurisdiction.
|
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.
|
||||||
|
@ -79,6 +79,10 @@ python doxybuild.py --open --with-dot
|
|||||||
|
|
||||||
See doxybuild.py --help for options.
|
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:
|
* Adding a reader/writer test:
|
||||||
============================
|
============================
|
||||||
|
Loading…
x
Reference in New Issue
Block a user