aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--LEGAL8
2 files changed, 3 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index aa633a258d..0ebe768aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,14 +16,6 @@ Thu Sep 16 21:02:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@iDaemons.org>
-
- * 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@ruby-lang.org>
* test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):
diff --git a/LEGAL b/LEGAL
index bc2b3328b4..3ddf571175 100644
--- a/LEGAL
+++ b/LEGAL
@@ -1,11 +1,9 @@
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).
-
-Below is the list of exceptional files that need caution.
+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.
include/ruby/oniguruma.h:
regcomp.c: