===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- www/Attic/orders.html	2010/02/20 14:28:13	1.507
+++ www/Attic/orders.html	2010/03/13 23:31:04	1.508
@@ -18,15 +18,15 @@
 
 <table>
  <tr>
-  <!-- 4.5 release -->
+  <!-- 4.7 release -->
   <td align=center width=150>
-   OpenBSD 4.6<br>
-   Nov 1, 2009<br>
+   OpenBSD 4.7<br>
+   May 19, 2010<br>
    <a href="https://https.openbsd.org/cgi-bin/order">
-   <img height="127" width="90" src="images/cd46-s.gif"></a>
+   <img height="127" width="90" src="images/cd47-s.gif"></a>
   </td>
   <td>
-    Every six months (May 1 and Nov 1) OpenBSD makes an official software release.
+    Every six months (arond May 1 and Nov 1) OpenBSD makes an official software release.
     To accompany this free software release on the FTP servers, we make
     <a href="lyrics.html">artwork and a song</a>
     which are distributed along with the software on a set of CDs.  The proceeds
@@ -62,27 +62,27 @@
 <table>
  <tr>
 
-  <!-- 4.6 release -->
+  <!-- 4.7 pre-orders -->
   <td align=center>
-   OpenBSD 4.6<br>
-   Released<br>
-   Nov 1, 2009
+   OpenBSD 4.7<br>
+   PRE-ORDERS FOR<br>
+   May 19, 2010
    <br>
    <br>
    Release CD<br>
-   <a href="46.html">
-   <img height="127" width="90" src="images/cd46-s.gif"></a>
+   <a href="47.html">
+   <img height="127" width="90" src="images/cd47-s.gif"></a>
    <br>
    <br>
 
    Poster<br>
-   <a href="images/poster22.jpg">
-   <img height="116" width="77" src="images/poster22-s.gif"></a><br>
+   <a href="images/poster23.jpg">
+   <img height="116" width="77" src="images/poster23-s.gif"></a><br>
    <br>
 
    T-Shirt<br>
-   <a href="tshirts.html#32">
-   <img height=111 width=100 src="images/tshirt-32-s.gif"></a><br>
+   <a href="tshirts.html#33">
+   <img height=111 width=100 src="images/tshirt-33-s.gif"></a><br>
    <br>
 
    Puffy Mug<br>
@@ -92,39 +92,40 @@
 
   </td>
 
-<!-- 4.5 release
-
   <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
 
+  <!-- current release -->
   <td align=center>
-   <font color="#e000000">
-   PRE-ORDERS<br>
-   FOR MAY 1</font><br>
+   OpenBSD 4.6<br>
+   Released on<br>
+   Nov 1, 2009
    <br>
-   OpenBSD 4.5<br>
-   Release Date:<br>
-   May 1, 2009
    <br>
-   <br>
    Release CD<br>
-   <a href="45.html">
-   <img height="127" width="90" src="images/cd45-s.gif"></a>
+   <a href="46.html">
+   <img height="127" width="90" src="images/cd46-s.gif"></a>
    <br>
    <br>
 
    Poster<br>
-   <a href="images/poster21.jpg">
-   <img height="116" width="77" src="images/poster21-s.gif"></a><br>
+   <a href="images/poster22.jpg">
+   <img height="116" width="77" src="images/poster22-s.gif"></a><br>
    <br>
 
    T-Shirt<br>
-   <a href="tshirts.html#31">
-   <img height=111 width=100 src="images/tshirt-31-s.gif"></a><br>
+   <a href="tshirts.html#32">
+   <img height=111 width=100 src="images/tshirt-32-s.gif"></a><br>
    <br>
+
+   <br>
+   <br>
+   <br>
+   <br>
+   <br>
+   <br>
+   <br>
   </td>
 
--->
-
   <!-- store listing -->
 
   <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
@@ -318,6 +319,10 @@
 CDs and T-shirts, such as these<br>
 and many more...<br>
 </td><td>
+<a href="46.html">
+<img height="127" width="90" src="images/cd46-s.gif"></a>
+<a href="45.html">
+<img height="127" width="90" src="images/cd45-s.gif"></a>
 <a href="44.html">
 <img height="127" width="90" src="images/cd44-s.gif"></a>
 <a href="43.html">
@@ -325,12 +330,8 @@
 <a href="42.html">
 <img height="127" width="90" src="images/cd42-s.gif"></a>
 <a href="41.html">
-<img height="127" width="90" src="images/cd41-s.gif"></a>
-<a href="40.html">
 <img height="127" width="90" src="images/cd40-s.gif"></a>
-<a href="39.html">
-<img height="127" width="90" src="images/cd39-s.gif"></a>
-<a href="38.html">
+<a href="40.html">
 &nbsp;... etc.
 </tr>
 </table>
@@ -1062,7 +1063,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src="back.gif" border=0 alt="OpenBSD"></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: orders.html,v 1.507 2010/02/20 14:28:13 tobias Exp $</small>
+<br><small>$OpenBSD: orders.html,v 1.508 2010/03/13 23:31:04 deraadt Exp $</small>
 
 </body>
 </html>