From e0ad6dee444988a3626ba5fec5a36f3f734225ff Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:38:47 -0500 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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.