Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update to new ruby license

  • Loading branch information...
commit 1f8a4cacb58da273e623a38f865db88193d7db9b 1 parent 99b84bd
Laurent Sansonetti lrz authored
Showing with 59 additions and 58 deletions.
  1. +56 −56 COPYING
  2. +3 −2 README.rdoc
112 COPYING
View
@@ -1,59 +1,59 @@
-MacRuby is copyrighted free software by Apple Inc.
+MacRuby is copyrighted free software by the MacRuby Team.
MacRuby contains code from the Ruby project, copyrighted free software by
Yukihiro Matsumoto <matz@netlab.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:
-
- 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
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- 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.
-
- 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:
-
- a) distribute the binaries 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
- 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.
-
- For the list of those files and their copying conditions, see the
- file LEGAL.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), 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
+original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+
+ 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.
+
+ 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:
+
+ a) distribute the binaries 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
+ 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.
+
+For the list of those files and their copying conditions, see the
+file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+output from the software do not automatically fall under the
+copyright of the software, but belong to whomever generated them,
+and may be sold commercially, and may be aggregated with this
+software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
5 README.rdoc
View
@@ -8,8 +8,9 @@ It is the goal of MacRuby to enable the creation of full-fledged Mac OS X
applications which do not sacrifice performance in order to enjoy the benefits
of using Ruby.
-MacRuby is copyrighted free software by Apple Inc and covered by the terms of
-the Ruby license. Please refer to the COPYING file for more information.
+MacRuby is copyrighted free software by the MacRuby team and covered by the
+terms of the Ruby license. Please refer to the COPYING file for more
+information.
The project website contains more documentation, such as tutorials and guides:
http://macruby.org
Please sign in to comment.
Something went wrong with that request. Please try again.