aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2014-06-23 18:50:50 -0700
committerChad Versace <chad.versace@linux.intel.com>2014-09-06 15:50:12 -0700
commit339a157253f8769992519d5ed9ab4b4860c2670b (patch)
tree58bbddb487e828ce9115413b58493c76d057e8e7
parent551a9ad102e8b650db288e08ce442af48b308689 (diff)
downloadwaffle-339a157253f8769992519d5ed9ab4b4860c2670b.tar.gz
HACKING: Improve advice on copyright
Make it more simple and more explicit. List preferred licenses for Waffle: BSD, MIT, Apache 2.0. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--HACKING.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/HACKING.txt b/HACKING.txt
index 1e1922f..ca74bb8 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -85,14 +85,14 @@ Exceptions are unavoidable, however, so use common sense.
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.
-
-If the patch substantially alters an existing file, you may add yourself or
-your organization to that file's copyright holders.
+When making substantial changes to existing files, you may add yourself or your
+organization to that file's copyright header.
+
+If adding new files, do not use a copyleft license (such as the GPL). All
+Waffle source code must be licensed under a liberal opensource license (such as
+BSD). To reduce license proliferation, Waffle prefers (but does not require)
+that new code be licensed under one of the following licenses: BSD, MIT, Apache
+2.0.
Sign your work