diff --git a/ChangeLog b/ChangeLog index 2bb5cd5ec3..3b20702521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 16 20:16:07 2010 Akinori MUSHA + + * 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 * test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path): diff --git a/LEGAL b/LEGAL index 3ddf571175..bc2b3328b4 100644 --- a/LEGAL +++ b/LEGAL @@ -1,9 +1,11 @@ LEGAL NOTICE INFORMATION ------------------------ -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. +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). + +Below is the list of exceptional files that need caution. include/ruby/oniguruma.h: regcomp.c: