===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/older.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** www/Attic/older.html	2014/03/27 02:09:10	1.15
--- www/Attic/older.html	2015/02/05 06:20:56	1.16
***************
*** 16,42 ****
  <hr>
  
  OpenBSD is produced in Calgary, Alberta, Canada.  We have a close
! relationship with the Computer Shop of Calgary who distributes our
! product to stores around the world, and also sells our product direct
! to customers via post or courier.  However some of the older products
! which people may still be interested in are not stocked by stores around
! the world, and so these have to be internationally ordered.
! <p>
  
- Most of the following items are still available at the International
- order site, shipping out of Milk River, Alberta, Canada.  Some items
- may be available at other stores closer to you, so check the
- <a href="orders.html">main order page for store listings</a>.
- <p>
- 
  <hr>
  
  <table align=center>
  <tr>
      <td align="center" colspan="10"><b>
      CDROMs -
!     <a href="https://https.openbsd.org/cgi-bin/order">
!     International orders from the Computer Shop of Calgary
      </a></b>
      </td>
  </tr>
--- 16,32 ----
  <hr>
  
  OpenBSD is produced in Calgary, Alberta, Canada.  We have a close
! relationship with Zednax, who sells our product directly to customers
! via post or courier.
  
  <hr>
  
  <table align=center>
  <tr>
      <td align="center" colspan="10"><b>
      CDROMs -
!     <a href="https://openbsdstore.com">
!     International orders from the OpenBSD Store
      </a></b>
      </td>
  </tr>
***************
*** 243,250 ****
  <tr>
      <td align="center" colspan="10"><b>
      T-Shirts -
!     <a href="https://https.openbsd.org/cgi-bin/order">
!     International orders from the Computer Shop of Calgary
      </a></b>
      </td>
  </tr>
--- 233,240 ----
  <tr>
      <td align="center" colspan="10"><b>
      T-Shirts -
!     <a href="https://openbsdstore.com">
!     International orders from the OpenBSD Store
      </a></b>
      </td>
  </tr>
***************
*** 455,462 ****
  <tr>
      <td align="center" colspan="10"><b>
      Posters -
!     <a href="https://https.openbsd.org/cgi-bin/order">
!     International orders from the Computer Shop of Calgary
      </a></b>
      </td>
  </tr>
--- 445,452 ----
  <tr>
      <td align="center" colspan="10"><b>
      Posters -
!     <a href="https://openbsdstore.com">
!     International orders from the OpenBSD Store
      </a></b>
      </td>
  </tr>
***************
*** 628,640 ****
  <tr>
      <td align="center" colspan="6"><b>
      <a href="books.html">Books about OpenBSD</a> -
!     <a href="https://https.openbsd.org/cgi-bin/order">
!     International orders from the Computer Shop of Calgary
      </a></b>
      <br>
      There have been a few books specifically written about OpenBSD,
      and some stores<br>
!     carry these books.  Alternatively any popular on-line book seller will sell these books.
      <br>
      <br>
      </td>
--- 618,630 ----
  <tr>
      <td align="center" colspan="6"><b>
      <a href="books.html">Books about OpenBSD</a> -
!     <a href="https://openbsdstore.com">
!     International orders from the OpenBSD Store
      </a></b>
      <br>
      There have been a few books specifically written about OpenBSD,
      and some stores<br>
!     carry these books.  Alternatively, any popular online book seller will sell these books.
      <br>
      <br>
      </td>
***************
*** 650,668 ****
  	<img height=90 width=76 src="images/SSHmast_cov.jpg"></a>
      </td>
  
!    <td align="center">The Book of PF<br>2nd Edition<br>
! 	<a href="books.html#book8">
! 	<img height=90 width=76 src="images/pf2_cov.jpg"></a>
      </td>
  
     <td align="center">Building Firewalls with<br>OpenBSD and PF<br>
  	<a href="books.html#book1">
  	<img height=90 width=76 src="images/book1.gif"></a>
-     </td>
- 
-    <td align="center">The Book of PF<br><br>
- 	<a href="books.html#book7">
- 	<img height=90 width=76 src="images/pf_cov.jpg"></a>
      </td>
  
  </tr>
--- 640,653 ----
  	<img height=90 width=76 src="images/SSHmast_cov.jpg"></a>
      </td>
  
!    <td align="center">The Book of PF<br>3rd Edition<br>
! 	<a href="books.html#book13">
! 	<img height=90 width=76 src="images/pf3_cov.jpg"></a>
      </td>
  
     <td align="center">Building Firewalls with<br>OpenBSD and PF<br>
  	<a href="books.html#book1">
  	<img height=90 width=76 src="images/book1.gif"></a>
      </td>
  
  </tr>