activate pre-orders for 5.6 CDs. Sales will now be done via a new

openbsdstore.com handled by the openbsd europe folk.
openbsd · Sep 30, 2014 · 39fa1de · 39fa1de
1 parent b136a87
commit 39fa1de
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 1,140 deletions.
diff --git a/21.html b/21.html
@@ -45,7 +45,6 @@ <h2><font color=#0000e0>OpenBSD 2.1</font></h2>
 <h3><font color="#0000e0">How to install</font></h3>
 <p>
 Following this are the instructions if you had purchased a CDROM set
-from <a href=orders.html>http://www.OpenBSD.org/orders.html</a>,
 instead of attempting to do
 an alternate form of install.  The instructions for doing an ftp (or
 other style of) install are very similar; the CDROM instructions are

diff --git a/22.html b/22.html
@@ -46,7 +46,6 @@ <h2><font color=#0000e0>OpenBSD 2.2</font></h2>
 <h3><font color="#0000e0">How to install</font></h3>
 <p>
 Following this are the instructions if you had purchased a CDROM set
-from <a href=orders.html>http://www.OpenBSD.org/orders.html</a>,
 instead of attempting to do
 an alternate form of install.  The instructions for doing an ftp (or
 other style of) install are very similar; the CDROM instructions are

diff --git a/26.html b/26.html
@@ -22,7 +22,7 @@ <h2><font color=#0000e0>OpenBSD 2.6</font></h2>
 Copyright 1997-1999, Theo de Raadt.
 <p>
 <ul>
-<li><strong>Order a CDROM from our <a href="orders.html">ordering system</a>.</strong>
+<li><strong>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.</strong>
 	If you want to try to get a bookstore local to you to carry it,
 	have them order<br>
 	<font color=#e00000>ISBN 0-9683637-4-1</font>.

diff --git a/27.html b/27.html
@@ -23,7 +23,7 @@ <h2><font color=#0000e0>OpenBSD 2.7</font></h2>
 <font color=#e00000>ISBN 0-9683637-5-X</font>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href=ftp.html>The FTP page</a> for
 	a list of mirror machines
 <li>Go to the <font color=#e00000>pub/OpenBSD/2.7/</font> directory on

diff --git a/28.html b/28.html
@@ -23,7 +23,7 @@ <h2><font color=#0000e0>OpenBSD 2.8</font></h2>
 <font color=#e00000>ISBN 0-9683637-6-8</font>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href=ftp.html>The FTP page</a> for
 	a list of mirror machines
 <li>Go to the <font color=#e00000>pub/OpenBSD/2.8/</font> directory on

diff --git a/29.html b/29.html
@@ -23,7 +23,7 @@ <h2><font color=#0000e0>OpenBSD 2.9</font></h2>
 <font color=#e00000>ISBN 0-9683637-7-6</font>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href=ftp.html>The FTP page</a> for
 	a list of mirror machines
 <li>Go to the <font color=#e00000>pub/OpenBSD/2.9/</font> directory on

diff --git a/30.html b/30.html
@@ -26,7 +26,7 @@ <h2><font color=#0000e0>OpenBSD 3.0</font></h2>
 <a href="lyrics.html#30">3.0 Song: "E-Railed (OpenBSD Mix)"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href=ftp.html>The FTP page</a> for
 	a list of mirror machines.
 <li>Go to the <font color=#e00000>pub/OpenBSD/3.0/</font> directory on

diff --git a/31.html b/31.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 3.1</font></h2>
 <a href="lyrics.html#31">3.1 Song: "Systemagic"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
 	a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.1/</font> directory on

diff --git a/32.html b/32.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.2</font></h2>
 <a href="lyrics.html#32">3.2 Song: "Goldflipper"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
 	a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.2/</font> directory on

diff --git a/33.html b/33.html
@@ -29,7 +29,7 @@ <h2><font color="#0000e0">OpenBSD 3.3</font></h2>
 <a href="lyrics.html#33">3.3 Song: "Puff the Barbarian"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
 	a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.3/</font> directory on

diff --git a/34.html b/34.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.4</font></h2>
 <a href="lyrics.html#34">3.4 Song: "The Legend of Puffy Hood"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.4/</font> directory on

