===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/orders.html,v
retrieving revision 1.541
retrieving revision 1.542
diff -c -r1.541 -r1.542
*** www/Attic/orders.html	2011/11/14 01:11:42	1.541
--- www/Attic/orders.html	2012/01/22 06:49:01	1.542
***************
*** 124,134 ****
--- 124,141 ----
  
    <td bgcolor="#000000" rowspan="2"><font size="1">&nbsp;</font></td>
    <td valign=top>
+ 
     <table>
  
  <center><b>Choose a store to order from (by country, alphabetically)</b></center>
  <br>
  
+     <tr>
+       <th>Country</th>
+       <th>Click to Order</th>
+       <th>More Info</a></th>
+     </tr>
+     <tr><td>&nbsp;</td></tr>
  <!--   Has 4.8 still, but discontinuing
      <tr>
        <td>Victoria, Australia</td>
***************
*** 151,158 ****
  -->
  
      <tr>
!       <td>Shanghai, China</td>
!       <td><a href="http://www.kdump.cn/store">kdump consulting</a></td>
        <td><a href=#cn/kdump>More Info</a></td>
      </tr>
  
--- 158,171 ----
  -->
  
      <tr>
!       <td>Canada, Alberta, Milk River</td>
!       <td><a href="https://https.openbsd.org/cgi-bin/order">Computer Shop</a></td>
!       <td><a href="#ca">More Info</a></td>
!     </tr>
! 
!     <tr>
!       <td>China, Shanghai</td>
!       <td><a href="http://www.kdump.cn/store">Kdump Consulting</a></td>
        <td><a href=#cn/kdump>More Info</a></td>
      </tr>
  
***************
*** 166,243 ****
  
  <!---  No reply to emails  as of Jan 2011  -- A.Hook
      <tr>
!       <td>Paris, France</td>
        <td><a href="http://www.lmet.fr/">Le Monde En Tique</a></td>
        <td><a href=#fr/lmet>More Info</a></td>
      </tr>
  -->
  
       <tr>
!        <td>Marseille, France</td>
         <td><a href="http://openbsd.otasc.org">Blowfish Unlimited</a></td>
         <td><a href="#fr/blowfish">More info</a></td>
      </tr>
  
      <tr>
        <td>Germany, EU</td>
!       <td><a href="http://www.ixsoft.de/cgi-bin/web_store.cgi?ref=Catalogs/de/openbsd-catalog.html">ixsoft</a></td>
        <td><a href="#de/ixsoft">More Info</a></td>
      </tr>
     
      <tr>
        <td>Germany, Austria, Switzerland</td>
        <td><a href="http://www.lehmanns.de/shop/mathematik-informatik/18862298-9780978447571-openbsd-4-9-cd-rom">
!       Lehmanns Fachbuchhandlung GmbH</td>
       <td><a href=#de/lehmanns>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Wiehl, Germany</td>
!       <td><a href="http://www.oeko.net">oeko.net</a></td>
        <td><a href=#de/oeko>More Info</a></td>
      </tr>
  
  <!-- ITEM NOT FOUND
      <tr>
!       <td>Padova, Italy</td>
        <td><a href="http://www.libreriauniversitaria.it">Libreria Universitaria</a></td>
        <td><a href=#it/libreriauniversitaria>More Info</a></td>
      </tr>
  -->
  
      <tr>
!       <td>Venice area, Italy</td>
        <td><a href="http://www.opencompany.it/index1.php?men=5&amp;pag=orders">Open Company / NS3</a></td>
        <td><a href=#it/opencompany>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Haarlem, Netherlands</td>
        <td><a href="http://www.mensys.nl">Mensys BV</a></td>
        <td><a href=#nl/mensys>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Amsterdam, Netherlands</td>
        <td><a href="http://www.comcol.nl/detail/u_opeb.htm">Computer Collectief</a></td>
        <td><a href=#nl/comcol>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Oslo, Norway</td>
        <td><a href="http://www.inet.no/larry/openbsd.html">Inferno Nettverk A/S</a></td>
        <td><a href=#no/inet>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Stockport, UK / Europe</td>
        <td><a href="http://www.openbsdeurope.com">OpenBSD Europe</a></td>
        <td><a href=#uk/openbsdeurope>More Info</a></td>
      </tr>
  
  <!--  No stock since OpenBSD 4.7  no reply to my email March 2001 -- Austin
      <tr>
!       <td>Hampshire, UK</td>
        <td><a href="http://www.holbornbooks.co.uk">Holborn Books</a></td>
        <td><a href=#uk/holbornbooks>More Info</a></td>
      </tr>
