===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.517
retrieving revision 1.518
diff -c -r1.517 -r1.518
*** www/Attic/orders.html	2010/08/20 12:25:58	1.517
--- www/Attic/orders.html	2010/09/08 19:46:13	1.518
***************
*** 18,29 ****
  
  <table>
   <tr>
!   <!-- 4.7 release -->
    <td align=center width=150>
!    OpenBSD 4.7<br>
!    May 19, 2010<br>
     <a href="https://https.openbsd.org/cgi-bin/order">
!    <img height="127" width="90" src="images/cd47-s.gif"></a>
    </td>
    <td>
      Every six months (around May 1 and Nov 1) OpenBSD makes an official software release.
--- 18,29 ----
  
  <table>
   <tr>
!   <!-- 4.8 release -->
    <td align=center width=150>
!    OpenBSD 4.8<br>
!    Nov 1, 2010<br>
     <a href="https://https.openbsd.org/cgi-bin/order">
!    <img height="127" width="90" src="images/cd48-s.gif"></a>
    </td>
    <td>
      Every six months (around May 1 and Nov 1) OpenBSD makes an official software release.
***************
*** 62,129 ****
  <table>
   <tr>
  
!   <!-- 4.7 -->
    <td align=center>
!    OpenBSD 4.7<br>
!    Released on<br>
!    May 19, 2010
     <br>
     <br>
     Release CD<br>
!    <a href="47.html">
!    <img height="127" width="90" src="images/cd47-s.gif"></a>
     <br>
     <br>
  
     Poster<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#33">
-    <img height=111 width=100 src="images/tshirt-33-s.gif"></a><br>
-    <br>
- 
     Puffy Mug<br>
     <a href="mug.html">
     <img border=0 height=90 width=100 src="images/PuffyMug-s.gif"></a><br>
     <br>
  
    </td>
  
    <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
  
    <!-- past release -->
    <td align=center>
!    OpenBSD 4.6<br>
     Released on<br>
!    Nov 1, 2009
     <br>
     <br>
     Release CD<br>
!    <a href="46.html">
!    <img height="127" width="90" src="images/cd46-s.gif"></a>
     <br>
     <br>
  
     Poster<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#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 -->
--- 62,119 ----
  <table>
   <tr>
  
!   <!-- 4.8 -->
    <td align=center>
!    OpenBSD 4.8<br>
!    Pre-order for<br>
!    Nov 1, 2010
     <br>
     <br>
     Release CD<br>
!    <a href="48.html">
!    <img height="127" width="90" src="images/cd48-s.gif"></a>
     <br>
     <br>
  
     Poster<br>
!    <a href="images/poster24.jpg">
!    <img height="116" width="77" src="images/poster24-s.gif"></a><br>
     <br>
  
     Puffy Mug<br>
     <a href="mug.html">
     <img border=0 height=90 width=100 src="images/PuffyMug-s.gif"></a><br>
     <br>
  
+    <br>
+ 
    </td>
  
    <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
  
    <!-- past release -->
    <td align=center>
!    OpenBSD 4.7<br>
     Released on<br>
!    May 19, 2010
     <br>
     <br>
     Release CD<br>
!    <a href="47.html">
!    <img height="127" width="90" src="images/cd47-s.gif"></a>
     <br>
     <br>
  
     Poster<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#33">
!    <img height=111 width=100 src="images/tshirt-33-s.gif"></a><br>
     <br>
  
    </td>
  
    <!-- store listing -->
***************
*** 1076,1082 ****
  <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.517 2010/08/20 12:25:58 austin Exp $</small>
  
  </body>
  </html>
--- 1066,1072 ----
  <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.518 2010/09/08 19:46:13 deraadt Exp $</small>
  
  </body>
  </html>