doc/developer: Add ISC license to list of acceptable licenses
authorDiego Biurrun <diego@biurrun.de>
Thu, 31 Jan 2013 18:37:08 +0000 (19:37 +0100)
committerDiego Biurrun <diego@biurrun.de>
Fri, 1 Feb 2013 10:17:21 +0000 (11:17 +0100)
doc/developer.texi

index 7c14f97..3f2c24d 100644 (file)
@@ -250,8 +250,10 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
 @item
    Contributions should be licensed under the
    @uref{http://www.gnu.org/licenses/lgpl-2.1.html, LGPL 2.1},
-   including an "or any later version" clause, or the
-   @uref{http://mit-license.org/, MIT license}.
+   including an "or any later version" clause, or, if you prefer
+   a gift-style license, the
+   @uref{http://www.isc.org/software/license/, ISC} or
+   @uref{http://mit-license.org/, MIT} license.
    @uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including
    an "or any later version" clause is also acceptable, but LGPL is
    preferred.