--- 179,262 ----
  
  <!---  No reply to emails  as of Jan 2011  -- A.Hook
      <tr>
!       <td>France, Paris</td>
        <td><a href="http://www.lmet.fr/">Le Monde En Tique</a></td>
        <td><a href=#fr/lmet>More Info</a></td>
      </tr>
  -->
  
       <tr>
!        <td>France, Marseille</td>
         <td><a href="http://openbsd.otasc.org">Blowfish Unlimited</a></td>
         <td><a href="#fr/blowfish">More info</a></td>
      </tr>
  
      <tr>
        <td>Germany, EU</td>
!       <td><a href="http://www.ixsoft.de/cgi-bin/web_store.cgi?ref=Catalogs/de/openbsd-catalog.html">Ixsoft</a></td>
        <td><a href="#de/ixsoft">More Info</a></td>
      </tr>
     
      <tr>
+       <td>Germany, Kiel</td>
+       <td><a href="http://www.getdigital.de/products/OpenBSD_CD-ROM">getDigital</a></td>
+       <td><a href="#de/getdigital">More Info</a></td>
+     </tr>
+    
+     <tr>
        <td>Germany, Austria, Switzerland</td>
        <td><a href="http://www.lehmanns.de/shop/mathematik-informatik/18862298-9780978447571-openbsd-4-9-cd-rom">
!       Lehmanns Fachbuchhandlung</td>
       <td><a href=#de/lehmanns>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Germany, Wiehl</td>
!       <td><a href="http://www.oeko.net">Oeko.net</a></td>
        <td><a href=#de/oeko>More Info</a></td>
      </tr>
  
  <!-- ITEM NOT FOUND
      <tr>
!       <td>Italy, Padova</td>
        <td><a href="http://www.libreriauniversitaria.it">Libreria Universitaria</a></td>
        <td><a href=#it/libreriauniversitaria>More Info</a></td>
      </tr>
  -->
  
      <tr>
!       <td>Italy, Venice area</td>
        <td><a href="http://www.opencompany.it/index1.php?men=5&amp;pag=orders">Open Company / NS3</a></td>
        <td><a href=#it/opencompany>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Netherlands, Haarlem</td>
        <td><a href="http://www.mensys.nl">Mensys BV</a></td>
        <td><a href=#nl/mensys>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Netherlands, Amsterdam</td>
        <td><a href="http://www.comcol.nl/detail/u_opeb.htm">Computer Collectief</a></td>
        <td><a href=#nl/comcol>More Info</a></td>
      </tr>
  
      <tr>
!       <td>Norway, Oslo</td>
        <td><a href="http://www.inet.no/larry/openbsd.html">Inferno Nettverk A/S</a></td>
        <td><a href=#no/inet>More Info</a></td>
      </tr>
  
      <tr>
!       <td>UK, Stockport / Europe</td>
        <td><a href="http://www.openbsdeurope.com">OpenBSD Europe</a></td>
        <td><a href=#uk/openbsdeurope>More Info</a></td>
      </tr>
  
  <!--  No stock since OpenBSD 4.7  no reply to my email March 2001 -- Austin
      <tr>
!       <td>UK, Hampshire</td>
        <td><a href="http://www.holbornbooks.co.uk">Holborn Books</a></td>
        <td><a href=#uk/holbornbooks>More Info</a></td>
      </tr>
***************
*** 245,251 ****
  
  <!-- NO PRODUCT
      <tr>
!       <td>Bletchley Park, UK</td>
        <td><a href="http://www.ipcortex.co.uk/openbsd">IP Cortex</a></td>
        <td><a href=#uk/ipcortex>More Info</a></td>
      </tr>
--- 264,270 ----
  
  <!-- NO PRODUCT
      <tr>
!       <td>UK, Bletchley Park</td>
        <td><a href="http://www.ipcortex.co.uk/openbsd">IP Cortex</a></td>
        <td><a href=#uk/ipcortex>More Info</a></td>
      </tr>
***************
*** 253,266 ****
  
  <!-- NO PRODUCT
      <tr>
!       <td>Stockport, UK</td>
        <td><a href="http://www.cheeplinux.com/cat.pl?page=openbsd">Definite Software</a></td>
        <td><a href=#uk/definite>More Info</a></td>
      </tr>
  -->
  
      <tr>
!       <td>Denver, USA</td>
        <td><a href="http://www.softpro.com/openbsd.html">Softpro Books</a></td>
        <td><a href=#us/softpro>More Info</a></td>
      </tr>
--- 272,285 ----
  
  <!-- NO PRODUCT
      <tr>
