about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-12 11:17:26 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-12 11:17:26 -0800
commit81c1f96c2c99d16b211f6b97c6f99ea46dfa9cd0 (patch)
treec141ed1ccdda77107549c18f63e93d392bacc0e6
parent6369300ca4171acf6848e2f63b24aa5278c42c1b (diff)
downloadupr-81c1f96c2c99d16b211f6b97c6f99ea46dfa9cd0.tar.gz
Clarify license of examples
In short, example code retains their own copyrights
-rw-r--r--LICENSE13
-rw-r--r--README3
2 files changed, 11 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 5dae296..24deed1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,13 @@
 Upload Progress for Rack (upr) is copyrighted Free Software by all
-contributors, see the logs in revision control for all of them.  You can
-redistribute it and/or modify it under either the terms of the
-{GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or
-the conditions below:
+contributors, see the logs in revision control for all of them.
+
+Bundled examples in the examples/ directory retain their respective
+(Free Software) licenses.  See copyright headers in individual files for
+more information.  This distribution only includes Free Software.
+
+You can redistribute upr it and/or modify it under either the terms of
+the {GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING)
+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
diff --git a/README b/README
index 97b9d36..2589fcd 100644
--- a/README
+++ b/README
@@ -84,7 +84,8 @@ and we'll try our best to fix it.
 
 upr is copyright 2009 by all contributors (see logs in git).  It is
 based on mongrel_upload_progress and carries the same license (Ruby +
-GPL2).  See the included LICENSE file for details.
+GPL2).  Bundled examples may different Free Software licenses, see the
+included LICENSE file for details.
 
 upr is 100% Free Software.  We will never support the proliferation of
 non-Free browsers or plugins.