===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** www/Attic/orders.html	1998/04/27 11:13:26	1.58
--- www/Attic/orders.html	1998/04/27 11:16:08	1.59
***************
*** 136,181 ****
  <a name=cshop>
  <h3><li><font color=#e00000>The Computer Shop of Calgary:</font><br></h3>
  The main place for ordering CDROMs is the Computer Shop of Calgary (the
! oldest continuously operating computer store in the world).
! Email: <a href=mailto:austin@canuck.com>Austin Hook</a>.
  
! <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
! (yes, that is in addition to the base $30 USD price).  Packages will
! be mailed from Calgary, Alberta, Canada.  Typical postage rates for
! quantity 1 are roughly:
  <ul>
- <li>Canada $3 CDN
- <li>USA $3 USD ($4 CDN)
- <li>World $4 USD ($5 CDN)
- </ul>
- <p>
- If you want your CD to come very quickly, you can choose Fedex.
- If you choose Fedex, you very likely do NOT want to use the credit
- card ordering system, but want to order your package by phoning the
- Computer Shop phone number below.  Typical Fedex rates for quantity
- 1 are roughly:
- <ul>
- <li>Canada $12.50 CDN
- <li>USA $18 USD ($24.50 CDN)
- <li>World $36 USD ($49.50 CDN)
- </ul>
- (Wow, Fedex is expensive!)
- <p>
- 
- <h3>There are a few different ways to make an order from
- the Computer Shop:</h3>
- <ul>
  <h3><li>WWW credit card ordering:</h3>
! First, we have a
! <a href=https://https.openbsd.org/order.html>
! SSL secure credit card ordering system</a>.
! A
! <a href=http://https.openbsd.org:80/order.html>
  non-SSL credit card ordering form</a> also exists.
- <p>
  
  <h3><li>Telephone ordering:</h3>
  To order by phone, dial <strong>(403) 605-8166</strong>.  Please phone
--- 136,151 ----
  <a name=cshop>
  <h3><li><font color=#e00000>The Computer Shop of Calgary:</font><br></h3>
  The main place for ordering CDROMs is the Computer Shop of Calgary (the
! oldest continuously operating computer store in the world).  If you
! need to contact the Computer Shop directly, email to
! <a href=mailto:austin@canuck.com>Austin Hook</a>.
  
! <h3>There are a few different ways to make an order from the Computer Shop:</h3>
  <ul>
  <h3><li>WWW credit card ordering:</h3>
! First, we have a <a href=https://https.openbsd.org/order.html> SSL secure
! credit card ordering system</a>. A <a href=http://https.openbsd.org:80/order.html>
  non-SSL credit card ordering form</a> also exists.
  
  <h3><li>Telephone ordering:</h3>
  To order by phone, dial <strong>(403) 605-8166</strong>.  Please phone
***************
*** 199,204 ****
--- 169,200 ----
  </ul>
  <p>
  
+ <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
+ (yes, that is in addition to the base $30 USD price).  Packages will
+ be mailed from Calgary, Alberta, Canada.  Typical postage rates for
+ quantity 1 are roughly:
+ <ul>
+ <li>Canada $3 CDN
+ <li>USA $3 USD ($4 CDN)
+ <li>World $4 USD ($5 CDN)
+ </ul>
+ <p>
+ If you want your CD to come very quickly, you can choose Fedex.
+ If you choose Fedex, you very likely do NOT want to use the credit
+ card ordering system, but want to order your package by phoning the
+ Computer Shop phone number below.  Typical Fedex rates for quantity
+ 1 are roughly:
+ <ul>
+ <li>Canada $12.50 CDN
+ <li>USA $18 USD ($24.50 CDN)
+ <li>World $36 USD ($49.50 CDN)
+ </ul>
+ (Wow, Fedex is expensive!)
+ <p>
+ 
  <a name=argentina>
  <h3><li><font color=#e00000>Argentina purchasing:</font></h3><p>
  
***************
*** 252,258 ****
  <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.58 1998/04/27 11:13:26 deraadt Exp $</small>
  
  </body>
  </html>
--- 248,254 ----
  <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.59 1998/04/27 11:16:08 deraadt Exp $</small>
  
  </body>
  </html>