!       <td>UK, Stockport</td>
        <td><a href="http://www.cheeplinux.com/cat.pl?page=openbsd">Definite Software</a></td>
        <td><a href=#uk/definite>More Info</a></td>
      </tr>
  -->
  
      <tr>
!       <td>USA, Denver, Colorado</td>
        <td><a href="http://www.softpro.com/openbsd.html">Softpro Books</a></td>
        <td><a href=#us/softpro>More Info</a></td>
      </tr>
***************
*** 667,673 ****
  -->
  
  <hr>
! <a name=ca></a>
  <li><font color="#e00000"><b>Canada</b></font><br>
  
  <!--  Not responding to my inquiries A.Hook Aug 20, 2010 
--- 686,692 ----
  -->
  
  <hr>
! <a name="ca"></a>
  <li><font color="#e00000"><b>Canada</b></font><br>
  
  <!--  Not responding to my inquiries A.Hook Aug 20, 2010 
***************
*** 688,701 ****
  Or contact <a href="mailto:hugh@openbsd.org">Hugh Graham</a>
  <p>
  -->
! 
  OpenBSD production is done by <a href=#ca/cshop>the Computer Shop of Calgary</a>,
  which is located in the town of Milk River, Alberta, and does mail-order to
  anywhere in Canada very fast.  Use the 
  <a href="https://https.openbsd.org/cgi-bin/order">
  main OpenBSD order page </a>for Canadian orders.   All orders from Canada 
  are handled in Canadian dollars.
! <p>
  
  <hr>
  <a name=cn></a>
--- 707,721 ----
  Or contact <a href="mailto:hugh@openbsd.org">Hugh Graham</a>
  <p>
  -->
! <a name="ca/MilkRiver"></a>
! <p>
  OpenBSD production is done by <a href=#ca/cshop>the Computer Shop of Calgary</a>,
  which is located in the town of Milk River, Alberta, and does mail-order to
  anywhere in Canada very fast.  Use the 
  <a href="https://https.openbsd.org/cgi-bin/order">
  main OpenBSD order page </a>for Canadian orders.   All orders from Canada 
  are handled in Canadian dollars.
! </p>
  
  <hr>
  <a name=cn></a>
***************
*** 835,852 ****
  Fon: +49 333 63 - 46 100<br>
  FAX: +49 333 63 - 46 109<br>
  eMail: <a href="mailto:sales@ixsoft.de">sales@ixsoft.de</a>
  
! </p><p>
  
  <a name=de/oeko></a>
! <a href="http://www.oeko.net/">oeko.net</a><br>
! Oeko.neT M&uuml;ller &amp; Brandt<br>
  Werner-von-Siemens-Strasse 4<br>
  D-51674 Wiehl<br>
  Germany<br>
  <a href="http://www.oeko.net/4410018.html">Web Ordering Form</a><br>
  Fon: +49 2261 979364<br>
  FAX: +49 2261 979366<br>
  <p>
  
  <hr>
--- 855,889 ----
  Fon: +49 333 63 - 46 100<br>
  FAX: +49 333 63 - 46 109<br>
  eMail: <a href="mailto:sales@ixsoft.de">sales@ixsoft.de</a>
+ </p>
  
! <p>
! <a name=de/getdigital></a>
! <a href="http://www.getdigital.de/">getDigital.de</a><br>
! getDigital.de ist ein Projekt von:<br>
! Stern & Schatz GmbH<br>
! Wellseedamm 18<br>
! 24145 Kiel<br>
! Deutschland<br>
! <a href="http://www.getdigital.de/products/OpenBSD_CD-ROM">Web Ordering Form</a><br>
! Tel.: +49 (0) 431 / 5907845<br>
! Fax: +49 (0) 431 / 7993964<br>
! URL: <a href="http://www.getdigital.de">getDigital.de</a><br>
! Email: <a href="mailto:info@getdigital.de">info@getdigital.de</a><br> 
! </p>
  
+ <p>
  <a name=de/oeko></a>
! <a href="http://www.oeko.net/">Oeko.net</a><br>
! Oeko.net<br> 
! M&uuml;ller &amp; Brandt<br>
  Werner-von-Siemens-Strasse 4<br>
  D-51674 Wiehl<br>
  Germany<br>
  <a href="http://www.oeko.net/4410018.html">Web Ordering Form</a><br>
  Fon: +49 2261 979364<br>
  FAX: +49 2261 979366<br>
+ URL: <a href="http://www.oeko.net">Oeko.net</a><br>
  <p>
  
  <hr>
***************
*** 858,867 ****
  <a href="http://www.libreriauniversitaria.it/">Libreria Universitaria</a><br>
  via del Seminario, 3<br>
  5122 - Padova<br>
