diff --git a/licenses/agpl.html b/licenses/agpl.html
index f867a28..5da2de3 100644
--- a/licenses/agpl.html
+++ b/licenses/agpl.html
@@ -662,7 +662,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
+ 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
@@ -682,7 +682,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:
- {program} Copyright (C) {year} {name of author}
+ {{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/artistic.html b/licenses/artistic.html
index 83e3459..2bcc7ee 100644
--- a/licenses/artistic.html
+++ b/licenses/artistic.html
@@ -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 {{copyright holders}} with the name (or names) of the copyright holders.
required:
- include-copyright
diff --git a/licenses/bsd-3-clause.html b/licenses/bsd-3-clause.html
index 5587cc3..c00d8cc 100644
--- a/licenses/bsd-3-clause.html
+++ b/licenses/bsd-3-clause.html
@@ -3,7 +3,7 @@ layout: license
title: BSD (3-Clause) License
permalink: 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 {copyright holders} 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
@@ -23,7 +23,7 @@ forbidden:
---
-Copyright (c) {year}, {copyright holder}
+Copyright (c) {{year}}, {{fullname}}
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/licenses/bsd.html b/licenses/bsd.html
index 1f4cd7f..24aea0e 100644
--- a/licenses/bsd.html
+++ b/licenses/bsd.html
@@ -5,7 +5,7 @@ permalink: /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 {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 {{fullname}} with the name (or names) of the copyright holders.
source: http://opensource.org/licenses/BSD-2-Clause
@@ -25,7 +25,7 @@ forbidden:
---
-Copyright (c) {year}, {copyright holder}
+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.html b/licenses/gpl-v2.html
index 291cc47..e6d0bee 100644
--- a/licenses/gpl-v2.html
+++ b/licenses/gpl-v2.html
@@ -316,8 +316,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.
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
+ {{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.html b/licenses/gpl-v3.html
index 7122674..ded0a12 100644
--- a/licenses/gpl-v3.html
+++ b/licenses/gpl-v3.html
@@ -681,7 +681,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:
- {program} Copyright (C) {year} {name of author}
+ {{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.html b/licenses/lgpl-v2.1.html
index 3b7c6d6..82a21a8 100644
--- a/licenses/lgpl-v2.1.html
+++ b/licenses/lgpl-v2.1.html
@@ -496,8 +496,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.
- {one line to give the library's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
+ {{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.html b/licenses/mit.html
index f3bfdd6..79c341d 100644
--- a/licenses/mit.html
+++ b/licenses/mit.html
@@ -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 {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 {{fullname}} with the name (or names) of the copyright holders.
required:
- include-copyright
@@ -23,7 +23,7 @@ forbidden:
---
-Copyright (c) {year} {copyright holders}
+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