From 60f9ab0ab73909fdb51da92bd43c9996574b2080 Mon Sep 17 00:00:00 2001 From: Bruno Aguirre Date: Mon, 15 Jul 2013 17:19:31 -0300 Subject: [PATCH 01/25] Adds a way to copy the license without using ZeroClipboard * Selects the license when the browser does not have Flash installed so people can easily copy & paste it. --- javascripts/app.coffee | 58 +++++++++++++++++++++++++++++++++--------- javascripts/app.js | 49 +++++++++++++++++++++++++++++++---- 2 files changed, 90 insertions(+), 17 deletions(-) diff --git a/javascripts/app.coffee b/javascripts/app.coffee index 0dae5bb..2bb3806 100644 --- a/javascripts/app.coffee +++ b/javascripts/app.coffee @@ -1,5 +1,26 @@ class Choosealicense + # Checks if Flash is available in the client. + flashAvailable: -> + if ActiveXObject? + !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash')) + else + !!navigator.mimeTypes["application/x-shockwave-flash"] + + # Selects the content of a given element + selectText: (element) -> + if document.body.createTextRange + range = document.body.createTextRange(); + range.moveToElementText(element); + range.select(); + else if window.getSelection + selection = window.getSelection() + range = document.createRange() + + range.selectNodeContents(element) + selection.removeAllRanges(); + selection.addRange(range); + # Qtip position attributes for tooltips qtip_position: my: "top center" @@ -14,7 +35,7 @@ class Choosealicense # fire on document.ready constructor: -> @initTooltips() - @initClipboard() if ZeroClipboard? + @initClipboard() # Init tooltip action initTooltips: -> @@ -37,19 +58,32 @@ class Choosealicense false + # Initializes ZeroClipboard + initZeroClipboard: -> + # Backup the clipboard button's original text. + $(".js-clipboard-button").data "clipboard-prompt", $(".js-clipboard-button").text() + + # Hook up copy to clipboard buttons + clip = new ZeroClipboard $(".js-clipboard-button"), + moviePath: "/javascripts/ZeroClipboard.swf" + clip.on "mouseout", @clipboardMouseout + clip.on "complete", @clipboardComplete + clip + + # Initializes an alternative way to copy the license for non-flash compatible + # browsers + initAlternativeClipboard: -> + $(".js-clipboard-button").click (e) => + target = "#" + $(e.target).data("clipboard-target") + @selectText $(target)[0] + # if Zero Clipboard is present, bind to button and init initClipboard: -> + if ZeroClipboard? && @flashAvailable() + @initZeroClipboard() + else + @initAlternativeClipboard() - # Backup the clipboard button's original text. - $(".js-clipboard-button").data "clipboard-prompt", $(".js-clipboard-button").text() - - # Hook up copy to clipboard buttons - clip = new ZeroClipboard $(".js-clipboard-button"), - moviePath: "/javascripts/ZeroClipboard.swf" - clip.on "mouseout", @clipboardMouseout - clip.on "complete", @clipboardComplete - clip - # Callback to restore the clipboard button's original text clipboardMouseout: (client, args) -> @innerText = $(this).data("clipboard-prompt") @@ -59,4 +93,4 @@ class Choosealicense @innerText = "Copied!" $ -> - new Choosealicense() \ No newline at end of file + new Choosealicense() diff --git a/javascripts/app.js b/javascripts/app.js index 5b6be4c..f140d3c 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -1,8 +1,32 @@ -// Generated by CoffeeScript 1.6.3 +// Generated by CoffeeScript 1.4.0 (function() { var Choosealicense; Choosealicense = (function() { + + Choosealicense.prototype.flashAvailable = function() { + if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) { + return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash')); + } else { + return !!navigator.mimeTypes["application/x-shockwave-flash"]; + } + }; + + Choosealicense.prototype.selectText = function(element) { + var range, selection; + if (document.body.createTextRange) { + range = document.body.createTextRange(); + range.moveToElementText(element); + return range.select(); + } else if (window.getSelection) { + selection = window.getSelection(); + range = document.createRange(); + range.selectNodeContents(element); + selection.removeAllRanges(); + return selection.addRange(range); + } + }; + Choosealicense.prototype.qtip_position = { my: "top center", at: "bottom center" @@ -16,9 +40,7 @@ function Choosealicense() { this.initTooltips(); - if (typeof ZeroClipboard !== "undefined" && ZeroClipboard !== null) { - this.initClipboard(); - } + this.initClipboard(); } Choosealicense.prototype.initTooltips = function() { @@ -49,7 +71,7 @@ return false; }; - Choosealicense.prototype.initClipboard = function() { + Choosealicense.prototype.initZeroClipboard = function() { var clip; $(".js-clipboard-button").data("clipboard-prompt", $(".js-clipboard-button").text()); clip = new ZeroClipboard($(".js-clipboard-button"), { @@ -60,6 +82,23 @@ return clip; }; + Choosealicense.prototype.initAlternativeClipboard = function() { + var _this = this; + return $(".js-clipboard-button").click(function(e) { + var target; + target = "#" + $(e.target).data("clipboard-target"); + return _this.selectText($(target)[0]); + }); + }; + + Choosealicense.prototype.initClipboard = function() { + if ((typeof ZeroClipboard !== "undefined" && ZeroClipboard !== null) && this.flashAvailable()) { + return this.initZeroClipboard(); + } else { + return this.initAlternativeClipboard(); + } + }; + Choosealicense.prototype.clipboardMouseout = function(client, args) { return this.innerText = $(this).data("clipboard-prompt"); }; From ddfbee3953838869e9c506e3db966036a75dfc0e Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Tue, 16 Jul 2013 01:11:04 -0500 Subject: [PATCH 02/25] Use the unlicense instead of CC0 to represent the public domain --- licenses/public-domain.txt | 144 ++++++------------------------------- 1 file changed, 23 insertions(+), 121 deletions(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index e7896ad..24ed278 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -2,11 +2,11 @@ layout: license permalink: /licenses/public-domain/ class: license-types -title: Public Domain (CC0) +title: Public Domain (Unlicense) -description: Because copyright attaches automatically in many countries, the Creative Commons CC0 License is recommended to ensure that your work is available everywhere under terms that most closely follow the spirit of a public domain work. +description: The Unlicense is a template for disclaiming copyright interest in software you've written, a template for dedicating your software to the public domain. It combines a copyright waiver patterned after the very successful public domain SQLite project with the no-warranty statement from the widely-used MIT/X11 license. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. You can alternatively use the Creative Commons CC0 tool to generate HTML with embedded metadata to mark your work as CC0. +how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. required: @@ -21,125 +21,27 @@ forbidden: - no-liability --- +This is free and unencumbered software released into the public domain. -Creative Commons Legal Code +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. -CC0 1.0 Universal +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. +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 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. -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. +For more information, please refer to From dff132393e8ed1d0b9e532636292833f6c6a041b Mon Sep 17 00:00:00 2001 From: Matt Burke Date: Tue, 16 Jul 2013 08:50:46 -0400 Subject: [PATCH 03/25] Leave out dev things. --- _config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_config.yml b/_config.yml index 5f56701..ed961da 100644 --- a/_config.yml +++ b/_config.yml @@ -61,3 +61,7 @@ rules: description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing +exclude: + - CNAME + - Gemfile* + - script From 685f1b4de211501389d9f375f231bbf33f4a292e Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 16 Jul 2013 11:28:32 -0400 Subject: [PATCH 04/25] expose license data as an api, fixes #40 --- licenses.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 licenses.json diff --git a/licenses.json b/licenses.json new file mode 100644 index 0000000..d70fa41 --- /dev/null +++ b/licenses.json @@ -0,0 +1,28 @@ +--- +comment: \ + because the for loop is being filtered by layout, the normal rindex0 check + for the trailing comma doesn't work. Count the number of licenses and manually + increment an index to see if we're on the true last iteration. +--- +{% assign count = 0 %}{% for page in site.pages %}{% if page.layout == "license" %}{% assign count = count | plus: 1 %}{% endif %}{% endfor %}{% assign i = 0 %} +[ +{% for page in site.pages %}{% if page.layout == "license" %} + { + "title": "{{ page.title }}", + "permalink": "{{ page.permalink }}", + "featured": {% if page.featured %}true{% else %}false{% endif %}, + "description": "{{ page.description | replace: '"', '\"' }}", + "how": "{{ page.how | replace: '"', '\"' }}", + "rules": { + {% for category in site.rules %} + {% assign cat = category[0] %} + "{{ cat }}": [ + {% for rule in page[cat] %} + "{{ rule }}"{% if forloop.rindex0 > 0 %},{% endif %} + {% endfor %} + ]{% if forloop.rindex0 > 0 %},{% endif %} + {% endfor %} + }{% assign i = i | plus: 1 %} + }{% if i < count %},{% endif %} + {% endif %}{% endfor %} +] \ No newline at end of file From 73def230ea672e9b045f0c6da323692435c8e970 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 16 Jul 2013 11:33:33 -0400 Subject: [PATCH 05/25] cleanup yaml comment --- licenses.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/licenses.json b/licenses.json index d70fa41..30d207f 100644 --- a/licenses.json +++ b/licenses.json @@ -1,8 +1,8 @@ --- comment: \ - because the for loop is being filtered by layout, the normal rindex0 check - for the trailing comma doesn't work. Count the number of licenses and manually - increment an index to see if we're on the true last iteration. + because the for loop is being filtered by layout, the normal rindex0 check + for the trailing comma doesn't work. Count the number of licenses and manually + increment an index to see if we're on the true last iteration. --- {% assign count = 0 %}{% for page in site.pages %}{% if page.layout == "license" %}{% assign count = count | plus: 1 %}{% endif %}{% endfor %}{% assign i = 0 %} [ From 66955456a7c3faa09fb70284fe2fb0e9358a485b Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 16 Jul 2013 08:41:22 -0700 Subject: [PATCH 06/25] Added oxford comma Yeah, I just committed straight to master. Fight me. I could not let this affront to grammar continue. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 30529b1..64cf4cd 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@ description: A site to provide non-judgmental guidance on choosing a license for The GPL (V2 or V3) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.