- E-Mail: <a href="mailto:ordini@libreriauniversitaria.it">ordini@libreriauniversitaria.it</a><br>
  <a href="http://www.libreriauniversitaria.it/merchants/libreriauniversitaria/ita/offerta_game.jsp?productID=653390">Web Ordering Form</a><br>
  Tel: +39 049 661 003<br>
  Fax: +39 049 655 297<br>
  <p>
  -->
  
--- 895,904 ----
  <a href="http://www.libreriauniversitaria.it/">Libreria Universitaria</a><br>
  via del Seminario, 3<br>
  5122 - Padova<br>
  <a href="http://www.libreriauniversitaria.it/merchants/libreriauniversitaria/ita/offerta_game.jsp?productID=653390">Web Ordering Form</a><br>
  Tel: +39 049 661 003<br>
  Fax: +39 049 655 297<br>
+ E-Mail: <a href="mailto:ordini@libreriauniversitaria.it">ordini@libreriauniversitaria.it</a><br>
  <p>
  -->
  
***************
*** 869,885 ****
  <a href="http://www.opencompany.it/">Open Company / NS3</a><br>
  Via Firenze, 11<br>
  30036 - Santa Maria di Sala (VE)<br>
- E-Mail: <a href="mailto:ordini@opencompany.it">ordini@opencompany.it</a>
- <br>
  <a href="http://www.opencompany.it/index1.php?men=5&amp;pag=orders">Web Ordering Form</a><br>
  Tel: +39 041 5761070<br>
  Fax: +39 041 8109910<br>
  <p>
  
  <hr>
  <a name=nl></a>
  <li><font color="#e00000"><b>Netherlands</b></font><p>
- 
  <a name=nl/mensys></a>
  <a href="http://www.mensys.nl">Mensys BV</a><br>
  Crayenestersingel 65<br>
--- 906,920 ----
  <a href="http://www.opencompany.it/">Open Company / NS3</a><br>
  Via Firenze, 11<br>
  30036 - Santa Maria di Sala (VE)<br>
  <a href="http://www.opencompany.it/index1.php?men=5&amp;pag=orders">Web Ordering Form</a><br>
  Tel: +39 041 5761070<br>
  Fax: +39 041 8109910<br>
+ E-Mail: <a href="mailto:ordini@opencompany.it">ordini@opencompany.it</a><br>
  <p>
  
  <hr>
  <a name=nl></a>
  <li><font color="#e00000"><b>Netherlands</b></font><p>
  <a name=nl/mensys></a>
  <a href="http://www.mensys.nl">Mensys BV</a><br>
  Crayenestersingel 65<br>
***************
*** 961,969 ****
  Stockport<br>
  SK1 3BD<br>
  <a href="http://www.cheeplinux.com/cat.pl?page=openbsd">Web Ordering Form</a><br>
- E-Mail: <a href="mailto:sales@cheeplinux.com">sales@cheeplinux.com</a><br>
  Phone: +44 870 7406575<br>
  Fax:   +440870 7406576<br>
  <p>
  -->
  
--- 996,1004 ----
  Stockport<br>
  SK1 3BD<br>
  <a href="http://www.cheeplinux.com/cat.pl?page=openbsd">Web Ordering Form</a><br>
  Phone: +44 870 7406575<br>
  Fax:   +440870 7406576<br>
+ E-Mail: <a href="mailto:sales@cheeplinux.com">sales@cheeplinux.com</a><br>
  <p>
  -->
  
***************
*** 971,980 ****
  <a name=us></a>
  <li><font color="#e00000"><b>USA</b></font><p>
  
! OpenBSD production is done by <a href=#ca/cshop>the Computer Shop of Calgary</a>,
! which is located in the town of Milk River, Alberta, and
! mail-order direct into the US is very fast.
! <p>
  
  <!-- DEAD URL
  <a name=us/bookpool></a>
--- 1006,1016 ----
  <a name=us></a>
  <li><font color="#e00000"><b>USA</b></font><p>
  
! OpenBSD production is done by 
! <a href=#ca/cshop>the Computer Shop of Calgary</a>, 
! which is located in the town of Milk River, Alberta, near the Montana
! border, so mail-order direct into the US is pretty fast (except for textiles
! which take a bit longer due to customs paperwork requirements). <p>
  
  <!-- DEAD URL
  <a name=us/bookpool></a>
***************
*** 1009,1015 ****
  <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.541 2011/11/14 01:11:42 austin Exp $</small>
  
  </body>
  </html>
--- 1045,1051 ----
  <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.542 2012/01/22 06:49:01 austin Exp $</small>
  
  </body>
  </html>