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

knu · knu · commit cbc375600999 · 2001-07-11T19:25:52.000Z
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
diff --git a/COPYING b/COPYING
diff --git a/COPYING.jp b/COPYING.jp
@@ -0,0 +1,52 @@
+$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
+Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
+$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+
+  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
+
+  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
+     $B<+M3$KJQ99$G$-$^$9!%(B
+
+     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
+         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
+
+     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
+         $B;H$&!%(B
+
+     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
+         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
+         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
+         $B%9$NF~<jK!$rL@<($9$k!%(B
+
+     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
+
+  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
+     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
+
+     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
+         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
+
+     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
+
+     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
+         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
+
+     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
+
+  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
+     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
+     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
+
+     $B6qBNE*$K$O(Butil.c($B0lIt(B)$B!$(Bst.[ch]$B!$(Bregex.[ch] $B$*$h$S(B 
+     ./missing$B%G%#%l%/%H%j2<$N%U%!%$%k72$,3:Ev$7$^$9!%$=$l$>(B
+     $B$l$NG[I[>r7o$J$I$KIU$$$F$O3F%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
+
+  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
+     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
+     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
+     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
+
+  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
+     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
+     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
+     $BG$$r;}$A$^$;$s!%(B
diff --git a/GPL b/GPL
diff --git a/LGPL b/LGPL
diff --git a/MANIFEST b/MANIFEST
@@ -1,6 +1,8 @@
 COPYING
-COPYING.LIB
+COPYING.jp
 ChangeLog
+GPL
+LGPL
 MANIFEST
 Makefile.in
 README
diff --git 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
 
diff --git a/README.jp b/README.jp
@@ -140,58 +140,8 @@ UNIX
 
 * ���۾��
 
-�ܥץ������ϥե꡼���եȥ������Ǥ���GPL(the GNU General
-Public License)�ޤ��ϰʲ��˼��������ܥץ�����������ۤ�
-���ޤ���GPL�ˤĤ��Ƥ�COPYING�ե�����򻲾Ȥ��Ʋ�������
+COPYING.jp�ե�����򻲾Ȥ��Ƥ���������
 
-  1. ʣ�������¤ʤ���ͳ�Ǥ���
-
-  2. �ʲ��ξ��Τ����줫�������������ܥץ������Υ�������
-     ��ͳ���ѹ��Ǥ��ޤ���
-
-     (a) �ͥåȥ˥塼���˥ݥ��Ȥ����ꡤ��Ԥ��ѹ������դ���
-         �ʤɤ���ˡ�ǡ��ѹ���������롥
-
-     (b) �ѹ������ܥץ�������ʬ�ν�°�����ȿ�����������
-         �Ȥ���
-
-     (c) �ѹ����������������������եȥ�������̾�����ѹ����롥
-         ���Υ��եȥ����������ۤ�����ˤ��ѹ������ܥץ�����
-         ���Ʊ�������ۤ��롥�ޤ����ѹ������ܥץ������Υ���
-         ��������ˡ���������롥
-
-     (d) ����¾���ѹ������Ԥȹ�դ��롥
-
-  3. �ʲ��ξ��Τ����줫�������������ܥץ������򥳥�ѥ�
-     �뤷�����֥������ȥ����ɤ�¹Է����Ǥ����ۤǤ��ޤ���
-
-     (a) �Х��ʥ�������ä��ͤ�������������Ǥ���褦�ˡ�
-         ������������ˡ���������롥
-
-     (b) �������ɤʥ����������ɤ�ź�դ��롥
-
-     (c) �ѹ���Ԥä��Х��ʥ��̾�����ѹ��������������ꥸ��
-         ��Υ����������ɤ�����ˡ���������롥
-
-     (d) ����¾�����۾����Ԥȹ�դ��롥
-
-  4. ¾�Υץ������ؤΰ��ѤϤ����ʤ���Ū�Ǥ��켫ͳ�Ǥ�����
-     �������ܥץ������˴ޤޤ��¾�κ�Ԥˤ�륳���ɤϡ���
-     �줾��κ�Ԥΰո��ˤ�����¤��ä������礬����ޤ���
-
-     ����Ū�ˤ�util.c(����)��st.[ch]��regex.[ch] ����� 
-     ./missing�ǥ��쥯�ȥ겼�Υե����뷲���������ޤ������줾
-     ������۾��ʤɤ��դ��Ƥϳƥե�����򻲾Ȥ��Ƥ���������
-
-  5. �ܥץ������ؤ����ϤȤʤ륹����ץȤ���ӡ��ܥץ�����
-     �फ��ν��Ϥθ������ܥץ������κ�ԤǤϤʤ������줾
-     ��������Ϥ����������ͤ�°���ޤ����ޤ����ܥץ�������
-     �Ȥ߹��ޤ�뤿��γ�ĥ�饤�֥��ˤĤ��Ƥ�Ʊ�ͤǤ���
-
-  6. �ܥץ�������̵�ݾڤǤ�����Ԥ��ܥץ������򥵥ݡ���
-     ����ջ֤Ϥ���ޤ������ץ�����༫�ȤΥХ����뤤���ܥ�
-     �������μ¹Ԥʤɤ���ȯ�����뤤���ʤ�»�����Ф��Ƥ���
-     Ǥ������ޤ���
 
 * ����
 
diff --git a/regex.c b/regex.c
@@ -12,7 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   License along with the GNU C Library; see the file LGPL.  If not,
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 /* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
diff --git a/regex.h b/regex.h
@@ -16,7 +16,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   License along with the GNU C Library; see the file LGPL.  If not,
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 /* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)

-Original file line number
+Diff line change
 +$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
 +Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
 +$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
++
 +  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
++
 +  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
 +     $B<+M3$KJQ99$G$-$^$9!%(B
++
 +     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
 +         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
++
 +     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
 +         $B;H$&!%(B
++
 +     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
 +         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
 +         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
 +         $B%9$NF~<jK!$rL@<($9$k!%(B
++
 +     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
++
 +  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
 +     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
++
 +     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
 +         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
++
 +     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
++
 +     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
 +         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
++
 +     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
++
 +  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
 +     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
 +     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
++
 +     $B6qBNE*$K$O(Butil.c($B0lIt(B)$B!$(Bst.[ch]$B!$(Bregex.[ch] $B$*$h$S(B
 +     ./missing$B%G%#%l%/%H%j2<$N%U%!%$%k72$,3:Ev$7$^$9!%$=$l$>(B
 +     $B$l$NG[I[>r7o$J$I$KIU$$$F$O3F%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
++
 +  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
 +     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
 +     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
 +     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
++
 +  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
 +     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
 +     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
 +     $BG$$r;}$A$^$;$s!%(B