svn commit: r40392 - head/ja_JP.eucJP/books/handbook/mirrors

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sun Dec 16 15:56:29 2012
New Revision: 40392
URL: http://svnweb.freebsd.org/changeset/doc/40392

Log:
  - Merge the following from the English version:
  
  	r40050 -> r40177	head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Sun Dec 16 15:35:01 2012	(r40391)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Sun Dec 16 15:56:29 2012	(r40392)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40050
+     Original revision: r40177
      $FreeBSD$
 -->
 
@@ -39,7 +39,7 @@
       <listitem>
 	<address>
 	  <otheraddr>&os; Mall, Inc.</otheraddr>
-	  <street>700 Harvest Park Ste F</street>
+	  <street>2420 Sand Creek Rd C-1 #347</street>
 	  <city>Brentwood</city>, <state>CA</state>  <postcode>94513</postcode>
 	  <country>USA</country>
 	  ÅÅÏÃ: <phone>+1 925 240-6652</phone>
@@ -52,25 +52,16 @@
       <listitem>
 	<address>
 	  <otheraddr>Dr. Hinner EDV</otheraddr>
-	  <street>St. Augustinus-Str. 10</street>
-	  <postcode>D-81825</postcode> <city>München</city>
+	  <street>Kochelseestr. 11</street>
+	  <postcode>D-81371</postcode> <city>München</city>
 	  <country>Germany</country>
-	  ÅÅÏÃ: <phone>(089) 428 419</phone>
+	  ÅÅÏÃ: <phone>(0177) 428 419 0</phone>
 	  WWW: <otheraddr><ulink url="http://www.hinner.de/linux/freebsd.html"></ulink></otheraddr>
         </address>
       </listitem>
 
       <listitem>
 	<address>
-	  <otheraddr>JMC Software</otheraddr>
-	  <country>Ireland</country>
-	  ÅÅÏÃ: <phone>353 1 6291282</phone>
-	  WWW: <otheraddr><ulink url="http://www.thelinuxmall.com"></ulink></otheraddr>
-	</address>
-      </listitem>
-
-      <listitem>
-	<address>
 	  <otheraddr>Linux Distro UK</otheraddr>
 	  <street>42 Wharfedale Road</street>
 	  <city>Margate</city>
@@ -83,11 +74,11 @@
       <listitem>
 	<address>
 	  <otheraddr>The Linux Emporium</otheraddr>
-	  <street>Hilliard House, Lester Way</street>
-	  <city>Wallingford</city>
-	  <postcode>OX10 9TA</postcode>
+	  <street>The Techno Centre, Puma Way</street>
+	  <city>Parkside</city>
+	  <postcode>CV1 2TT</postcode>
 	  <country>United Kingdom</country>
-	  ÅÅÏÃ: <phone>+44 1491 837010</phone>
+	  ÅÅÏÃ: <phone>+44 (0)247 615 8121</phone>
 	  Fax: <fax>+44 1491 837016</fax>
 	  WWW: <otheraddr><ulink url="http://www.linuxemporium.co.uk/products/bsd/"></ulink></otheraddr>
         </address>
@@ -95,32 +86,6 @@
 
       <listitem>
 	<address>
-	  <otheraddr>Linux+ DVD Magazine</otheraddr>
-	  <street>Lewartowskiego 6</street>
-	  <city>Warsaw</city>
-	  <postcode>00-190</postcode>
-	  <country>Poland</country>
-	  ÅÅÏÃ: <phone>+48 22 860 18 18</phone>
-	  Email: <email>editors at lpmagazine.org</email>
-	  WWW: <otheraddr><ulink url="http://www.lpmagazine.org/"></ulink></otheraddr>
-	</address>
-      </listitem>
-
-      <listitem>
-	<address>
-	  <otheraddr>Linux System Labs Australia</otheraddr>
-	  <street>21 Ray Drive</street>
-	  <city>Balwyn North</city>
-	  <postcode>VIC - 3104</postcode>
-	  <country>Australia</country>
-	  ÅÅÏÃ: <phone>+61 3 9857 5918</phone>
-	  Fax: <fax>+61 3 9857 8974</fax>
-	  WWW: <otheraddr><ulink url="http://www.lsl.com.au"></ulink></otheraddr>
-        </address>
-      </listitem>
-
-      <listitem>
-	<address>
 	  <otheraddr>LinuxCenter.Ru</otheraddr>
 	  <street>Galernaya Street, 55</street>
 	  <city>Saint-Petersburg</city>
@@ -133,51 +98,6 @@
       </listitem>
      </itemizedlist>
     </sect2>
-
-    <sect2>
-      <title>Ìä²°</title>
-
-      <para>¤¢¤Ê¤¿¤¬¾®Çä¶È¤ò±Ä¤ó¤Ç¤¤¤Æ &os; ¤Î CDROM
-      À½Éʤò¼è¤ê°·¤¤¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ë¤Ê¤é¼¡¤Î¾ì½ê¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <itemizedlist>
-        <listitem>
-	  <address>
-	    <otheraddr>Ingram Micro</otheraddr>
-	    <street>1600 E. St. Andrew Place</street>
-	    <city>Santa Ana</city>, <state>CA</state>  <postcode>92705-4926</postcode>
-	    <country>USA</country>
-	    ÅÅÏÃ: <phone>1 (800) 456-8000</phone>
-	    WWW: <otheraddr><ulink url="http://www.ingrammicro.com/"></ulink></otheraddr>
-          </address>
-        </listitem>
-
-	<listitem>
-	  <address>
-	    <otheraddr>Kudzu, LLC</otheraddr>
-	    <street>7375 Washington Ave. S.</street>
-	    <city>Edina</city>, <state>MN</state> <postcode>55439</postcode>
-	    <country>USA</country>
-	    ÅÅÏÃ: <phone>+1 952 947-0822</phone>
-	    Fax: <fax>+1 952 947-0876</fax>
-	    Email: <email>sales at kudzuenterprises.com</email>
-	  </address>
-	</listitem>
-
-	<listitem>
-	  <address>
-	    <otheraddr>LinuxCenter.Ru</otheraddr>
-	    <street>Galernaya Street, 55</street>
-	    <city>Saint-Petersburg</city>
-	    <postcode>190000</postcode>
-	    <country>Russia</country>
-	    ÅÅÏÃ: <phone>+7-812-3125208</phone>
-	    Email: <email>info at linuxcenter.ru</email>
-	    WWW: <otheraddr><ulink url="http://linuxcenter.ru/freebsd"></ulink></otheraddr>
-	  </address>
-	</listitem>
-      </itemizedlist>
-    </sect2>
   </sect1>
 
   <sect1 id="mirrors-ftp">