- Linux, Git and WordPress use the GPL. + Linux, Git, and WordPress use the GPL.

From 18b473fd17f025102184ba8281b6dba0cbc16739 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Tue, 16 Jul 2013 11:19:13 -0500 Subject: [PATCH 07/25] Fix wording a little --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 24ed278..1658647 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -4,7 +4,7 @@ permalink: /licenses/public-domain/ class: license-types title: Public Domain (Unlicense) -description: The Unlicense is a template for disclaiming copyright interest in software you've written, a template for dedicating your software to the public domain. It combines a copyright waiver patterned after the very successful public domain SQLite project with the no-warranty statement from the widely-used MIT/X11 license. +description: The Unlicense is a template to waive copyright interest in software you've written and dedicate it to the public domain. It combines a copyright waiver patterned after the successful public domain project SQLite with the no-warranty statement from the widely-used MIT/X11 license. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. From 3250493b774f1b69cd88c04f2707fd368cf6bdc2 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Tue, 16 Jul 2013 11:33:43 -0500 Subject: [PATCH 08/25] Words again --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 1658647..75c853b 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -4,7 +4,7 @@ permalink: /licenses/public-domain/ class: license-types title: Public Domain (Unlicense) -description: The Unlicense is a template to waive copyright interest in software you've written and dedicate it to the public domain. It combines a copyright waiver patterned after the successful public domain project SQLite with the no-warranty statement from the widely-used MIT/X11 license. +description: Because copyright is automatic in most countries, the Unlicense is a template to waive interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. From 7bbf5d523021ad19971058cec9014da6496a42de Mon Sep 17 00:00:00 2001 From: Jason Long Date: Tue, 16 Jul 2013 14:24:45 -0400 Subject: [PATCH 09/25] darkened text for better contrast --- css/application.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/css/application.css b/css/application.css index 6e96ed1..f73cecd 100644 --- a/css/application.css +++ b/css/application.css @@ -56,7 +56,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, body { background: #f5f1ec url(../images/bg.jpg); - color: #7e7974; + color: #5c5855; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.4; @@ -233,7 +233,7 @@ strong { -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; - color: #7e7974; + color: #5c5855; padding: 16px; } .see-more { @@ -276,7 +276,7 @@ strong { font-size: 16px; } .license-rules .summary { - color: #7e7974; + color: #5c5855; } .license-rules td { border-bottom: solid 1px #e9e6e2; @@ -379,7 +379,7 @@ strong { border-top: 1px solid #e9e6e1; margin-top: 30px; padding-top: 20px; - color: #7e7974; + color: #5c5855; font-size: 12px; text-align: left; line-height: 1.5; From 37f77b1ba4d6c163d03d191628a19b36df630cdc Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 16 Jul 2013 17:25:59 -0700 Subject: [PATCH 10/25] hwhoops! Quick fix. --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 75c853b..114b3bf 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -44,4 +44,4 @@ 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. -For more information, please refer to +For more information, please refer to <> From e0ad6dee444988a3626ba5fec5a36f3f734225ff Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:38:47 -0500 Subject: [PATCH 11/25] Fix << >> and < > and { } urls --- licenses/agpl.txt | 6 +++--- licenses/gpl-v3.txt | 8 ++++---- licenses/lgpl-v3.txt | 2 +- licenses/public-domain.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/licenses/agpl.txt b/licenses/agpl.txt index c6a35bd..e7a141b 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -30,7 +30,7 @@ using: GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -672,7 +672,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + along with this program. If not, see [http://www.gnu.org/licenses/]. Also add information on how to contact you by electronic and paper mail. @@ -687,4 +687,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -. +[http://www.gnu.org/licenses/]. diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index 655b94d..ae04b1f 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -28,7 +28,7 @@ forbidden: GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/} + Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -672,7 +672,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see {http://www.gnu.org/licenses/}. + along with this program. If not, see [http://www.gnu.org/licenses/]. Also add information on how to contact you by electronic and paper mail. @@ -691,11 +691,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -{http://www.gnu.org/licenses/}. +[http://www.gnu.org/licenses/]. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -{http://www.gnu.org/philosophy/why-not-lgpl.html}. +[http://www.gnu.org/philosophy/why-not-lgpl.html]. diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index afab013..0a11355 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -28,7 +28,7 @@ forbidden: GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 114b3bf..6f29228 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -44,4 +44,4 @@ 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. -For more information, please refer to <> +For more information, please refer to http://unlicense.org From ad66f7d4052fcf39f0eb438ebaebedb844e8764c Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:39:25 -0500 Subject: [PATCH 12/25] Unlicense is called UNLICENSE --- licenses/public-domain.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 6f29228..14ebcad 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -3,6 +3,7 @@ layout: license permalink: /licenses/public-domain/ class: license-types title: Public Domain (Unlicense) +filename: UNLICENSE description: Because copyright is automatic in most countries, the Unlicense is a template to waive interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. From 88e4101ce3b985b7f7169fab625b5250f0b6f658 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:41:30 -0500 Subject: [PATCH 13/25] Link the unlicense and specificity about waiving --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 14ebcad..e85e07b 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -5,7 +5,7 @@ class: license-types title: Public Domain (Unlicense) filename: UNLICENSE -description: Because copyright is automatic in most countries, the Unlicense is a template to waive interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. +description: Because copyright is automatic in most countries, the Unlicense is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. From babcaa2a18043ea74aec05b2424fa6c469ee7115 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:57:57 -0500 Subject: [PATCH 14/25] No more interpolating << --- _layouts/license.html | 4 ++-- licenses/artistic.txt | 2 +- licenses/bsd-3-clause.txt | 4 ++-- licenses/bsd.txt | 4 ++-- licenses/gpl-v2.txt | 4 ++-- licenses/gpl-v3.txt | 2 +- licenses/lgpl-v2.1.txt | 4 ++-- licenses/mit.txt | 4 ++-- licenses/no-license.html | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/_layouts/license.html b/_layouts/license.html index 774bc70..63c2588 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -4,7 +4,7 @@ 
 
