Permalink
Browse files

Update license files.

  • Loading branch information...
1 parent f312110 commit 5b0c76c2fd3276e4561f27d2284aa32a26495cea @nrk committed Jul 25, 2010
Showing with 27 additions and 21 deletions.
  1. +13 −13 COPYING
  2. +7 −7 LICENSE → GPL
  3. +7 −1 README
View
26 COPYING
@@ -1,8 +1,6 @@
-ironruby-json is copyrighted free software by Daniele Alessandri
-<suppakilla at gmail dot com>, and is a derivative work of Florian Frank's
-json library <flori at ping dot de>.
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+(see GPL file), or the conditions below:
1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the
@@ -19,32 +17,33 @@ version 2 (see the file GPL), or the conditions below:
b) use the modified software only within your corporation or
organization.
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
d) make other distribution arrangements with the author.
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
- a) distribute the binaries and library files of the software,
+ a) distribute the executables and library files of the software,
together with instructions (in the manual page or equivalent)
on where to get the original distribution.
b) accompany the distribution with the machine-readable source of
the software.
- c) give non-standard binaries non-standard names, with
+ c) give non-standard executables non-standard names, with
instructions on where to get the original software distribution.
d) make other distribution arrangements with the author.
4. You may modify and include the part of the software into any other
software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under these terms.
+ are not written by the author, so that they are not under this terms.
- For the list of those files and their copying conditions, see the
- file LEGAL.
+ They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+ files under the ./missing directory. See each file for the copying
+ condition.
5. The scripts and library files supplied as input to or produced as
output from the software do not automatically fall under the
@@ -56,3 +55,4 @@ version 2 (see the file GPL), or the conditions below:
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.
+
View
14 LICENSE → GPL
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
View
8 README
@@ -5,4 +5,10 @@ This is a port of Florian Frank's native json library for the MRI to IronRuby.
Want to help or contribute? Drop me a mail to suppakilla@gmail.com
-NOTE: this is still a work in progress, see the TODO for more information
+NOTE: this is still a work in progress, see the TODO for more information
+
+== License
+
+Ruby License, see the COPYING file included in the source distribution. The
+Ruby License includes the GNU General Public License (GPL), Version 2, so see
+the file GPL as well.

0 comments on commit 5b0c76c

Please sign in to comment.