===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.223
retrieving revision 1.224
diff -c -r1.223 -r1.224
*** www/Attic/orders.html	2000/11/20 21:54:51	1.223
--- www/Attic/orders.html	2000/11/21 23:57:19	1.224
***************
*** 302,307 ****
--- 302,308 ----
  </table>
  
  <hr>
+ 
  <dl>
  <a name=cshop></a>
  
***************
*** 431,436 ****
--- 432,438 ----
  most tshirts and have a supply of CDs, also for bulk ordering.
  <p>
  Ways to order:<p>
+ 
  <dl>
  <a name=kd85.comweborder>
  <li><strong><font color=#e00000>WWW credit card ordering:</font></strong><br>
***************
*** 786,821 ****
  <a name=usa></a>
  <h3><li><font color=#e00000>USA purchasing:</font></h3><p>
  
! The standard OpenBSD web ordering system ships from Canada or the USA
! (depending on destination, and sometimes on stock levels at the depots). 
! <br>Both <a href=https://https.openbsd.org/cgi-bin/order><strong>SSL</strong> 
! secure credit card ordering system for</a> and 
! <br><a href=http://https.openbsd.org:80/cgi-bin/order><strong>non-SSL</strong>
! credit card ordering systems</a> are available. <p>
! 
! 
! <a href=http://www.bigmall.com/openbsd.html>Universal CD-ROM
! (With a <strong>non-SSL</strong> web ordering form!)</a><br>
! 520 Lawrence Expwy. #307<br>
! Sunnyvale, CA 94086<br>
! Tel: 408-992-0453<br>
! Fax: 408-992-0457<br>
! Email: <a href=mailto:ucr@bigmall.com>ucr@bigmall.com</a><br>
! <p>
! 
! You can order OpenBSD online from
! <a href="http://www.softpro.com">Softpro Books</a> or pick it
! up in their stores in Burlington (MA), Marlborough (MA), or Denver (CO).
! 
  Orders received by 4 p.m. ship the same day.
  <ul>
  <li><a href="http://www.softpro.com/0-9683637-5-X.html">2.7 CDROM</a>.
! </ul>
! <a href="http://www.softpro.com/info.html">Click here</a> for more
! information
! <p>
! <p>
  
  
  Cheapbytes
  <a href=http://cart.cheapbytes.com/cgi-bin/cart/0340010001>
--- 788,808 ----
  <a name=usa></a>
  <h3><li><font color=#e00000>USA purchasing:</font></h3><p>
  
! Aside from the "OpenBSD direct" method of ordering (see top of page), 
! the following online stores offer OpenBSD, and ship to anywhere in the 
! USA:<p>
!  
! <a href="http://www.softpro.com">Softpro Books</a> 
! (See also walk in locations below)
  Orders received by 4 p.m. ship the same day.
  <ul>
  <li><a href="http://www.softpro.com/0-9683637-5-X.html">2.7 CDROM</a>.
! </ul><p>
  
+ You can also order the following items from the <a href="http://mall.daemonnews.org/">DaemonNews Mall</a>:
+ <ul>
+ <li><a href="https://mall.daemonnews.org/shopcart/shop/cat.mhtml?category=946586552">2.6 CDROM</a>.
+ </ul><p>
  
  Cheapbytes
  <a href=http://cart.cheapbytes.com/cgi-bin/cart/0340010001>
***************
*** 827,859 ****
  -- (with both SSL and non-SSL web order forms).</a>
  <p>
  
- In San Antonio, Texas contact <a href=mailto:willmann@idworld.net>Robert Willmann, Jr.</a><br>
- <p>
- 
- In Boulder, Colorado contact <a href=mailto:millert@openbsd.org>Todd Miller.</a><br>
- <p>
- You can also order the following items from the <a href="http://mall.daemonnews.org/">DaemonNews Mall</a>:
- <ul>
- <li><a href="https://mall.daemonnews.org/shopcart/shop/cat.mhtml?category=946586552">2.6 CDROM</a>.
- </ul>
- <p>
- 
  You can also order the following items from fatbrain.com 
  (orders received by 4 p.m. ship the same day)
  <ul>
  <li><a href="http://www1.fatbrain.com/asp/bookinfo/bookinfo.asp?theisbn=0968363733">2.5 CDROM</a>.
! </ul>
! <p>
  You can also order from AMAZON.COM (though delivery is slow):
  <ul>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363717/openbsdA>2.3 CDROM</a>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363725/openbsdA>2.4 CDROM</a>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363733>2.5 CDROM</a>
  </ul>
  <p>
  
  
  
  </dl>
  
  
--- 814,869 ----
  -- (with both SSL and non-SSL web order forms).</a>
  <p>
  
  You can also order the following items from fatbrain.com 
  (orders received by 4 p.m. ship the same day)
  <ul>
  <li><a href="http://www1.fatbrain.com/asp/bookinfo/bookinfo.asp?theisbn=0968363733">2.5 CDROM</a>.
! </ul><p>
! 
  You can also order from AMAZON.COM (though delivery is slow):
  <ul>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363717/openbsdA>2.3 CDROM</a>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363725/openbsdA>2.4 CDROM</a>
  <li><a href=http://www.amazon.com/exec/obidos/ISBN=0968363733>2.5 CDROM</a>
+ </ul><p>
+ 
+ The following locations may sell mail or web order, but also welcome 
+ walk in customers, (or can be contacted for pickup):<p>
+ 
+ California:
+ <ul>
+ <li>San Jose: Computer Literacy, 2590 N First Street 408 730-9112
+ <li>Sunnyvale: Computer Literacy, 520 Lawrence Expressway  
  </ul>
  <p>
  
+ Colorado:
+ <ul>
+ <li>
+ <a href="http://www.softpro.com/info.html">
+ Denver - SoftPro Books info page</a>
+ <li>In Boulder, contact <a href=mailto:millert@openbsd.org>Todd Miller.</a><br>
+ </ul>
+ <p>
  
+ Massachusetts:
+ <ul>
+ <li>
+ <a href="http://www.softpro.com/info.html">
+ Burlington - SoftPro Books info page</a>
+ <li>
+ <a href="http://www.softpro.com/info.html">
+ Marlborough - SoftPro Books info page</a>
+ </ul>
+ <p>
+ Texas: In San Antonio, contact <a href=mailto:willmann@idworld.net>Robert Willmann, Jr.</a><br>
+ <p>
  
+ <p>
+ <p>
+ 
+ 
+ 
  </dl>
  
  
***************
*** 872,878 ****
  <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.223 2000/11/20 21:54:51 austin Exp $</small>
  
  </body>
  </html>
--- 882,888 ----
  <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.224 2000/11/21 23:57:19 austin Exp $</small>
  
  </body>
  </html>