===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- www/Attic/orders.html	1997/11/18 08:07:47	1.30
+++ www/Attic/orders.html	1997/11/19 22:15:02	1.31
@@ -80,31 +80,7 @@
 oldest continuously operating computer store in the world).
 There are a few differents ways to make an order from this store:
 
-<h3>WWW credit card ordering:</h3>
-First, we have a
-<a href=https://https.openbsd.org/order.html>
-secure credit card ordering system</a>.
-
-<h3>Telephone ordering:</h3>
-To order by phone, dial <strong>(403) 605-8166</strong>.  Please phone
-during weekdays, during the daytime, in North American Mountain Time.
-(Partial service is available after hours: 5PM-9PM weeknights and
-10AM-9PM weekends.)
-Have your Mastercard, VISA, or American Express ready.
 <p>
-Major Institutions can fax purchase orders to the Computer Shop
-at <strong>(403) 243-2684 (FAX)</strong>.
-
-<h3>Mail order:</h3>
-Additionally, you can also mail USD or Canadian cheques (in which case
-CDN $40, shipping $4 is sufficient) to:<p>
-The Computer Shop<br>
-ATTN: OpenBSD CD Orders<br>
-3515 18th St, SW<br>
-Calgary, Alberta, Canada<br>
-T2T 4T9<br>
-
-<p>
 Postage will vary depending on your location relative to the shipping
 address.  Regular post will be used unless special arrangements are
 made.  Shipping cost is therefore expected to be around $3 - $8 USD
@@ -127,9 +103,33 @@
 <li>USA $18 USD ($24.50 CDN)
 <li>World $36 USD ($49.50 CDN)
 </ul>
-Wow, Fedex is expensive!
+(Wow, Fedex is expensive!)
 <p>
 
+<h3>WWW credit card ordering:</h3>
+First, we have a
+<a href=https://https.openbsd.org/order.html>
+secure credit card ordering system</a>.
+
+<h3>Telephone ordering:</h3>
+To order by phone, dial <strong>(403) 605-8166</strong>.  Please phone
+during weekdays, during the daytime, in North American Mountain Time.
+(Partial service is available after hours: 5PM-9PM weeknights and
+10AM-9PM weekends.)
+Have your Mastercard, VISA, or American Express ready.
+<p>
+Major Institutions can fax purchase orders to the Computer Shop
+at <strong>(403) 243-2684 (FAX)</strong>.
+
+<h3>Mail order:</h3>
+Additionally, you can also mail USD or Canadian cheques (in which case
+CDN $40, shipping $4 is sufficient) to:<p>
+The Computer Shop<br>
+ATTN: OpenBSD CD Orders<br>
+3515 18th St, SW<br>
+Calgary, Alberta, Canada<br>
+T2T 4T9<br>
+
 <li>
 <h3>German purchasing:</h3>
 CD's are also available in Germany directly from:<p>
@@ -146,7 +146,7 @@
 <hr>
 <a href=index.html><img 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.30 1997/11/18 08:07:47 deraadt Exp $</small>
+<br><small>$OpenBSD: orders.html,v 1.31 1997/11/19 22:15:02 deraadt Exp $</small>
 
 </body>
 </html>