knu	2010-09-16 22:20:11 +0900 (Thu, 16 Sep 2010)

  New Revision: 29275

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29275

  Log:
    Revert r29271 pending due discussion.

  Modified files:
    trunk/ChangeLog
    trunk/LEGAL

Index: LEGAL
===================================================================
--- LEGAL	(revision 29274)
+++ LEGAL	(revision 29275)
@@ -1,12 +1,10 @@
 LEGAL NOTICE INFORMATION
 ------------------------
 
-All files in this distribution are, unless specifically noted
-otherwise, covered under a dual license between the 2-clause BSDL and
-original license terms (see BSDL and COPYING).
+All the files in this distribution are covered under either the Ruby's
+license (see the file COPYING) or public-domain except some files
+mentioned below.
 
-Below is the list of exceptional files that need caution.
-
 include/ruby/oniguruma.h:
 regcomp.c:
 regenc.[ch]:
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29274)
+++ ChangeLog	(revision 29275)
@@ -16,14 +16,6 @@
 	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
 	  if $HOME is unset.
 
-Thu Sep 16 20:16:07 2010  Akinori MUSHA  <knu@i...>
-
-	* LEGAL: Rephrase the leading sentences for clarification.  Avoid
-	  using the context dependent, ambiguous term "the Ruby's
-	  license", and omit the "or public domain" part because it is not
-	  our default license and the files under public domain are
-	  already specifically listed.
-
 Thu Sep 16 14:50:42 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/