Merge pull request #55 from bhuga/rework-brackets

Rework brackets

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 
 

_includes/sidebar.html

@@ -4,7 +4,7 @@
     <div class='how-to-apply callout'>
       <h5>How to apply this license</h5>
       <p>
-        {{ page.how | replace:"<<","[" | replace:">>","]" }}
+        {{ page.how  }}
       </p>
       {% if page.note %}
       <p class="note">
@@ -43,4 +43,4 @@
     </div>
     {% endif %}
     
-  </div><!-- /sidebar -->
+  </div><!-- /sidebar -->

_layouts/license.html

@@ -4,7 +4,7 @@
         <div class='license-body'>
           <pre id="license-text">
 
-{{ content }}
+{{ content | replace:"<","[" | replace:">","]" }}
         
           </pre><!-- /license-text -->
         </div><!-- /license-body -->

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. <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 [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.
 
@@ -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/].
+<http://www.gnu.org/licenses/>.

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.

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 [fullname] 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.

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.
 

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., <http://fsf.org/>
  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.
@@ -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]
+    {description}
-    Copyright (C) [year]  [fullname]
+    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

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,14 +672,14 @@ 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.
 
   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.
@@ -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>.

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
 
@@ -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]
+    {description}
-    Copyright (C) [year]  [fullname]
+    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

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. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

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 <http://unlicense.org>