===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.483
retrieving revision 1.484
diff -c -r1.483 -r1.484
*** www/Attic/orders.html	2009/03/31 15:22:43	1.483
--- www/Attic/orders.html	2009/03/31 16:18:37	1.484
***************
*** 16,75 ****
  <h2><font color="#e00000">Ordering OpenBSD products</font></h2>
  <hr>
  
- OpenBSD is produced in Calgary, Alberta, Canada.  We have a close
- relationship with the Computer Shop of Calgary who distributes our
- product to stores around the world, and also sells our product direct
- to customers via post or courier.  We encourage people to consider
- buying our latest products from stores which are closest to you --
- to avoid taxes, duties and delays.
- <p>
- 
- Typically stores around the world will have the current release and
- accept pre-orders for the next release, however their stock of
- <a href="older.html">older releases</a> will vary.
- The OpenBSD project does not keep track of which
- store has which releases.  If you see a store on this list which is
- not stocking either the current or next release, or has other problems,
- please inform <a href=mailto:deraadt@openbsd.org>deraadt@openbsd.org</a>
- so that other customers do not run into the same difficulties.
- <p>
- 
- <center>
  <table>
! <tr><td><b><center><a href="older.html">Ordering older products</a></center></b><br>
! <a href="https://https.openbsd.org/cgi-bin/order">
! The Computer Shop of Calgary</a><br>
! distributes for the project and<br>
! therefore has many of the older<br>
! CDs and T-shirts, such as these<br>
! and many more...<br>
! </td><td>
! <a href="43.html">
! <img height="127" width="90" src="images/cd43-s.gif""></a>
! <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">
! <img height="127" width="90" src="images/cd38-s.gif""></a>
! </td><td valign=center>
! &nbsp;... etc.
! </tr>
  </table>
- </center>
- <p>
  
  <hr>
- <center><h3>Choose a store to order from (by country, alphabetically)</h3></center>
  
  <table>
   <tr>
-   <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
- 
    <!-- 4.4 release --!>
    <td align=center>
     <br>
--- 16,66 ----
  <h2><font color="#e00000">Ordering OpenBSD products</font></h2>
  <hr>
  
  <table>
!  <tr>
!   <!-- 4.4 release --!>
!   <td align=center width=150>
!    OpenBSD 4.5<br>
!    Coming May 1<br>
!    <a href="https://https.openbsd.org/cgi-bin/order">
!    <img height="127" width="90" src="images/cd45-s.gif"></a>
!   </td>
!   <td>
!     Every six months (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
!     from sale of these products is the primary funding of the OpenBSD project.
!     <p>
!     We have a close relationship with our primary distributor
!     <a href="#ca/cshop">the Computer Shop of Calgary</a>
!     who also sells our product worldwide direct to customers via post or courier.
!     <p>
!     Worldwide orders for the new (and <a href="older.html">older</a>)
!     products can me made from
!     <a href="https://https.openbsd.org/cgi-bin/order">
!     the Computer Shop of Calgary order site</a>.
!   </td>
!  </tr>
  </table>
  
  <hr>
  
+ Our products are also available at many stores around the world.
+ Typically, these stores will have the current release
+ and accept pre-orders for the next release, but their stock of
+ <a href="older.html">older releases</a> will vary greatly.
+ The OpenBSD project does not keep track of which store
+ has which releases or items in stock.  If you see a store on this list
+ which is not stocking either the current or next release, or has other
+ problems, please inform <a href=mailto:deraadt@openbsd.org>deraadt@openbsd.org</a>
+ so that other customers won't run into the same difficulties.
+ <p>
+ 
+ <center><b>Choose a store to order from (by country, alphabetically)</b></center>
+ 
  <table>
   <tr>
    <!-- 4.4 release --!>
    <td align=center>
     <br>
***************
*** 133,143 ****
    <td valign=top>
     <table>
      <tr>
-      <td>Worldwide</td>
-      <td><a href="https://https.openbsd.org/cgi-bin/order">
-      Computer Shop of Calgary</a></td>
-      <td><a href=#ca/cshop>More Info</a></td>
-     </tr><tr>
        <td>Victoria, Australia</td>
        <td><a href="http://www.lsl.com.au">Linux Systems Labs Australia</td>
        <td><a href=#au/lsl>More Info</a></td>
--- 124,129 ----
***************
*** 318,323 ****
--- 304,338 ----
  </table>
  <br>
  
+ <center>
+ <table>
+ <tr><td><b><center><a href="older.html">Ordering older products</a></center></b><br>
+ <a href="https://https.openbsd.org/cgi-bin/order">
+ The Computer Shop of Calgary</a><br>
+ distributes for the project and<br>
+ therefore has many of the older<br>
+ CDs and T-shirts, such as these<br>
+ and many more...<br>
+ </td><td>
+ <a href="43.html">
+ <img height="127" width="90" src="images/cd43-s.gif""></a>
+ <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">
+ <img height="127" width="90" src="images/cd38-s.gif""></a>
+ </td><td valign=center>
+ &nbsp;... etc.
+ </tr>
+ </table>
+ </center>
+ <p>
+ 
  <hr>
  
  <ul>
***************
*** 1057,1063 ****
  <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.483 2009/03/31 15:22:43 deraadt Exp $</small>
  
  </body>
  </html>
--- 1072,1078 ----
  <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.484 2009/03/31 16:18:37 deraadt Exp $</small>
  
  </body>
  </html>