From 4e2fd06748ba8cc61c13b604b5bd947242bcbd63 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 15:32:20 -0500 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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