svn commit: r52165 - head/ja_JP.eucJP/books/handbook/introduction

Author: ryusuke
Date: Tue Aug 21 11:59:16 2018
New Revision: 52165
URL: https://svnweb.freebsd.org/changeset/doc/52165

Log:
  - Merge the following from the English version:
  
  	r52009 -> r52072	head/ja_JP.eucJP/books/handbook/introduction/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Mon Aug 20 13:17:07 2018	(r52164)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Tue Aug 21 11:59:16 2018	(r52165)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r52009
+     Original revision: r52072
      $FreeBSD$
 -->
 
@@ -188,10 +188,7 @@
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>World Wide Web ¥µ¡¼¥Ð<indexterm>
-		  <primary>web ¥µ¡¼¥Ð</primary>
-		</indexterm>
-		(ɸ½à¡¢¤â¤·¤¯¤Ï°ÂÁ´¤Ê [SSL])</para>
+	      <para>¥¦¥§¥Ö¥µ¡¼¥Ð</para>
 	    </listitem>
 
 	    <listitem>
@@ -221,7 +218,7 @@
 		<indexterm>
 		  <primary>email</primary>
 		</indexterm>
-	      ÅŻҥ᡼¥ë¥µ¡¼¥Ð</para>
+		¥á¡¼¥ë¥µ¡¼¥Ð</para>
 	    </listitem>
 
 	    <listitem>
@@ -333,6 +330,19 @@
 	<secondary>&os; ¤òÍøÍѤ·¤Æ¤¤¤ëÂ絬ÌÏ¥µ¥¤¥È</secondary>
       </indexterm>
 
+      <para>&os; ¤Ï¡¢¥¦¥§¥Ö¥µ¡¼¥Ó¥¹¤ÎǽÎϤÇÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
+	&os; ¤¬ÍøÍѤµ¤ì¤Æ¤¤¤ëÂåɽŪ¤Ê¥µ¥¤¥È¤Ë¤Ï
+	<link xlink:href="https://news.ycombinator.com/">Hacker News</link>,
+	<link xlink:href="http://www.netcraft.com/">Netcraft</link>,
+	<link xlink:href="http://www.163.com/">NetEase</link>,
+	<link xlink:href="https://signup.netflix.com/openconnect">Netflix</link>,
+	<link xlink:href="http://www.sina.com/">Sina</link>,
+	<link xlink:href="http://www.sony.co.jp/">Sony Japan</link>,
+	<link xlink:href="http://www.rambler.ru/">Rambler</link>,
+	<link xlink:href="http://www.yahoo.com/">Yahoo!</link> ¤ª¤è¤Ó
+	<link xlink:href="http://www.yandex.ru/">Yandex</link> 
+	¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
       <para>&os; ¤Ï¡¢
 	Àè¿ÊŪ¤Êµ¡Ç½¡¢¹â¤¤¥»¥­¥å¥ê¥Æ¥£¡¢¤ª¤è¤ÓÄê´üŪ¤Ê¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¡¢
 	¤½¤·¤Æ´²ÍƤʥ饤¥»¥ó¥¹¤Ë¤è¤ê¡¢
@@ -386,32 +396,9 @@
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="http://www.dell.com/KACE">Dell
-	      KACE</link>
-	    <indexterm>
-	      <primary>Dell KACE</primary>
-	    </indexterm> - KACE ¥·¥¹¥Æ¥à´ÉÍý¥¢¥×¥é¥¤¥¢¥ó¥¹¤Ç¤Ï¡¢
-	    &os; ¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹¡£¿®ÍêÀ­¡¢
-	    ¥¹¥±¡¼¥é¥Ó¥ê¥Æ¥£¤ª¤è¤Ó·Ñ³Ū¤Ê³«È¯¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥³¥ß¥å¥Ë¥Æ¥£¤Ê¤É¤¬É¾²Á¤µ¤ìºÎÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-	</listitem>
-
-	<listitem>
 	  <para><link
