#66 change license to GPL-2.0

neocotic · Sep 2, 2016 · ab825a6 · ab825a6
1 parent 279cb60
commit ab825a6
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 63 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -33,8 +33,8 @@ module.exports = (grunt) ->
         files: 'dist/md.min.js': [ 'lib/md.js' ]
         options:
             banner: """
-              /*! <%= pkg.name %> v<%= pkg.version %> | (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> | <%= pkg.licenses[0].type %> License
-                  Make.text v1.5 | (c) 2007 Trevor Jim
+              /*! <%= pkg.name %> v<%= pkg.version %> | (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> | <%= pkg.license %> License
+                  Make.text v1.5 | (c) 2007 Trevor Jim | GPL-2.0 License
               */ 
             """
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,19 +1,16 @@
-Copyright (C) 2013 Alasdair Mercer, http://neocotic.com
+html.md  
+Copyright (C) 2016 Alasdair Mercer
 
-Permission is hereby granted, free of charge, to any person obtaining a copy  
-of this software and associated documentation files (the "Software"), to deal  
-in the Software without restriction, including without limitation the rights  
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell  
-copies of the Software, and to permit persons to whom the Software is  
-furnished to do so, subject to the following conditions:
+This program is free software; you can redistribute it and/or modify  
+it under the terms of the GNU General Public License as published by  
+the Free Software Foundation; either version 2 of the License, or  
+(at your option) any later version.
 
-The above copyright notice and this permission notice shall be included in all  
-copies or substantial portions of the Software.
+This program is distributed in the hope that it will be useful,  
+but WITHOUT ANY WARRANTY; without even the implied warranty of  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
+GNU General Public License for more details.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE  
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER  
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE  
-SOFTWARE.
+You should have received a copy of the GNU General Public License along  
+with this program; if not, write to the Free Software Foundation, Inc.,  
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/dist/md.min.js b/dist/md.min.js
diff --git a/docs/command.html b/docs/command.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>  <html> <head>   <title>command.coffee</title>   <meta http-equiv="content-type" content="text/html; charset=UTF-8">   <link rel="stylesheet" media="all" href="docco.css" /> </head> <body>   <div id="container">     <div id="background"></div>            <div id="jump_to">         Jump To &hellip;         <div id="jump_wrapper">           <div id="jump_page">                                           <a class="source" href="command.html">                 command.coffee               </a>                                           <a class="source" href="md.html">                 md.coffee               </a>                        </div>         </div>       </div>          <table cellpadding="0" cellspacing="0">       <thead>         <tr>           <th class="docs">             <h1>               command.coffee             </h1>           </th>           <th class="code">           </th>         </tr>       </thead>       <tbody>                               <tr id="section-1">             <td class="docs">               <div class="pilwrap">                 <a class="pilcrow" href="#section-1">&#182;</a>               </div>               <p><a href="http://neocotic.com/html.md">html.md</a> <br />
-(c) 2013 Alasdair Mercer <br />
-Freely distributable under the MIT license. <br />
+(c) 2016 Alasdair Mercer <br />
+Freely distributable under the GPL-2.0 license. <br />
 Based on <a href="http://homepage.mac.com/tjim/">Make.text</a> 1.5 <br />
 (c) 2007 Trevor Jim <br />
 For all details and documentation: <br />

diff --git a/docs/md.html b/docs/md.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>  <html> <head>   <title>md.coffee</title>   <meta http-equiv="content-type" content="text/html; charset=UTF-8">   <link rel="stylesheet" media="all" href="docco.css" /> </head> <body>   <div id="container">     <div id="background"></div>            <div id="jump_to">         Jump To &hellip;         <div id="jump_wrapper">           <div id="jump_page">                                           <a class="source" href="command.html">                 command.coffee               </a>                                           <a class="source" href="md.html">                 md.coffee               </a>                        </div>         </div>       </div>          <table cellpadding="0" cellspacing="0">       <thead>         <tr>           <th class="docs">             <h1>               md.coffee             </h1>           </th>           <th class="code">           </th>         </tr>       </thead>       <tbody>                               <tr id="section-1">             <td class="docs">               <div class="pilwrap">                 <a class="pilcrow" href="#section-1">&#182;</a>               </div>               <p><a href="http://neocotic.com/html.md">html.md</a> <br />
-(c) 2013 Alasdair Mercer <br />
-Freely distributable under the MIT license. <br />
+(c) 2016 Alasdair Mercer <br />
+Freely distributable under the GPL-2.0 license. <br />
 Based on <a href="http://homepage.mac.com/tjim/">Make.text</a> 1.5 <br />
 (c) 2007 Trevor Jim <br />
 For all details and documentation: <br />

diff --git a/lib/command.js b/lib/command.js
diff --git a/lib/md.js b/lib/md.js
diff --git a/man/doc.1 b/man/doc.1
@@ -1,4 +1,4 @@
-.TH HTMLMD 1 "August 2013" "" "General Commands Manual"
+.TH HTMLMD 1 "September 2016" "" "General Commands Manual"
 
 .SH NAME
 .B htmlmd

diff --git a/package.json b/package.json
@@ -11,12 +11,7 @@
     "email": "mercer.alasdair@gmail.com",
     "url": "http://neocotic.com"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/neocotic/html.md/raw/master/LICENSE.md"
-    }
-  ],
+  "license": "GPL-2.0",
   "keywords": [
     "html",
     "markdown",

diff --git a/src/command.coffee b/src/command.coffee
@@ -1,6 +1,6 @@
 # [html.md](http://neocotic.com/html.md)  
-# (c) 2013 Alasdair Mercer  
-# Freely distributable under the MIT license.  
+# (c) 2016 Alasdair Mercer
+# Freely distributable under the GPL-2.0 license.
 # Based on [Make.text](http://homepage.mac.com/tjim/) 1.5  
 # (c) 2007 Trevor Jim  
 # For all details and documentation:  

diff --git a/src/md.coffee b/src/md.coffee
@@ -1,6 +1,6 @@
 # [html.md](http://neocotic.com/html.md)  
-# (c) 2013 Alasdair Mercer  
-# Freely distributable under the MIT license.  
+# (c) 2016 Alasdair Mercer
+# Freely distributable under the GPL-2.0 license.
 # Based on [Make.text](http://homepage.mac.com/tjim/) 1.5  
 # (c) 2007 Trevor Jim  
 # For all details and documentation: