aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2015-06-10 11:48:53 -0700
committerBryce Harrington <bryce@osg.samsung.com>2015-06-12 15:31:23 -0700
commit2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2 (patch)
tree87acb37effa0426bc0b57e8b2fd7ceab3644e922 /doc
parentCOPYING: Update to MIT Expat License rather than MIT X License (diff)
downloadwayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar.gz
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar.bz2
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar.lz
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar.xz
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.tar.zst
wayland-2e6e0fc811ed0207b1d2c3d3ebfc95010189dfa2.zip
Contributing: Specify use of MIT Expat for new code files
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'doc')
-rw-r--r--doc/Contributing13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/Contributing b/doc/Contributing
index c51b7e8..39c3e39 100644
--- a/doc/Contributing
+++ b/doc/Contributing
@@ -75,6 +75,19 @@ my_function(void)
x = function_with_a_really_long_name(parameter1, parameter2,
parameter3, parameter4);
+== Licensing ==
+
+Wayland is licensed with the intention to be usable anywhere X.org is.
+Originally, X.org was covered under the MIT X11 license, but changed to
+the MIT Expat license. Similarly, Wayland was covered initially as MIT
+X11 licensed, but changed to the MIT Expat license, following in X.org's
+footsteps. Other than wording, the two licenses are substantially the
+same, with the exeption of a no-advertising clause in X11 not included
+in Expat.
+
+New source code files should specify the MIT Expat license in their
+boilerplate, as part of the copyright statement.
+
== References ==
[1] http://git-scm.com/documentation