summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-05-30 20:04:57 -0700
committerChad Versace <chad.versace@linux.intel.com>2012-05-30 21:05:19 -0700
commit367378863bcc6801f5ae5ad786c09d39e0890370 (patch)
tree91254415754a6fb83f0a381082f62a9ed3a3c7bc /doc
parent4b3d533616e9856ff498fb5b0ddd39982cb46250 (diff)
license: Convert from Apache 2.0 to BSD
Jordan Justen brought to my attention that, according to the Apache and GNU websites, Apache 2.0 is incompatible with GPLv2 because GPLv2 lacks a patent indemnification clause. (It is compatible with GPLv3, however). See [1] [2] [3]. By the same logic, a lawyer could argue that Apache 2.0 is also incompatible, in one direction only, with minimal gift licenses such as BSD and MIT. I do not want license incompatibility to prevent any project from using Waffle's code, so I'm converting the project to use the most liberal license possible, BSD 2-clause [4]. [1] http://www.apache.org/licenses/GPL-compatibility.html [2] http://www.gnu.org/licenses/license-list.html#apache2 [3] http://en.wikipedia.org/wiki/Apache_License#GPL_compatibility [4] http://www.opensource.org/licenses/bsd-license.php CC: Jordan Justen <jljusten@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/submitting-patches.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt
index 255173b..0e5ed4d 100644
--- a/doc/submitting-patches.txt
+++ b/doc/submitting-patches.txt
@@ -28,7 +28,7 @@ touching existing files.
Copyright
---------
-If the patch adds a new file, the file must contain the Apache 2.0 copyright
+If the patch adds a new file, the file must contain the BSD copyright
header. Just copy the same header block used throughout Waffle. You may
assign the copyright to yourself, your organization, or Intel, Waffle's
dominant copyright holder.