===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/lyrics.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- www/lyrics.html	2014/09/23 18:29:35	1.149
+++ www/lyrics.html	2014/09/30 16:29:47	1.150
@@ -66,18 +66,18 @@
 <a href="#30">3.0: "E-Railed (OpenBSD Mix)"</a><br>
 </td></tr></table>
 <br>
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=1&amp;CDA1%2b=Add">
+<a href="https://openbsdstore.com">
 <img align="left" height=158 width=158 hspace="5" vspace="0" src="images/cdaudio-m.gif">
 </a>
-<a href="https://https.openbsd.org/cgi-bin/order?CDA2=1&amp;CDA2%2b=Add">
+<a href="https://openbsdstore.com">
 <img align="left" height=158 width=158 hspace="5" vspace="0" src="images/cdaudio2-m.gif">
 </a>
 Two audio CDs are also available which contain approximately 5 years of songs each.
 <p>
 Click to order
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=1&amp;CDA1%2b=Add">"The Songs 3.0 - 4.0"</a>
+<a href="https://openbsdstore.com">"The Songs 3.0 - 4.0"</a>
 and 
-<a href="https://https.openbsd.org/cgi-bin/order?CDA2=1&amp;CDA2%2b=Add">"The Songs 4.1 - 5.1"</a>.
+<a href="https://openbsdstore.com">"The Songs 4.1 - 5.1"</a>.
 <p>
 Both CDs contain extra tracks by the artist Ty Semaka
 (who really has "had Puffy on his mind").
@@ -93,7 +93,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="56.html">OpenBSD 5.6</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -145,7 +144,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="55.html">OpenBSD 5.5</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -229,7 +227,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="54.html">OpenBSD 5.4</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -327,7 +324,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="53.html">OpenBSD 5.3</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -377,7 +373,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="52.html">OpenBSD 5.2</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -461,7 +456,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="51.html">OpenBSD 5.1</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -539,9 +533,8 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 This is an extra on
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=2&amp;CDA2%2b=Add">
+<a href="https://openbsdstore.com">
 "The Songs 4.1 - 5.1"</a> Audio CD.
 <br>
 <br>
@@ -565,8 +558,8 @@
 on <a href="http://www.openbsd.org/images/hackathons/c2k2.gif">
 hackathon tshirts</a> too; they were very popular with the guys.
 <p>
-<a href="https://https.openbsd.org/cgi-bin/order?CDA2=1&amp;CDA2%2b=Add">
-Order this CDROM from our International site.</a>
+<a href="https://openbsdstore.com">
+Order this CDROM from the OpenBSD Store.</a>
 <p>
 The 2nd OpenBSD Audio CD "The Songs 4.1 - 5.1" celebrates the
 artwork and songs that have been released with each OpenBSD release.
@@ -625,9 +618,8 @@
 <a name=audio_extra51b></a>
 <h2><font color="#00b000">
 "Sonate aux insomniaques"</font></h2>
-<a href="orders.html">[Order OpenBSD items]</a><br>
 This is an extra on
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=2&amp;CDA2%2b=Add">
+<a href="https://openbsdstore.com">
 "The Songs 4.1 - 5.1"</a> Audio CD.
 <br>
 <br>
@@ -640,8 +632,8 @@
 same title and was entirely recorded and mixed using OpenBSD.
 
 <p>
-<a href="https://https.openbsd.org/cgi-bin/order?CDA2=1&amp;CDA2%2b=Add">
-Order this CDROM from our International site.</a>
+<a href="https://openbsdstore.com">
+Order this CDROM from the OpenBSD Store.</a>
 </em>
 <br>
 <p>
@@ -653,7 +645,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="50.html">OpenBSD 5.0</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -760,7 +751,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="49.html">OpenBSD 4.9</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -870,7 +860,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="48.html">OpenBSD 4.8</a> CD2 track 2 is<br>
 an uncompressed copy of<br>
 this song.<br>
@@ -910,7 +899,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="47.html">OpenBSD 4.7</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -997,7 +985,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="46.html">OpenBSD 4.6</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1094,7 +1081,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="45.html">OpenBSD 4.5</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1202,7 +1188,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="44.html">OpenBSD 4.4</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1371,7 +1356,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="43.html">OpenBSD 4.3</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1529,7 +1513,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="42.html">OpenBSD 4.2</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1683,7 +1666,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="41.html">OpenBSD 4.1</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -1821,9 +1803,8 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 This is the extra song on the
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=1&amp;CDA1%2b=Add">
+<a href="https://openbsdstore.com">
 "The Songs 3.0 - 4.0"</a> Audio CD.
 <br>
 <br>
@@ -1842,8 +1823,8 @@
 Ty and Theo really do go to a (very specific) bar and discuss what is
 going on in the project, and then try to find a theme that will work...
 <p>
-<a href="https://https.openbsd.org/cgi-bin/order?CDA1=1&amp;CDA1%2b=Add">
-Order this CDROM from our International site.</a>
+<a href="https://openbsdstore.com">
+Order this CDROM from the OpenBSD Store.</a>
 <p>
 The 1st OpenBSD Audio CD "The Songs 3.0 - 4.0" celebrates the artwork
 and songs that have been released with each OpenBSD release.  All the
@@ -1937,7 +1918,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="40.html">OpenBSD 4.0</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -2078,7 +2058,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="39.html">OpenBSD 3.9</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -2259,7 +2238,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="38.html">OpenBSD 3.8</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -2440,7 +2418,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="37.html">OpenBSD 3.7</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -2601,7 +2578,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="28%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="36.html">OpenBSD 3.6</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -2766,7 +2742,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="28%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="35.html">OpenBSD 3.5</a> CD2 track 2 is an<br>
 uncompressed copy of this skit &amp; song.<br>
 <br>
@@ -3162,7 +3137,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="28%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="34.html">OpenBSD 3.4</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -3352,7 +3326,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="33.html">OpenBSD 3.3</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -3445,7 +3418,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="32.html">OpenBSD 3.2</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -3515,7 +3487,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="100%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="31.html">OpenBSD 3.1</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>
@@ -3578,7 +3549,6 @@
 <table border=0 cellspacing=0 cellpadding=2 width="95%">
 <tr>
 <td valign="top" width="30%">
-<a href="orders.html">[Order OpenBSD items]</a><br>
 <a href="30.html">OpenBSD 3.0</a> CD2 track 2 is an<br>
 uncompressed copy of this song.<br>
 <br>