From babcaa2a18043ea74aec05b2424fa6c469ee7115 Mon Sep 17 00:00:00 2001 From: Ben Lavender Date: Wed, 17 Jul 2013 11:57:57 -0500 Subject: [PATCH] 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]