From da19568657fbb50bf8c71f11c9849ae83e92ed76 Mon Sep 17 00:00:00 2001
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Apr 2014 19:46:58 +0000
Subject: [PATCH] Update the CD/DVD sets page. Comment out the deprecated
 sites. I think the St. Petersburg address for Linux Center is incorrect, but
 Google Translate was not helpful in figuring out the correct address.

Sponsored by:	iXsystems
---
 .../books/handbook/mirrors/chapter.xml        | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 8def13650f..f9a4f9996c 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -8,21 +8,18 @@
   <title>Obtaining &os;</title>
 
   <sect1 xml:id="mirrors-cdrom">
-    <title>CDROM and DVD Publishers</title>
+    <title><acronym>CD</acronym> and
+      <acronym>DVD</acronym> Sets</title>
 
-    <sect2>
-      <title>CD and DVD Sets</title>
-
-      <para>&os; CD and DVD sets are available from many online
+      <para>&os; <acronym>CD</acronym> and <acronym>DVD</acronym> sets
+	are available from several online
 	retailers:</para>
 
       <itemizedlist>
 	<listitem>
-	  <address>
-	    &os; Mall, Inc.
+	  <address>&os; Mall, Inc.
 	    <street>2420 Sand Creek Rd C-1 #347</street>
-	    <city>Brentwood</city>,
-	    <state>CA</state>
+	    <city>Brentwood</city>, <state>CA</state>
 	    <postcode>94513</postcode>
 	    <country>USA</country>
 	    Phone: <phone>+1 925 240-6652</phone>
@@ -34,17 +31,19 @@
 	</listitem>
 
 	<listitem>
-	  <address>
-	    Dr. Hinner EDV
+	  <address>Dr. Hinner EDV
 	    <street>Kochelseestr. 11</street>
 	    <postcode>D-81371</postcode> <city>M&uuml;nchen</city>
 	    <country>Germany</country>
 	    Phone: <phone>(0177) 428 419 0</phone>
+	    Email: <email>infow@hinner.de</email>
 	    WWW: <otheraddr
 	      xlink:href="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</otheraddr>
 	  </address>
 	</listitem>
 
+<!--
+This site is just showing the Apache test page.
 	<listitem>
 	  <address>
 	    Linux Distro UK
@@ -57,9 +56,9 @@
 	  </address>
 	</listitem>
 
+This site doesn't have any products newer than 8.1 which is now EOL'd    
 	<listitem>
-	  <address>
-	    The Linux Emporium
+	  <address>The Linux Emporium
 	    <street>The Techno Centre, Puma Way</street>
 	    <city>Parkside</city>
 	    <postcode>CV1 2TT</postcode>
@@ -70,22 +69,21 @@
 	      xlink:href="http://www.linuxemporium.co.uk/products/bsd/">http://www.linuxemporium.co.uk/products/bsd/</otheraddr>
 	  </address>
 	</listitem>
-
+-->
+	    
 	<listitem>
-	  <address>
-	    LinuxCenter.Ru
+	  <address>Linux Center
 	    <street>Galernaya Street, 55</street>
 	    <city>Saint-Petersburg</city>
 	    <postcode>190000</postcode>
 	    <country>Russia</country>
-	    Phone: <phone>+7-812-3125208</phone>
+	    Phone: <phone>+7-812-309-06-86</phone>
 	    Email: <email>info@linuxcenter.ru</email>
 	    WWW: <otheraddr
 	      xlink:href="http://linuxcenter.ru/shop/freebsd">http://linuxcenter.ru/shop/freebsd</otheraddr>
 	  </address>
 	</listitem>
       </itemizedlist>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="mirrors-ftp">