===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- www/Attic/orders.html	1999/12/03 19:01:16	1.162
+++ www/Attic/orders.html	1999/12/08 04:12:24	1.163
@@ -15,90 +15,139 @@
 <p>
 <h2><font color="#e00000">Ordering</font><hr></h2>
 
-The following products are available from our stores.  For more information,
-simply click on each link.  To place an order, please see further below.
+<ul>
+<li>
+OpenBSD runs its own
+<a href=https://https.openbsd.org/cgi-bin/order>secure web ordering form</a>
+(or an <a href=http://https.openbsd.org:80/cgi-bin/order>insecure form</a>).<br>
+Or preview what our <a href=#cshop>own sales site</a> offers before ordering..<br>
+<a href=#order>Or simply click on the images below...</a>
+<p>
+
+<li>
+For ordering from bookstores or resellers in your area that sell OpenBSD CDROMs:
 <br>
 <table>
 <tr>
-    <td align="center" colspan="6"><b><a href="items.html">OpenBSD CDROMs:</a></b>
-</td>
+<td><a href=#argentina>Argentina</a><br>
+    <a href=#australia>Australia</a><br></td>
+<td><a href=#belgium>Belgium</a><br>
+    <a href=#netherlands>Netherlands</a><br></td>
+<td><a href=#luxembourg>Luxembourg</a><br>
+    <a href=#germany>Germany</a><br></td>
+<td><a href=#sweden>Sweden</a><br>
+    <a href=#finland>Finland</a><br></td>
+<td><a href=#norway>Norway</a><br>
+    <a href=#canada>Canada</a><br></td>
+<td><a href=#france>France</a><br>
+    <a href=#uk>Britain</a><br></td>
+<td><a href=#usa>USA</a><br>
+    <a href=#asia>Asia</a><br></td>
 </tr>
+</table>
+<p>
+
+<li>Bulk order shipments should go to the
+<a href=#cshop>Computer Shop of Calgary</a>.
+We give a 40% discount on 20-or-more CDROMs and a 20% discount on
+10-or-more Tshirts to all orders that go through the shop (and we ask that
+people use the web order form to setup the orders).
+
+</ul>
+<hr>
+
+<a name=order>
+<table>
 <tr>
-    <td align="center"><a href="items.html#26">2.6 CD *NEW*</a></td>
-    <td align="center"><a href="items.html#25">2.5 CD</a></td>
-    <td align="center"><a href="items.html#24">2.4 CD</a></td>
-    <td align="center"><a href="items.html#23">2.3 CD</a></td>
-    <td align="center"><a href="items.html#22">2.2 CD</a></td>
-    <td align="center"><a href="items.html#21">2.1 CD</a></td>
+    <td align="center" colspan="20"><b>OpenBSD CDROMs:</b><p>
+</td>
 </tr>
 <tr>
-    <td><a href="items.html#26"><img height="90" width="90" src="images/cd26-s.gif"></td>
-    <td><a href="items.html#25"><img height="90" width="90" src="images/cd25-s.gif"></td>
-    <td><a href="items.html#24"><img height="90" width="90" src="images/cd24-s.gif"></td>
-    <td><a href="items.html#23"><img height="90" width="90" src="images/cd23-s.gif"></td>
-    <td><a href="items.html#22"><img height="90" width="90" src="images/cd22-s.gif"></td>
-    <td><a href="items.html#21"><img height="90" width="90" src="images/cd21-s.gif"></td>
+    <td align="center">2.6 CD<br>
+	<a href="items.html#26">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd26-s.gif" alt="[Order 2.6 CD]"><br>
+	Order...<p></a></td>
+    <td align="center">2.5 CD<br>
+	<a href="items.html#25">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd25-s.gif" alt="[Order 2.5 CD]"><br>
+	Order...<p></a></td>
+    <td align="center">2.4 CD<br>
+	<a href="items.html#24">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd24-s.gif" alt="[Order 2.4 CD]"><br>
+	Order...<p></a></td>
+    <td align="center">2.3 CD<br>
+	<a href="items.html#23">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd23-s.gif" alt="[Order 2.3 CD]"><br>
+	Order...<p></a></td>
+    <td align="center">2.2 CD<br>
+	<a href="items.html#22">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd22-s.gif" alt="[Order 2.2 CD]"><br>
+	Order...<p></a></td>
+    <td align="center">2.1 CD<br>
+	<a href="items.html#21">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height="90" width="90" src="images/cd21-s.gif" alt="[Order 2.1 CD]"><br>
+	Order...<p></a></td>
 </tr>
 </table>
+<hr>
 <table>
 <tr>
-    <td align="center" colspan="6"><b><a href="tshirts.html">OpenBSD T-shirts:</a></b></td>
+    <td align="center" colspan="6"><b><a href="tshirts.html">OpenBSD T-shirts:</a></b></td><p>
 </tr>
 <tr>
-    <td align="center"><a href="tshirts.html#9">OpenSSH *NEW*</a></td>
-    <td align="center"><a href="tshirts.html#8">2.6 Fishbowl *NEW*</a></td>
-    <td align="center"><a href="tshirts.html#7">Crypto Globe *NEW*</a></td>
-    <td align="center"><a href="tshirts.html#6">2.5</a></td>
-    <td align="center"><a href="tshirts.html#5">OpenBSE</a></td>
-    <td align="center"><a href="tshirts.html#4">Blowfish</a></td>
-    <td align="center"><a href="tshirts.html#2">Wireframe</a></td>
+    <td align="center">OpenSSH<br>
+	<a href="tshirts.html#9">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=101 src=images/tshirt-9b-s.gif
+	alt="[Order OpenSSH shirt]"><br>
+	Order...<p></a></td>
+    <td align="center">2.6 Fishbowl<br>
+	<a href="tshirts.html#8">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=101 src=images/tshirt-8b-s.gif
+	alt="[Order 2.6 Fishbowl shirt]">
+	Order...<p></a></td>
+    <td align="center">Crypto Globe<br>
+	<a href="tshirts.html#7">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=101 src=images/tshirt-7b-s.gif
+	alt="[Order Crypto Globe shirt]">
+	Order...<p></a></td>
+    <td align="center">2.5<br>
+	<a href="tshirts.html#6">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=117 src=images/tshirt-6-s.gif 
+	alt="[Order 2.5 Cop shirt]">
+	Order...<p></a></td>
+    <td align="center">OpenBSE<br>
+	<a href="tshirts.html#5">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=56 src=images/tshirt-5-s.gif
+	alt="[Order OpenBSE shirt]">
+	Order...<p></a></td>
+    <td align="center">Blowfish<br>
+	<a href="tshirts.html#4">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=103 src=images/tshirt-4-s.gif
+	alt="[Order Blowfish shirt]">
+	Order...<p></a></td>
+    <td align="center">Wireframe<br>
+	<a href="tshirts.html#2">(More info)</a><br>
+	<a href="https://https.openbsd.org/cgi-bin/order">
+	<img height=90 width=84 src=images/tshirt-2-s.gif
+	alt="[Order Wireframe shirt]">
+	Order...<p></a></td>
 </tr>
-<tr>
-    <td><a href="tshirts.html#9"><img height=90 width=101 src=images/tshirt-9b-s.gif></a></td>
-    <td><a href="tshirts.html#8"><img height=90 width=101 src=images/tshirt-8b-s.gif></a></td>
-    <td><a href="tshirts.html#7"><img height=90 width=101 src=images/tshirt-7b-s.gif></a></td>
-    <td><a href="tshirts.html#6"><img height=90 width=117 src=images/tshirt-6-s.gif></a></td>
-    <td><a href="tshirts.html#5"><img height=90 width=56 src=images/tshirt-5-s.gif></a></td>
-    <td><a href="tshirts.html#4"><img height=90 width=103 src=images/tshirt-4-s.gif></a></td>
-    <td><a href="tshirts.html#2"><img height=90 width=84 src=images/tshirt-2-s.gif></a></td>
-</tr>
 </table>
 <br>
 
 <hr>
-<a name=order>
-<br>
-<h3><font color=#0000e0>Ordering OpenBSD products</font></h3>
-
-<strong>OpenBSD runs its own
-<a href=https://https.openbsd.org/cgi-bin/order>secure web ordering form</a>
-(or an <a href=http://https.openbsd.org:80/cgi-bin/order>insecure form</a>).
-<a href=#cshop>Or preview what our sales site offers before ordering..</a>
-</strong><p>
-
-Alternatively, for sales in your city or country, you can check
-further down this page for lists of specific sales locations (some of
-which have web ordering sites).  For specific countries, click on the
-following list:
-<p>
-
-<a href=#argentina>Argentina</a>,
-<a href=#australia>Australia</a>,
-<a href=#belgium>Belgium</a>,
-<a href=#netherlands>Netherlands</a>,
-<a href=#luxembourg>Luxembourg</a>,
-<a href=#germany>German</a>,
-<a href=#sweden>Sweden</a>,
-<a href=#finland>Finland</a>,
-<a href=#norway>Norway</a>,
-<a href=#canada>Canada</a>,
-<a href=#france>France</a>,
-<a href=#uk>Britain</a>,
-<a href=#usa>USA</a>.
-<a href=#asia>Asia</a>.
-<p>
-
-<hr>
 <dl>
 <a name=cshop></a>
 <h3><li><font color=#e00000>Canada/International</font><br></h3>
@@ -396,7 +445,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.162 1999/12/03 19:01:16 ian Exp $</small>
+<br><small>$OpenBSD: orders.html,v 1.163 1999/12/08 04:12:24 deraadt Exp $</small>
 
 </body>
 </html>