* It is confusing to put the GPL license terms in the file COPYING;

  Rename the files COPYING and COPYING.LIB to GPL and LGPL, respectively.

* While I am here, update the LGPL with the "Lesser" one.

* Move the "copying" sections of the files README and README.jp to
  COPYING and COPYING.jp, respectively.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 61 deletions

diff --git a/README b/README
index 29d1d30db4..6a008e998e 100644
--- a/README
+++ b/README
@@ -5,6 +5,7 @@ easy object-oriented programming.  It has many features to
 process text files and to do system management tasks (as in
 Perl).  It is simple, straight-forward, and extensible.
 
+
 * Features of Ruby
 
   + Simple Syntax
@@ -18,6 +19,7 @@ Perl).  It is simple, straight-forward, and extensible.
   + Highly Portable(works on many UNIX machines, and on DOS,
     Windows, Mac, BeOS etc.)
 
+
 * How to get Ruby
 
 The Ruby distribution can be found on:
@@ -31,6 +33,14 @@ You can get it by anonymous CVS.  How to check out is:
   CVS password: anonymous
   $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:/src checkout ruby
 
+
+* Ruby home-page
+
+The URL of the Ruby home-page is:
+
+   http://www.ruby-lang.org/
+
+
 * Mailing list
 
 There is a mailing list to talk about Ruby.
@@ -42,6 +52,7 @@ e.g.
 
 in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
 
+
 * How to compile and install
 
 This is what you need to do to compile and install Ruby:
@@ -75,70 +86,11 @@ This is what you need to do to compile and install Ruby:
 If you fail to compile ruby, please send the detailed error report with
 the error log and machine/OS type, to help others.
 
-* Copying
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@zetabits.com>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING 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
-     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) 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 executable
-     form, provided that you do at least ONE of the following:
-
-       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 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 this terms.
-
-     They are 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
-     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.
-
-* Ruby home-page
+* Copying
 
-The URL of the Ruby home-page is:
+See the file COPYING.
 
-   http://www.ruby-lang.org/
 
 * The Author