1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-01 16:13:02 +02:00

Merge pull request #58 from github/mustache

Proper mustache
This commit is contained in:
Zach Holman 2013-05-22 16:52:18 -07:00
commit 06a54414b7
8 changed files with 14 additions and 14 deletions

View File

@ -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. 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.} {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 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 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 If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: 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 program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.

View File

@ -7,7 +7,7 @@ source: http://opensource.org/licenses/Artistic-2.0
description: A license that’s heavily favored by the PERL community. 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: required:
- include-copyright - include-copyright

View File

@ -3,7 +3,7 @@ layout: license
title: BSD (3-Clause) License title: BSD (3-Clause) License
permalink: bsd-3-clause/ 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 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. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

View File

@ -5,7 +5,7 @@ permalink: /bsd/
description: A permissive license that comes in two variants, the <a href="bsd">BSD 2-Clause</a> and <a href="bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license. description: A permissive license that comes in two variants, the <a href="bsd">BSD 2-Clause</a> and <a href="bsd-3-clause">BSD 3-Clause</a>. 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 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. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

View File

@ -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 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. 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.} {{description}}
Copyright (C) {year} {name of author} Copyright (C) {{year}} {{fullname}}
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by

View File

@ -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 If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: 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 program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.

View File

@ -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 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" 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.} {{description}}
Copyright (C) {year} {name of author} Copyright (C) {{year}} {{fullname}}
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public

View File

@ -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. 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: required:
- include-copyright - 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 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 this software and associated documentation files (the "Software"), to deal in