diff --git a/35.html b/35.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.5</font></h2>
 <a href="lyrics.html#35">3.5 Song: "CARP License" and "Redundancy must be free"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.5/</font> directory on

diff --git a/36.html b/36.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.6</font></h2>
 <a href="lyrics.html#36">3.6 Song: "Pond-erosa Puff (live)"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.6/</font> directory on

diff --git a/37.html b/37.html
@@ -29,7 +29,7 @@ <h2><font color="#0000e0">OpenBSD 3.7</font></h2>
 <a href="lyrics.html#37">3.7 Song: "The Wizard of OS"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.7/</font> directory on

diff --git a/38.html b/38.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.8</font></h2>
 <a href="lyrics.html#38">3.8 Song: "Hackers of the Lost RAID"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.8/</font> directory on

diff --git a/39.html b/39.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 3.9</font></h2>
 <a href="lyrics.html#39">3.9 Song: "Blob!"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/3.9/</font> directory on

diff --git a/40.html b/40.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.0</font></h2>
 <a href="lyrics.html#40">4.0 Song: "Humppa Negala"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.0/</font> directory on

diff --git a/41.html b/41.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.1</font></h2>
 <a href="lyrics.html#41">4.1 Song: "Puffy Baba and the 40 Vendors"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.1/</font> directory on

diff --git a/42.html b/42.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.2</font></h2>
 <a href="lyrics.html#42">4.2 Song: "100001 1010101"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.2/</font> directory on

diff --git a/43.html b/43.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.3</font></h2>
 <a href="lyrics.html#43">4.3 Song: "Home to Hypocrisy"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.3/</font> directory on

diff --git a/44.html b/44.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.4</font></h2>
 <a href="lyrics.html#44">4.4 Song: "Trial of the BSD Knights"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.4/</font> directory on

diff --git a/45.html b/45.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 4.5</font></h2>
 <a href="lyrics.html#45">4.5 Song: "Games"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.5/</font> directory on

diff --git a/46.html b/46.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 4.6</font></h2>
 <a href="lyrics.html#46">4.6 Song: "Planet of the Users"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.6/</font> directory on

diff --git a/47.html b/47.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 4.7</font></h2>
 <a href="lyrics.html#47">4.7 Song: "I'm still here"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.7/</font> directory on

diff --git a/48.html b/48.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 4.8</font></h2>
 <a href="lyrics.html#48">4.8 Song: "El Puffiachi"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.8/</font> directory on

diff --git a/49.html b/49.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 4.9</font></h2>
 <a href="lyrics.html#49">4.9 Song: "The Answer"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/4.9/</font> directory on

diff --git a/50.html b/50.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 5.0</font></h2>
 <a href="lyrics.html#50">5.0 Song: "What Me Worry?"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.0/</font> directory on

diff --git a/51.html b/51.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 5.1</font></h2>
 <a href="lyrics.html#51">5.1 Song: "Bug Busters"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.1/</font> directory on

diff --git a/52.html b/52.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 5.2</font></h2>
 <a href="lyrics.html#52">5.2 Song: "Aquarela do Linux"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.2/</font> directory on

diff --git a/53.html b/53.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 5.3</font></h2>
 <a href="lyrics.html#53">5.3 Song: "Blade Swimmer"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.3/</font> directory on

diff --git a/54.html b/54.html
@@ -27,7 +27,7 @@ <h2><font color="#0000e0">OpenBSD 5.4</font></h2>
 <a href="lyrics.html#54">5.4 Song: "Our favorite hacks"</a>
 <p>
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">The FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.4/</font> directory on

diff --git a/55.html b/55.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 5.5</font></h2>
 <p>
 
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">the FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.5/</font> directory on

diff --git a/56.html b/56.html
@@ -28,7 +28,7 @@ <h2><font color="#0000e0">OpenBSD 5.6</font></h2>
 <p>
 
 <ul>
-<li>Order a CDROM from our <a href="orders.html">ordering system</a>.
+<li>Order a CDROM from our <a href="https://openbsdstore.com">ordering system</a>.
 <li>See the information on <a href="ftp.html">the FTP page</a> for
     a list of mirror machines.
 <li>Go to the <font color="#e00000">pub/OpenBSD/5.6/</font> directory on

