From 81c1f96c2c99d16b211f6b97c6f99ea46dfa9cd0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 12 Nov 2009 11:17:26 -0800 Subject: Clarify license of examples In short, example code retains their own copyrights --- LICENSE | 13 +++++++++---- README | 3 ++- 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. -- cgit v1.2.3-24-ge0c7