-{{ content | replace:"<<","[" | replace:">>","]" }}
+{{ content }}
@@ -13,4 +13,4 @@ -{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/licenses/artistic.txt b/licenses/artistic.txt index d91ecec..a2e9c8f 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -7,7 +7,7 @@ source: http://opensource.org/licenses/Artistic-2.0 description: A license that’s heavily favored by the Perl community. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace <> with the current year and <> with the name (or names) of the copyright holders. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [copyright holders] with the name (or names) of the copyright holders. required: - include-copyright diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index 5ff1267..687d2a1 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -3,7 +3,7 @@ layout: license title: BSD (3-Clause) License permalink: /licenses/bsd-3-clause/ -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace <> with the current year and <> with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work. source: http://opensource.org/licenses/BSD-3-Clause @@ -22,7 +22,7 @@ forbidden: --- -Copyright (c) <>, <> +Copyright (c) [year], [fullname] All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/licenses/bsd.txt b/licenses/bsd.txt index 3e85c90..bccdf60 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -5,7 +5,7 @@ permalink: /licenses/bsd/ description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace <> with the current year and <> with the name (or names) of the copyright holders. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. source: http://opensource.org/licenses/BSD-2-Clause @@ -23,7 +23,7 @@ forbidden: --- -Copyright (c) <>, <> +Copyright (c) [year], [fullname] All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index b5b9e2e..7cf6322 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -318,8 +318,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - <> - Copyright (C) <> <> + [description] + Copyright (C) [year] [fullname] 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 diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index ae04b1f..b8979bf 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -679,7 +679,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - <> Copyright (C) <> <> + [project] Copyright (C) [year] [fullname] This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index bb5d42a..34f8405 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -498,8 +498,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - <> - Copyright (C) <> <> + [description] + Copyright (C) [year] [fullname] This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/licenses/mit.txt b/licenses/mit.txt index b815ac3..006d0b9 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -7,7 +7,7 @@ featured: true description: A permissive license that is short and to the point. It lets people do anything with your code with proper attribution and without warranty. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace <> with the current year and <> with the name (or names) of the copyright holders. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. required: - include-copyright @@ -25,7 +25,7 @@ forbidden: The MIT License (MIT) -Copyright (c) <> <> +Copyright (c) [year] [fullname] 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 diff --git a/licenses/no-license.html b/licenses/no-license.html index e1d32e7..783e374 100644 --- a/licenses/no-license.html +++ b/licenses/no-license.html @@ -24,4 +24,4 @@ forbidden: --- -Copyright <> <> +Copyright [year] [fullname] From 7ecc0c06d9808304657e264b57a00b652607bac5 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 12:00:40 -0500 Subject: [PATCH 15/25] Fix inconsistent replace clauses in BSD 3 clause --- licenses/bsd-3-clause.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index 687d2a1..dd093f9 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -3,7 +3,7 @@ layout: license title: BSD (3-Clause) License permalink: /licenses/bsd-3-clause/ -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [organization] with the organization, if any, that sponsors this work. source: http://opensource.org/licenses/BSD-3-Clause @@ -35,7 +35,7 @@ are permitted provided that the following conditions are met: list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the {organization} nor the names of its + Neither the name of the [organization] nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. From 4e2fd06748ba8cc61c13b604b5bd947242bcbd63 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 15:32:20 -0500 Subject: [PATCH 16/25] single angle braces for links and curly braces for non-vars --- licenses/agpl.txt | 6 +++--- licenses/apache.txt | 4 ++-- licenses/bsd-3-clause.txt | 4 ++-- licenses/gpl-v3.txt | 8 ++++---- licenses/lgpl-v3.txt | 2 +- licenses/public-domain.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/licenses/agpl.txt b/licenses/agpl.txt index e7a141b..c6a35bd 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -30,7 +30,7 @@ using: GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -672,7 +672,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see [http://www.gnu.org/licenses/]. + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -687,4 +687,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -[http://www.gnu.org/licenses/]. +. diff --git a/licenses/apache.txt b/licenses/apache.txt index c0ee3a3..d6c8a7f 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -201,14 +201,14 @@ END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own +notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index dd093f9..687d2a1 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -3,7 +3,7 @@ layout: license title: BSD (3-Clause) License permalink: /licenses/bsd-3-clause/ -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [organization] with the organization, if any, that sponsors this work. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work. source: http://opensource.org/licenses/BSD-3-Clause @@ -35,7 +35,7 @@ are permitted provided that the following conditions are met: list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the [organization] nor the names of its + Neither the name of the {organization} nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index b8979bf..dc24d23 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -28,7 +28,7 @@ forbidden: GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -672,7 +672,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see [http://www.gnu.org/licenses/]. + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -691,11 +691,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -[http://www.gnu.org/licenses/]. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -[http://www.gnu.org/philosophy/why-not-lgpl.html]. +. diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index 0a11355..afab013 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -28,7 +28,7 @@ forbidden: GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. [http://fsf.org/] + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index e85e07b..77ca8fb 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -45,4 +45,4 @@ 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. -For more information, please refer to http://unlicense.org +For more information, please refer to From 8b2afbd8899c8844dc0f3befe4d4108901285876 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 15:32:34 -0500 Subject: [PATCH 17/25] Convert angle brackets to square brackets for display --- _layouts/license.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/license.html b/_layouts/license.html index 63c2588..4f4c7d2 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -4,7 +4,7 @@ 
 
-{{ content }}
+{{ content | replace:"<","[" | replace:">","]" }}
From 871eee21def53d538e2b99ac26557c201b3dc317 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 15:33:39 -0500 Subject: [PATCH 18/25] These are just parens. --- licenses/lgpl-v2.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index 34f8405..e29c56b 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -34,9 +34,9 @@ forbidden: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts +(This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] + the version number 2.1.) Preamble From b080b5e2fe3d265478293bc06c3d90def3efdd4d Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 17:30:55 -0500 Subject: [PATCH 19/25] Don't replace on how fields; no longer needed --- _includes/sidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 5d23bf5..5c860ae 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -4,7 +4,7 @@
How to apply this license

