===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** www/Attic/orders.html	1998/04/27 11:16:08	1.59
--- www/Attic/orders.html	1998/04/27 11:21:12	1.60
***************
*** 132,138 ****
  For <a href=#usa>USA sales...</a><br>
  <hr>
  
! <ul>
  <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
--- 132,138 ----
  For <a href=#usa>USA sales...</a><br>
  <hr>
  
! <dl>
  <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
***************
*** 141,153 ****
  <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
  during weekdays, during the daytime, in North American Mountain Time.
  (Partial service is available after hours: 5PM-9PM weeknights and
--- 141,154 ----
  <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>
! <dl>
! <li><font color=#e00000>WWW credit card ordering:</font><br>
  First, we have a <a href=https://https.openbsd.org/order.html> SSL secure
! credit card ordering system</a>.<br>
! A <a href=http://https.openbsd.org:80/order.html> non-SSL credit card
! ordering form</a> also exists.
! <p>
! <li><font color=#e00000>Telephone ordering:</font><br>
  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
***************
*** 157,164 ****
  Major Institutions can fax purchase orders to the Computer Shop
  at <strong>(403) 243-2684 (FAX)</strong>.
  <p>
! 
! <h3><li>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>
--- 158,164 ----
  Major Institutions can fax purchase orders to the Computer Shop
  at <strong>(403) 243-2684 (FAX)</strong>.
  <p>
! <li><font color=#e00000>Mail order:</font><br>
  Additionally, you can also mail USD or Canadian cheques (in which case
  CDN $40, shipping $4 is sufficient) to:<p>
  The Computer Shop<br>
***************
*** 166,172 ****
  3515 18th St, SW<br>
  Calgary, Alberta, Canada<br>
  T2T 4T9<br>
! </ul>
  <p>
  
  <p>
--- 166,172 ----
  3515 18th St, SW<br>
  Calgary, Alberta, Canada<br>
  T2T 4T9<br>
! </dl>
  <p>
  
  <p>
***************
*** 195,200 ****
--- 195,201 ----
  (Wow, Fedex is expensive!)
  <p>
  
+ <hr>
  <a name=argentina>
  <h3><li><font color=#e00000>Argentina purchasing:</font></h3><p>
  
***************
*** 206,211 ****
--- 207,213 ----
  Phone: +54-1-821-1030<br>
  <p>
  
+ <hr>
  <a name=australia>
  <h3><li><font color=#e00000>Australian purchasing:</font></h3><p>
  
***************
*** 220,226 ****
  Fx:  +61-2-9417-6419<br>
  <p>
  
! 
  <a name=sweden>
  <h3><li><font color=#e00000>Swedish purchasing:</font></h3><p>
  
--- 222,228 ----
  Fx:  +61-2-9417-6419<br>
  <p>
  
! <hr>
  <a name=sweden>
  <h3><li><font color=#e00000>Swedish purchasing:</font></h3><p>
  
***************
*** 228,241 ****
  In Stockholm contact <a href=mailto:art@openbsd.org>Artur Grabowski</a><br>
  <p>
  
  <a name=canada>
  <h3><li><font color=#e00000>Canadian purchasing:</font></h3><p>
  
  In Calgary, Alberta contact <a href=mailto:deraadt@openbsd.org>Theo de Raadt</a><br>
  In Edmonton, Alberta contact <a href=mailto:beck@openbsd.org>Bob Beck</a><br>
! In Brandon, Manitoba contact <a href=mailto:weingart@openbsd.org>Tobias Weingartner</a><br>
  <p>
  
  <a name=usa>
  <h3><li><font color=#e00000>USA purchasing:</font></h3><p>
  
--- 230,245 ----
  In Stockholm contact <a href=mailto:art@openbsd.org>Artur Grabowski</a><br>
  <p>
  
+ <hr>
  <a name=canada>
  <h3><li><font color=#e00000>Canadian purchasing:</font></h3><p>
  
  In Calgary, Alberta contact <a href=mailto:deraadt@openbsd.org>Theo de Raadt</a><br>
  In Edmonton, Alberta contact <a href=mailto:beck@openbsd.org>Bob Beck</a><br>
! For all other locations, please contact the <a href=#cshop>Computer Shop</a><br>
  <p>
  
+ <hr>
  <a name=usa>
  <h3><li><font color=#e00000>USA purchasing:</font></h3><p>
  
***************
*** 243,254 ****
  In New York, New York contact <a href=mailto:joey@cpio.org>Ejovi Nuwere</a><br>
  In Mountain View, California contact <a href=mailto:jkatz@darpanet.net>Jonathan Katz</a><br>
  In Boulder, Colorado contact <a href=mailto:millert@courtesan.com>Todd Miller</a><br>
! </ul>
  
  <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>
--- 247,258 ----
  In New York, New York contact <a href=mailto:joey@cpio.org>Ejovi Nuwere</a><br>
  In Mountain View, California contact <a href=mailto:jkatz@darpanet.net>Jonathan Katz</a><br>
  In Boulder, Colorado contact <a href=mailto:millert@courtesan.com>Todd Miller</a><br>
! </dl>
  
  <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.60 1998/04/27 11:21:12 deraadt Exp $</small>
  
  </body>
  </html>