Permalink
Browse files

markdown: Clarify license with regards to embedded Discount code

  • Loading branch information...
1 parent 9fb81fc commit 5c6c4d7ccd3ddea2c93120e0524afb24ae4f0131 @codebrainz committed Jul 16, 2012
Showing with 19 additions and 4 deletions.
  1. +10 −2 markdown/README
  2. +9 −2 markdown/docs/help.html
View
@@ -153,8 +153,16 @@ License
-------
The Markdown plugin is licensed under the GNU General Public License,
-version 2 or (at your option) later versions. For the full text of the
-license, please visit http://www.gnu.org/licenses/gpl-2.0.html.
+version 2. For the full text of the license, please visit
+http://www.gnu.org/licenses/gpl-2.0.html. The GPL license covers all code
+and files *not* in the ``discount`` directory.
+
+All code inside the ``discount`` directory is under a BSD-style license
+(see the ``discount/COPYRIGHT`` file) and all contributions to this code
+*will* remain under this license. This will make it easier to integrate
+improvements to Discount back upstream if it ever makes sense. So far the
+only changes are superficial to allow it to build with the Geany-Plugins
+build system and to prevent some compiler warnings.
Authors
-------
View
@@ -496,8 +496,15 @@ <h1><a class="toc-backref" href="#id7">Requirements</a></h1>
<div class="section" id="license">
<h1><a class="toc-backref" href="#id8">License</a></h1>
<p>The Markdown plugin is licensed under the GNU General Public License,
-version 2 or (at your option) later versions. For the full text of the
-license, please visit <a class="reference external" href="http://www.gnu.org/licenses/gpl-2.0.html">http://www.gnu.org/licenses/gpl-2.0.html</a>.</p>
+version 2. For the full text of the license, please visit
+<a class="reference external" href="http://www.gnu.org/licenses/gpl-2.0.html">http://www.gnu.org/licenses/gpl-2.0.html</a>. The GPL license covers all code
+and files <em>not</em> in the <tt class="docutils literal">discount</tt> directory.</p>
+<p>All code inside the <tt class="docutils literal">discount</tt> directory is under a BSD-style license
+(see the <tt class="docutils literal">discount/COPYRIGHT</tt> file) and all contributions to this code
+<em>will</em> remain under this license. This will make it easier to integrate
+improvements to Discount back upstream if it ever makes sense. So far the
+only changes are superficial to allow it to build with the Geany-Plugins
+build system and to prevent some compiler warnings.</p>
</div>
<div class="section" id="authors">
<h1><a class="toc-backref" href="#id9">Authors</a></h1>

0 comments on commit 5c6c4d7

Please sign in to comment.