From 29bebf30aeca3de62147fbea2bb6212c6f169d1b Mon Sep 17 00:00:00 2001 From: "Benjamin J. Balter" Date: Wed, 22 May 2013 19:52:13 -0400 Subject: [PATCH 1/3] remove gpl disambiguation page --- index.html | 5 +-- licenses/gpl.html | 77 ----------------------------------------------- 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 licenses/gpl.html diff --git a/index.html b/index.html index 0bd2501..3b0b103 100644 --- a/index.html +++ b/index.html @@ -31,11 +31,8 @@ class: home

  • - -

    I care about reciprocity.

    +

    I care about reciprocity.

    The GPL (V2 or V3) 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.

    diff --git a/licenses/gpl.html b/licenses/gpl.html deleted file mode 100644 index ee820d5..0000000 --- a/licenses/gpl.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - GPL Variations - ChooseALicense.com - - - - - - - - - - - - - -
    -
      -
    1. - Home / Licenses -
      2. -
    -

    GPL Variations

    - -

    Maybe an introductory sentence or two about how there are subtle differences between the various GPL licenses?

    - -

    GPL v2

    - -

    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.

    - -
      -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    - -

    View full license »

    - -

    GPL v3

    - -

    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.

    - -
      -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    - -

    View full license »

    - -

    Affero GPL v3.0

    - -

    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.

    - -
      -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    • Ground round salami pork chop
      • -
    - -

    View full license »

    - -
    - - From f8a3809616105ccd99a1253879761337f0f2ba70 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Balter" Date: Wed, 22 May 2013 20:13:08 -0400 Subject: [PATCH 2/3] Clean up after serving Your mother doesn't work here. --- script/server | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/server b/script/server index 0a204b7..f7acb22 100755 --- a/script/server +++ b/script/server @@ -2,4 +2,8 @@ set -e -bundle exec jekyll serve -w \ No newline at end of file +echo "spinning up the server..." +bundle exec jekyll serve -w + +echo "cleaning up..." +rm -Rf _site \ No newline at end of file From 6bc9b3ffa71f9938672cf767981743988c4ee36d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 22 May 2013 17:30:18 -0700 Subject: [PATCH 3/3] Use <<>> instead of {{}} --- licenses/agpl.html | 4 ++-- licenses/artistic.html | 2 +- licenses/bsd-3-clause.html | 4 ++-- licenses/bsd.html | 4 ++-- licenses/gpl-v2.html | 4 ++-- licenses/gpl-v3.html | 2 +- licenses/lgpl-v2.1.html | 4 ++-- licenses/mit.html | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/licenses/agpl.html b/licenses/agpl.html index 5da2de3..6799aac 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}} {{fullname}} + Copyright (C) <> <> 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}} + <> Copyright (C) <> <> 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 2bcc7ee..f8f94ea 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 <> with the current year and <> 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 c00d8cc..eceddc7 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 {{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 <> 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. source: http://opensource.org/licenses/BSD-3-Clause @@ -23,7 +23,7 @@ forbidden: --- -Copyright (c) {{year}}, {{fullname}} +Copyright (c) <>, <> 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 24aea0e..290900d 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 {{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 <> with the current year and <> 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) <>, <> 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 e6d0bee..65c3d0b 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. - {{description}} - Copyright (C) {{year}} {{fullname}} + <> + Copyright (C) <> <> 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 ded0a12..e32063a 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: - {{project}} Copyright (C) {{year}} {{fullname}} + <> Copyright (C) <> <> 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 82a21a8..2541a9e 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. - {{description}} - Copyright (C) {{year}} {{fullname}} + <> + Copyright (C) <> <> 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 79c341d..5a46e46 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 {{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 <> with the current year and <> with the name (or names) of the copyright holders. required: - include-copyright @@ -23,7 +23,7 @@ forbidden: --- -Copyright (c) {{year}} {{fullname}} +Copyright (c) <> <> 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