-	      xlink:href="http://www.experts-exchange.com/">Experts
-	      Exchange</link>
-	    <indexterm>
-	      <primary>Experts Exchange</primary>
-	    </indexterm> - ¸ø³«¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¤Ç
-	    &os; ¤¬Æ°¤¤¤Æ¤¤¤Þ¤¹¡£
-	    ³«È¯¤È»î¸³¤Î¤¿¤á¤ÎÆÈΩ¤·¤¿´Ä¶­¤Ç¤Ï¡¢
-	    ¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤Î¤¢¤ë²¾ÁÛ²½¤Ç¤Ï¤Ê¤¯¡¢
-	    jail ¤¬Éý¹­¤¯ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para><link
-	      xlink:href="http://www.isilon.com/">Isilon</link>
-	    <indexterm>
+	      xlink:href="https://www.emc.com/isilon">Dell EMC Isilon</link>
+ 	    <indexterm>
 	      <primary>Isilon</primary>
 	    </indexterm> - Isilon
 	    ¼Ò¤Î¥¨¥ó¥¿¡¼¥×¥é¥¤¥º¥¹¥È¥ì¡¼¥¸¥¢¥×¥é¥¤¥¢¥ó¥¹¤Ï¡¢&os; ¥Ù¡¼¥¹¤Ç¤¹¡£
@@ -422,6 +409,16 @@
 	</listitem>
 
 	<listitem>
+	  <para><link xlink:href="http://www.dell.com/KACE">Dell
+	      KACE</link>
+	    <indexterm>
+	      <primary>Dell KACE</primary>
+	    </indexterm> - KACE ¥·¥¹¥Æ¥à´ÉÍý¥¢¥×¥é¥¤¥¢¥ó¥¹¤Ç¤Ï¡¢
+	    &os; ¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹¡£¿®ÍêÀ­¡¢
+	    ¥¹¥±¡¼¥é¥Ó¥ê¥Æ¥£¤ª¤è¤Ó·Ñ³Ū¤Ê³«È¯¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥³¥ß¥å¥Ë¥Æ¥£¤¬É¾²Á¤µ¤ìºÎÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	</listitem>
+
+	<listitem>
 	  <para><link
 	      xlink:href="http://www.ixsystems.com/">iXsystems</link>
 	    <indexterm>
@@ -708,72 +705,6 @@
       <para>Wikipedia ¤Ë¤â <link
           xlink:href="http://en.wikipedia.org/wiki/List_of_products_based_on_FreeBSD">&os;
         ¥Ù¡¼¥¹¤ÎÀ½ÉʤΥꥹ¥È</link> ¤¬¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <para>&os; ¤Ï¡¢°Ê²¼¤Î¥µ¥¤¥È¤ËÂåɽ¤µ¤ì¤ë¤è¤¦¤Ê¡¢
-	¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤ÇºÇÂ祯¥é¥¹¤Î¥µ¥¤¥È¤Ç¤âÍøÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><link xlink:href="http://www.yahoo.com/">Yahoo!</link>
-	    <indexterm>
-	      <primary>Yahoo!</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link xlink:href="http://www.yandex.ru/">Yandex</link>
-	    <indexterm>
-	      <primary>Yandex</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link
-	      xlink:href="http://www.rambler.ru/">Rambler</link>
-	    <indexterm>
-	      <primary>Rambler</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link xlink:href="http://www.sina.com/">Sina</link>
-	    <indexterm>
-	      <primary>Sina</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link xlink:href="http://www.sony.co.jp/">Sony
-	      Japan</link>
-	    <indexterm>
-	      <primary>Sony Japan</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link
-	      xlink:href="http://www.netcraft.com/">Netcraft</link>
-	    <indexterm>
-	      <primary>Netcraft</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link
-	      xlink:href="https://signup.netflix.com/openconnect">Netflix</link>
-	    <indexterm>
-	      <primary>Netflix</primary>
-	    </indexterm></para>
-	</listitem>
-
-	<listitem>
-	  <para><link xlink:href="http://www.163.com/">NetEase</link>
-	    <indexterm>
-	      <primary>NetEase</primary>
-	    </indexterm></para>
-	</listitem>
-
-      </itemizedlist>
 
     </sect2>
   </sect1>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"