Skip to content

Commit e6046e5

Browse files
committed
updated license with clearer information
1 parent 402c13e commit e6046e5

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

Diff for: LICENSE

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
1-
This is the LICENSE file for JsonCpp, a C++ library implementing a
2-
JSON format reader and writer.
1+
The JsonCpp library's source code, including accompanying documentation,
2+
tests and demonstration applications, are licensed under the following
3+
conditions...
34

4-
Author: Baptiste Lepilleur
5+
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
6+
jurisdictions which recognize such a disclaimer. In such jurisdictions,
7+
this software is released into the Public Domain.
58

6-
The license for this library's code is as follows:
9+
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
10+
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
11+
released under the terms of the MIT License (see below).
712

8-
- If the code is used in a jurisdiction where Public Domain
9-
property is regonized, then this code may be considered to be
10-
in the Public Domain. Its author expressly disclaims copyright
11-
in jurisdictions where such a disclaimer is allowed.
13+
In jurisdictions which recognize Public Domain property, the user of this
14+
software may choose to accept it either as 1) Public Domain, 2) under the
15+
conditions of the MIT License (see below), or 3) under the terms of dual
16+
Public Domain/MIT License conditions described here, as they choose.
1217

13-
- If the code is used in a jurisdiction which does not recognize
14-
Public Domain, the code must be used in terms with the MIT license,
15-
as described clearly and concisely at:
18+
The MIT License is about as close to Public Domain as a license can get, and is
19+
described in clear, concise terms at:
1620

1721
http://en.wikipedia.org/wiki/MIT_License
18-
19-
and reproduced in full below.
20-
21-
- If the code is used in a jurisdiction which recognizes Public
22-
Domain, the user may instead use the code under the terms of the
23-
MIT license.
24-
25-
The MIT licensing terms follow:
22+
23+
The full text of the MIT License follows:
2624

2725
========================================================================
2826
Copyright (c) 2007-2010 Baptiste Lepilleur

Diff for: NEWS.txt

+7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@
3333
- The type Json::ArrayIndex is used for indexes of a JSON value array. It
3434
is an unsigned int (typically 32 bits).
3535

36+
* Tests
37+
38+
- Added test to ensure that the escape sequence "\/" is corrected handled
39+
by the parser.
40+
3641
* License
3742

3843
- See file LICENSE for details. Basically JsonCpp is now licensed under
3944
MIT license, or public domain if desired and recognized in your jurisdiction.
45+
Thanks to Stephan G. Beal [http://wanderinghorse.net/home/stephan/]) who
46+
helped figuring out the solution to the public domain issue.

Diff for: README.txt

+4
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ python doxybuild.py --open --with-dot
7979

8080
See doxybuild.py --help for options.
8181

82+
Notes that the documentation is also available for download as a tarball.
83+
The documentation of the latest release is available online at:
84+
http://jsoncpp.sourceforge.net/
85+
8286

8387
* Adding a reader/writer test:
8488
============================

0 commit comments

Comments
 (0)