From 35db787774dd56f053585ab2ff6e082aed1bac7b Mon Sep 17 00:00:00 2001
From: lazygravy <lazygravy@mail.i2p>
Date: Sun, 24 Jan 2016 18:09:45 +0000
Subject: [PATCH] Switch sam.pm license to GPL, which is what the code states.
 Use https for Wikipedia links.

---
 .../site/get-involved/develop/licenses.html   | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/i2p2www/pages/site/get-involved/develop/licenses.html b/i2p2www/pages/site/get-involved/develop/licenses.html
index 3f97a277..a3b3fae0 100644
--- a/i2p2www/pages/site/get-involved/develop/licenses.html
+++ b/i2p2www/pages/site/get-involved/develop/licenses.html
@@ -65,7 +65,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">core</td>
   <td valign="top" align="left">i2p.jar</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
@@ -77,7 +77,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">router</td>
   <td valign="top" align="left">router.jar</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
@@ -91,7 +91,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">zzz</td>
@@ -101,7 +101,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">apps/streaming</td>
   <td valign="top" align="left">streaming.jar</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
@@ -115,7 +115,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">
 	  <a href="#java_exception">GPL + exception</a></td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
@@ -126,7 +126,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">apps/routerconsole</td>
   <td valign="top" align="left">routerconsole.war</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">&nbsp;</td>
   <td valign="top" align="left">zzz</td>
  </tr>
@@ -138,7 +138,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">
-    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+    <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
   <td valign="top" align="left">&nbsp;</td>
@@ -176,7 +176,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">BOB.jar</td>
 
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/WTFPL">WTFPL</a></td>
+	  <a href="https://en.wikipedia.org/wiki/WTFPL">WTFPL</a></td>
   <td valign="top" align="left">&nbsp;</td>
   <td valign="top" align="left">sponge</td>
  </tr>
@@ -186,7 +186,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">sam.jar</td>
 
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
@@ -199,9 +199,9 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">SAM.pm</td>
 
   <td valign="top" align="left">
-	  <a href="http://dev.perl.org/licenses/artistic.html">Artistic</a></td>
+	  <a href="https://www.gnu.org/licenses/gpl-2.0.html">GPL</a></td>
   <td valign="top" align="left">
-    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+    <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
@@ -215,7 +215,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
   <td valign="top" align="left">
-    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+    <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">Nightblade</td>
@@ -226,9 +226,9 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">i2p.py</td>
 
   <td valign="top" align="left">
-          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+          <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
-	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+	<a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">Connelly</td>
@@ -239,9 +239,9 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">n/a</td>
 
   <td valign="top" align="left">
-          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+          <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left">
-	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+	<a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">smeghead</td>
@@ -251,8 +251,8 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">apps/</td>
   <td valign="top" align="left">...</td>
   <td valign="top" align="left">
-      probably
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a>
+      Probably
+	  <a href="https://en.wikipedia.org/wiki/Public_domain">Public domain</a>
       but check the source</td>
   <td valign="top" align="left">&nbsp;</td>
   <td valign="top" align="left">&nbsp;</td>
@@ -263,7 +263,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
 
   <td valign="top" align="left">install.jar, guiinstall.jar</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+	  <a href="https//en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
   <td valign="top" align="left"><a href="#java_exception">GPL + exception</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />