Merge branch 'master' into html-to-txt

index.html

@@ -31,11 +31,8 @@ class: home
       </p>
     </li>
     <li class='reciprocity'>
-      <!--
-      TODO: We might need a GPL landing page here so we're not making any political statements
-      -->
       <a href="licenses/gpl-v2"><img height='69' src='images/circular@2x.png' width='72'></a>
-      <h3><a href="licenses/gpl.html">I care about reciprocity.</a></h3>
+      <h3><a href="licenses/gpl-v3">I care about reciprocity.</a></h3>
       <p>
         The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) isn't a permissive license, meaning that it requires that folks who modify your code also license their changes under the GPL. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations.
       </p>

licenses/agpl.txt

@@ -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}}  {{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
@@ -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:
 
-    {{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.

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 <<copyright holders>> with the name (or names) of the copyright holders.
 
 required:
   - include-copyright

licenses/bsd-3-clause.txt

@@ -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 {{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
 
@@ -23,7 +23,7 @@ forbidden:
 
 ---
 
-Copyright (c) {{year}}, {{fullname}}
+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:

licenses/bsd.txt

@@ -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.
 
-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.
+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}}, {{fullname}}
+Copyright (c) <<year>>, <<fullname>>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

licenses/gpl-v2.txt

@@ -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.
 
-    {{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

@@ -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:
 
-    {{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.

licenses/gpl.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-  <head>
-    <title>GPL Variations - ChooseALicense.com</title>
-    <meta charset='utf-8'>
-    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
-    <link href='../../favicon.ico' rel='shortcut icon' type='image/x-icon'>
-    <link href='http://fonts.googleapis.com/css?family=Chivo:900' rel='stylesheet' type='text/css'>
-    <link type="text/css" href="../css/application.css" media="screen" rel="stylesheet">
-    <link type="text/css" href="../css/jquery.qtip.css" media="screen" rel="stylesheet">
-    <script type="text/javascript" src="../../javascripts/jquery-1.7.1.min.js"></script>
-    <script type="text/javascript" src="../../javascripts/app.js"></script>
-    <script type="text/javascript" src="../../javascripts/jquery.qtip.min.js"></script>
-    <script type="text/javascript" src="../../javascripts/modernizr.js"></script>
-    <!--[if (gte IE 6)&(lte IE 8)]>
-      <script src='../../javascripts/selectivizr-min.js' type='text/javascript'></script>
-    <![endif]-->
-  </head>
-  <body class='license-types'>
-    <div class='container'>
-      <ol class='breadcrumbs'>
-      <li>
-        <a href="../../">Home</a> / <a href="./">Licenses</a>
-      </li>
-    </ol>
-    <h1>GPL Variations</h1>
-
-    <p>Maybe an introductory sentence or two about how there are subtle differences between the various GPL licenses?</p>
-
-    <h2><a href="gpl-v2">GPL v2</a></h2>
-
-    <p>Bacon ipsum dolor sit amet shoulder corned beef jowl fatback sausage ham hock rump drumstick shankle ground round chuck pig ball tip prosciutto. Leberkas flank tenderloin, venison capicola tail ham hock rump cow sirloin shankle. Drumstick sausage doner andouille jerky short loin pork loin kielbasa pork shank prosciutto t-bone rump. Ground round salami pork chop frankfurter jowl. Kielbasa boudin turkey leberkas pork jowl ham turducken tongue shoulder capicola salami cow ball tip. Turkey strip steak rump biltong. Ball tip beef jowl capicola boudin corned beef.</p>
-
-    <ul class="bullets">
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-    </ul>
-
-    <p><a href="gpl-v2">View full license »</a></p>
-
-    <h2><a href="gpl-v3">GPL v3</a></h2>
-
-    <p>Bacon ipsum dolor sit amet shoulder corned beef jowl fatback sausage ham hock rump drumstick shankle ground round chuck pig ball tip prosciutto. Leberkas flank tenderloin, venison capicola tail ham hock rump cow sirloin shankle. Drumstick sausage doner andouille jerky short loin pork loin kielbasa pork shank prosciutto t-bone rump. Ground round salami pork chop frankfurter jowl. Kielbasa boudin turkey leberkas pork jowl ham turducken tongue shoulder capicola salami cow ball tip. Turkey strip steak rump biltong. Ball tip beef jowl capicola boudin corned beef.</p>
-
-    <ul class="bullets">
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-    </ul>
-
-    <p><a href="gpl-v3">View full license »</a></p>
-
-    <h2><a href="agpl">Affero GPL v3.0</a></h2>
-
-    <p>Bacon ipsum dolor sit amet shoulder corned beef jowl fatback sausage ham hock rump drumstick shankle ground round chuck pig ball tip prosciutto. Leberkas flank tenderloin, venison capicola tail ham hock rump cow sirloin shankle. Drumstick sausage doner andouille jerky short loin pork loin kielbasa pork shank prosciutto t-bone rump. Ground round salami pork chop frankfurter jowl. Kielbasa boudin turkey leberkas pork jowl ham turducken tongue shoulder capicola salami cow ball tip. Turkey strip steak rump biltong. Ball tip beef jowl capicola boudin corned beef.</p>
-
-    <ul class="bullets">
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-      <li>Ground round salami pork chop</li>
-    </ul>
-
-    <p><a href="agpl">View full license »</a></p>
-
-    <footer class="site-footer cf">
-      <nav>
-        <a href="../about">About</a>
-        <a href="#">Terms of Service</a>
-      </nav>
-      <p>Please consult a legal expert before adopting a software license for your project.<br>
-        This site is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/">
-        Creative Commons Attribution 3.0 Unported License</a>.</p>
-      </p>
-    </div>
-  </body>
-</html>

licenses/lgpl-v2.1.txt

@@ -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.
 
-    {{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/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 {{year}} with the current year and {{fullname}} 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}} {{fullname}}
+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

script/server

@@ -2,4 +2,8 @@
 
 set -e
 
+echo "spinning up the server..."
 bundle exec jekyll serve -w
+
+echo "cleaning up..."
+rm -Rf _site