===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** www/Attic/orders.html	1997/12/11 09:32:32	1.42
--- www/Attic/orders.html	1997/12/11 23:44:17	1.43
***************
*** 72,79 ****
  <p>
  
  <ul>
! <li>
! <h3><font color=#e00000>The Computer Shop of Calgary:</font></h3>
  The main place for ordering CDROMs is the Computer Shop of Calgary (the
  oldest continuously operating computer store in the world).
  
--- 72,78 ----
  <p>
  
  <ul>
! <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).
  
***************
*** 106,122 ****
  <h3>There are a few different ways to make an order from
  the Computer Shop:</h3>
  <ul>
! <li><h3>WWW credit card ordering:</h3>
  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><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
--- 105,120 ----
  <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
  during weekdays, during the daytime, in North American Mountain Time.
  (Partial service is available after hours: 5PM-9PM weeknights and
***************
*** 127,133 ****
  at <strong>(403) 243-2684 (FAX)</strong>.
  <p>
  
! <li><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>
--- 125,131 ----
  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>
***************
*** 138,174 ****
  </ul>
  <p>
  
! <li>
! <h3><font color=#e00000>German purchasing:</font></h3>
! CD's are also available in Germany directly from:<p>
  Dieter Mayer<br>
  Open System Solutions Software GmbH<br>
  Stefan-George-Ring 29, 81929 Muenchen<br>
  Germany<br>
! Email: dieter@oss.de<br>
  Phone: +49-89-939451-22<br>
  <p>
  
! <li>
! <h3><font color=#e00000>Argentina purchasing:</font></h3>
  
- CD's are available in Argentina directly from:<p>
- 
  Jonatan Altszul<br>
  <a href="http://www.core-sdi.com">CORE&nbsp;SDI S.A.</a><br>
  Av. Santa Fe 2861 5to. &quot;C&quot;<br>
  (1425) Buenos Aires, Argentina<br>
! Email: jony@secnet.com<br>
  Phone: +54-1-821-1030<br>
  <p>
  
! <li>
! <h3><font color=#e00000>Australian purchasing:</font></h3>
  
! CD's are available in Australia directly from:<p>
! 
! <a href=mailto:carrs@esi.com.au>Steve Carrall - carrs@esi.com.au</a><br>
! <a href=mailto:damianm@esi.com.au>Damian McGuckin - damianm@esi.com.au</a><br>
  Pacific ESI<br>
  13U / 175 Gibbes St<br>
  Chatswood<br>
--- 136,165 ----
  </ul>
  <p>
  
! <h3><li><font color=#e00000>German purchasing:</font></h3><p>
! 
  Dieter Mayer<br>
  Open System Solutions Software GmbH<br>
  Stefan-George-Ring 29, 81929 Muenchen<br>
  Germany<br>
! Email: <a href=mailto:dieter@oss.de>dieter@oss.de</a><br>
  Phone: +49-89-939451-22<br>
  <p>
  
! <h3><li><font color=#e00000>Argentina purchasing:</font></h3><p>
  
  Jonatan Altszul<br>
  <a href="http://www.core-sdi.com">CORE&nbsp;SDI S.A.</a><br>
  Av. Santa Fe 2861 5to. &quot;C&quot;<br>
  (1425) Buenos Aires, Argentina<br>
! Email: <a href=mailto:jony@secnet.com>jony@secnet.com</a><br>
  Phone: +54-1-821-1030<br>
  <p>
  
! <h3><li><font color=#e00000>Australian purchasing:</font></h3><p>
  
! <a href=mailto:carrs@esi.com.au>Steve Carrall - carrs@esi.com.au</a>
! or <a href=mailto:damianm@esi.com.au>Damian McGuckin - damianm@esi.com.au</a><br>
  Pacific ESI<br>
  13U / 175 Gibbes St<br>
  Chatswood<br>
***************
*** 178,215 ****
  Fx:  +61-2-9417-6419<br>
  <p>
  
! <li>
! <h3><font color=#e00000>Swedish purchasing:</font></h3>
  
! CD's are available in Goteborg directly from:
! <a href=mailto:niklas@appli.se>Niklas Hallqvist</a><br>
! CD's are available in Stockholm directly from:
! <a href=mailto:art@openbsd.org>Artur Grabowski</a><br>
  <p>
  
! <li>
! <h3><font color=#e00000>Canadian purchasing:</font></h3>
  
! CD's are available in Calgary, Alberta directly from:
! <a href=mailto:deraadt@openbsd.org>Theo de Raadt</a><br>
! CD's are available in Edmonton, Alberta directly from:
! <a href=mailto:beck@openbsd.org>Bob Beck</a><br>
! CD's are available in Brandon, Manitoba directly from:
! <a href=mailto:weingart@openbsd.org>Tobias Weingartner</a><br>
  <p>
  
! <li>
! <h3><font color=#e00000>USA purchasing:</font></h3>
  
! CD's are available in Chicago, Illinios directly from:
! <a href=mailto:jdm@enteract.com>Jennifer Myers</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.42 1997/12/11 09:32:32 deraadt Exp $</small>
  
  </body>
  </html>
--- 169,197 ----
  Fx:  +61-2-9417-6419<br>
  <p>
  
! <h3><li><font color=#e00000>Swedish purchasing:</font></h3><p>
  
! In Goteborg contact <a href=mailto:niklas@appli.se>Niklas Hallqvist</a><br>
! In Stockholm contact <a href=mailto:art@openbsd.org>Artur Grabowski</a><br>
  <p>
  
! <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>
  
! <h3><li><font color=#e00000>USA purchasing:</font></h3><p>
  
! In Chicago, Illinios contact <a href=mailto:jdm@enteract.com>Jennifer Myers</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.43 1997/12/11 23:44:17 deraadt Exp $</small>
  
  </body>
  </html>