diff --git a/announce28.html b/announce28.html
@@ -190,22 +190,6 @@ <h2><font color="#0000e0">CDROM SALES</font></h2>
 six months from now.
 </p>
 
-<p>
-For more information on ordering CDROMs, see
-</p>
-<blockquote>
-        <a href="http://www.OpenBSD.org/orders.html">http://www.OpenBSD.org/orders.html</a>
-</blockquote>
-
-<p>
-The above web page lists a number of places where OpenBSD CDROMs can
-be purchased from.  For our default mail order, go directly to
-</p>
-<blockquote>
-        <a href="https://https.openbsd.org/cgi-bin/order">https://https.openbsd.org/cgi-bin/order</a>
-</blockquote>
-<p>
-
 <p>
 All of our developers strongly urge you to buy a CDROM and support our
 future efforts.  As well, donations to the project are highly
@@ -222,14 +206,9 @@ <h2><font color="#0000e0">T-SHIRT SALES</font></h2>
 <p>
 The project continues to expand its funding base by selling T-shirts and
 polo shirts.  And our users like them too.  We have a variety of shirts
-available, with the new and old designs, from our web ordering system at
+available, with the new and old designs.
 </p>
 
-<blockquote>
-        <a href="https://https.openbsd.org/cgi-bin/order">https://https.openbsd.org/cgi-bin/order</a>
-</blockquote>
-
-<p>
 With this release, we introduce 2 new shirts.
 </p>
 

diff --git a/books.html b/books.html
@@ -40,8 +40,8 @@ <h3>OpenBSD-specific books</h3>
 The official book website for a sample chapter, table of contents and errata 
 can be found at
 <a href="http://www.nostarch.com/pf2.htm">http://www.nostarch.com/pf2.htm</a>.
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B08=1&amp;B08%2b=Add">
-Order direct from the OpenBSD website International</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store</a>]
 <p>
 
 
@@ -63,8 +63,8 @@ <h3>OpenBSD-specific books</h3>
 <br><a href="https://www.michaelwlucas.com/nonfiction/ssh-mastery">The
 official SSH Mastery website is here</a>
 
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B09=1&amp;B09%2b=Add">
-Order direct from the OpenBSD website International.</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store.</a>]
 <p>
 
 
@@ -90,8 +90,8 @@ <h3>OpenBSD-specific books</h3>
 <br><a href="https://www.michaelwlucas.com/nonfiction/sudo-mastery">The
 official Sudo Mastery website is here</a>
 
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B11=1&amp;B11%2b=Add">
-Order direct from the OpenBSD website International.</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store.</a>]
 <p>
 
 
@@ -120,8 +120,8 @@ <h3>OpenBSD-specific books</h3>
 <br><a href="https://www.michaelwlucas.com/nonfiction/dnssec-mastery">The
 official DNSSEC Mastery website is here</a>
 
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B12=1&amp;B12%2b=Add">
-Order direct from the OpenBSD website International.</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store.</a>]
 <p>
 
 
@@ -137,8 +137,8 @@ <h3>OpenBSD-specific books</h3>
 <a href="https://www.michaelwlucas.com/nonfiction/absolute-openbsd-2nd-edition">
 The official Absolute OpenBSD 2nd edition website is here.</a>.
 
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B10=1&amp;B10%2b=Add">
-Order direct from the OpenBSD website International.</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store.</a>]
 <p>
 
 
@@ -170,7 +170,8 @@ <h3>OpenBSD-specific books</h3>
 who want to fully exploit every feature of the system. This book
 covers all aspects of OpenBSD, including systrace, Kerberos V, IPv6 and
 IPsec, and the development environment.
-<p>[<a href="https://https.openbsd.org/cgi-bin/order?B03=1&amp;B03%2b=Add">Order direct from the OpenBSD website International</a>]
+<p>[<a href="https://openbsdstore.com">
+Order direct from the OpenBSD Store</a>]
 </dl>
 <hr>
 

diff --git a/images/cd56-s.gif b/images/cd56-s.gif