- {{ page.how | replace:"<<","[" | replace:">>","]" }} + {{ page.how }}

{% if page.note %}

@@ -43,4 +43,4 @@

{% endif %} - \ No newline at end of file + From dc31ddcbe8e9b497d107a1c6aa7b69e948d6c20e Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 17:43:01 -0500 Subject: [PATCH 20/25] gplv2 has a link --- licenses/gpl-v2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 7cf6322..69f63d1 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -29,7 +29,7 @@ forbidden: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. From 61ed4a518c9f044918ce9ad407f39c4f24d46d73 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 17:48:22 -0500 Subject: [PATCH 21/25] This is probably more correct --- licenses/artistic.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index a2e9c8f..3f283af 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -7,7 +7,7 @@ source: http://opensource.org/licenses/Artistic-2.0 description: A license that’s heavily favored by the Perl community. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [copyright holders] with the name (or names) of the copyright holders. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [name] with the name (or names) of the copyright holders. required: - include-copyright @@ -25,7 +25,7 @@ forbidden: --- Artistic License 2.0 -Copyright (c) 2000-2006, The Perl Foundation. +Copyright (c) [year] [fullname] Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. From 7e7e54d3dffff07a6eab5aea15c9e2a14f5a302d Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 17:50:31 -0500 Subject: [PATCH 22/25] These are actually advertisements to use the gpl, not copyright notices --- licenses/gpl-v2.txt | 4 ++-- licenses/gpl-v3.txt | 2 +- licenses/lgpl-v2.1.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 69f63d1..751c221 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -318,8 +318,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - [description] - Copyright (C) [year] [fullname] + {description} + Copyright (C) {year} {fullname} 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 diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index dc24d23..c3c105b 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -679,7 +679,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - [project] Copyright (C) [year] [fullname] + {project} Copyright (C) {year} {fullname} This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index e29c56b..eacacde 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -498,8 +498,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - [description] - Copyright (C) [year] [fullname] + {description} + Copyright (C) {year} {fullname} This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From 14bd7cbaed9baf3a69fda054d1420f00a59bcb2b Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 17:51:33 -0500 Subject: [PATCH 23/25] Fix description on artistic license --- licenses/artistic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 3f283af..11dd18c 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -7,7 +7,7 @@ source: http://opensource.org/licenses/Artistic-2.0 description: A license that’s heavily favored by the Perl community. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [name] with the name (or names) of the copyright holders. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. required: - include-copyright From 67287e8b61238bfdb2f19acbb095277679c4ae66 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Thu, 18 Jul 2013 10:43:08 -0500 Subject: [PATCH 24/25] Document license interpolation --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 113ef7b..a578ee9 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,16 @@ Licenses sit in the `/licenses` folder as markdown (`.md`) files. Each license h * `note` - The note field in the sidebar (optional) * `how` - How to use the license, also in the sidebar * `required`, `permitted`, `forbidden` - bulleted list of rules applicable to the license (see below) +* `filename` - The filename to be created on GitHub.com when a repository is initialized with this license. + +The licenses on choosealicense.com are regularly imported to GitHub.com to be used as the list of licenses available when creating a repository. When we create a repository, we will replace certain strings in the license with variables from the repository. These can be used to create accurate copyright notices. The available variables are: + +* `[fullname]` - The full name or username of the repository owner +* `[login]` - The repository owner's username +* `[email]` - The repository owner's primary email address +* `[project]` - The repository name +* `[description]` - The description of the repository +* `[year]` - The current year # Rules From 1cdd11eb0121cea1f45902703070d65fa6516cd7 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Thu, 18 Jul 2013 11:08:24 -0500 Subject: [PATCH 25/25] Whitespace rules everything around me. --- _includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 5c860ae..1cd0783 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -4,7 +4,7 @@
How to apply this license

- {{ page.how }} + {{ page.how }}

{% if page.note %}