svn commit: r53225 - in head/ja_JP.eucJP: books/handbook/x11 share/xml

Author: ryusuke
Date: Thu Jul  4 10:27:34 2019
New Revision: 53225
URL: https://svnweb.freebsd.org/changeset/doc/53225

Log:
  - Merge the following from the English version:
  
  	r52111 -> r52765	head/ja_JP.eucJP/books/handbook/x11/chapter.xml
  	r45992 -> r52500	head/ja_JP.eucJP/share/xml/trademarks.ent

Modified:
  head/ja_JP.eucJP/books/handbook/x11/chapter.xml
  head/ja_JP.eucJP/share/xml/trademarks.ent

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Jul  4 06:22:56 2019	(r53224)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Jul  4 10:27:34 2019	(r53225)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r52111
+     Original revision: r52765
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -418,7 +418,44 @@
     <sect2 xml:id="x-config-video-cards">
       <title>¥Ó¥Ç¥ª¥«¡¼¥É</title>
 
+      <para>ºÇ¶á¤Î &os; ¤Ç¤Ï¡¢Ports ¤Þ¤¿¤Ï packages
+	·Á¼°¤ÇÄ󶡤µ¤ì¤ë¥°¥é¥Õ¥£¥Ã¥¯¥É¥é¥¤¥Ð¤òÍøÍѤǤ­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
+	¤½¤Î¤è¤¦¤Ê¤â¤Î¤È¤·¤Æ¡¢¥æ¡¼¥¶¤Ï <package>graphics/drm-kmod</package>
+	¤ÇÄ󶡤µ¤ì¤ë°Ê²¼¤Î¥É¥é¥¤¥Ð¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
+
       <variablelist>
+	<varlistentry xml:id="x-config-video-cards-ports">
+	  <term>&i915kms;</term>
+	  <term>&radeonkms;</term>
+	  <term>&amdgpu;</term>
+
+	  <listitem>
+	    <para>Intel ¤¬Ä󶡤·¤Æ¤¤¤ë¤Û¤È¤ó¤É¤Î &i915kms;
+	      ¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Ï¡¢2D ¤ª¤è¤Ó 3D
+	      ¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+	    <para>¥É¥é¥¤¥Ð̾: <literal>i915kms</literal></para>
+
+	    <para>AMD ¤¬Ä󶡤·¤Æ¤¤¤ë¸Å¤¤ &radeonkms;
+	      ¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Î¤Û¤È¤ó¤É¤Ï¡¢2D ¤ª¤è¤Ó 3D
+	      ¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+	    <para>¥É¥é¥¤¥Ð̾: <literal>radeonkms</literal></para>
+
+	    <para>AMD ¤¬Ä󶡤·¤Æ¤¤¤ë¿·¤·¤¤ &radeonkms;
+	      ¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Î¤Û¤È¤ó¤É¤Ï¡¢2D ¤ª¤è¤Ó 3D
+	      ¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+	    <para>¥É¥é¥¤¥Ð̾: <literal>amdgpu</literal></para>
+
+	    <para>»²¹Í¤È¤·¤Æ¡¢Âбþ¤·¤Æ¤¤¤ë GPU °ìÍ÷¤ò <link
+		xlink:href="https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units"/>
+	      ¤Þ¤¿¤Ï <link
+		xlink:href="https://en.wikipedia.org/wiki/List_of_AMD_graphics_processing_units"/>
+	      ¤Ç¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	  </listitem>
+	</varlistentry>
+
 	<varlistentry xml:id="x-config-video-cards-intel">
 	  <term>&intel;</term>
 
@@ -1576,7 +1613,7 @@ hald_enable="YES"</programlisting>
       <para><application>KDE</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg install x11/kde4</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install x11/kde5</userinput></screen>
 
       <para><application>KDE</application> port
 	¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
@@ -1585,7 +1622,7 @@ hald_enable="YES"</programlisting>
 	<application>KDE</application> ¤ÏÂ礭¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ê¤Î¤Ç¡¢
 	¹â®¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤â¥³¥ó¥Ñ¥¤¥ë¤Ë¤Ï»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde5</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <indexterm>
@@ -1613,27 +1650,31 @@ hald_enable="YES"</programlisting>
       <programlisting>dbus_enable="YES"
 hald_enable="YES"</programlisting>
 
-      <para><application>KDE</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢
-	KDE ¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã <application>KDM</application>
-	¤â¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-	¤³¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤ò
-	<filename>/etc/rc.conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+      <para>KDE Plasma 5 ¤«¤é KDE ¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
+	<application>KDM</application> ¤Î³«È¯¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£
+	¤«¤ï¤ê¤Ë¿ä¾©¤µ¤ì¤Æ¤¤¤ë¤Î¤¬ <application>SDDM</application> ¤Ç¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <programlisting>kdm4_enable="YES"</programlisting>
+      <screen>&prompt.root; <userinput>pkg install x11/sddm</userinput></screen>
 
+      <para>¤½¤Î¸å¡¢°Ê²¼¤Î¹Ô¤ò
+ 	<filename>/etc/rc.conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+
+      <programlisting>sddm_enable="YES"</programlisting>
+
       <para><application>KDE</application> ¤òµ¯Æ°¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
 	¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é <command>startx</command> ¤ò¼Â¹Ô¤¹¤ëÊýË¡¤Ç¤¹¡£
 	¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢<filename>~/.xinitrc</filename>
 	¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-      <programlisting>exec /usr/local/bin/startkde</programlisting>
+      <programlisting>exec ck-launch-session startkde</programlisting>
 
       <para><application>KDE</application> ¤òµ¯Æ°¤¹¤ë 3 ¤Ä¤á¤ÎÊýË¡¤Ï¡¢
 	<application>XDM</application> ¤òÍøÍѤ¹¤ëÊýË¡¤Ç¤¹¡£
 	¤³¤ÎÊýË¡¤ò»È¤¦¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¼Â¹Ô²Äǽ¤Ê
 	<filename>~/.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startkde" &gt; ~/.xsession</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec ck-launch-session startkde" &gt; ~/.xsession</userinput></screen>
 
       <para><application>KDE</application> ¤òµ¯Æ°¤·¤¿¸å¤Ï¡¢
 	¥Ó¥ë¥È¥¤¥ó¥Ø¥ë¥×¥·¥¹¥Æ¥à¤«¤é¡¢

Modified: head/ja_JP.eucJP/share/xml/trademarks.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/trademarks.ent	Thu Jul  4 06:22:56 2019	(r53224)
+++ head/ja_JP.eucJP/share/xml/trademarks.ent	Thu Jul  4 10:27:34 2019	(r53225)
@@ -10,7 +10,7 @@
      Please keep this file sorted.
 
      $FreeBSD$
-     Original revision: r45992
+     Original revision: r52500
 -->
 
 <!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com ¤ª¤è¤Ó HomeConnect ¤Ï
@@ -182,6 +182,10 @@ Coverity, Inc. ¤Î¾¦É¸¤Ç¤¹¡£</para>">
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Red Hat, Inc. ¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- https://riscv.org/risc-v-trademark-usage/ -->
+<!ENTITY tm-attrib.risc-v "<para xmlns='http://docbook.org/ns/docbook'>¡ÈRISC-V¡É ¾¦É¸¤Ï¡¢RISC-V Foundation ¤Ë¤è¤ê¿½ÀÁÃæ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+<!ENTITY risc-v "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>RISC-V</trademark>">
+
 <!-- These four are no longer used in the en_US documentation, but need
   leaving until translations stop using them -->
 <!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>SAP, R/3 ¤ª¤è¤Ó mySAP ¤Ï
@@ -239,6 +243,11 @@ Coverity, Inc. ¤Î¾¦É¸¤Ç¤¹¡£</para>">
 <!-- http://www.xiph.org/ -->
 <!ENTITY tm-attrib.xiph "<para xmlns='http://docbook.org/ns/docbook'>Ogg Vorbis ¤ª¤è¤Ó Xiph.Org ¤Ï
   Xiph.Org ¤Î¾¦É¸¤Ç¤¹¡£</para>">
+
+<!-- used in the X11 chapter of the Handbook -->
+<!ENTITY amdgpu "AMD KMS ¥É¥é¥¤¥Ð">
+<!ENTITY i915kms "Intel KMS ¥É¥é¥¤¥Ð">
+<!ENTITY radeonkms "Radeon KMS ¥É¥é¥¤¥Ð">
 
 <!ENTITY tm-attrib.general "<para xmlns='http://docbook.org/ns/docbook'>À½Â¤¼Ô¤ª¤è¤ÓÈÎÇä¼Ô¤¬À½Éʤò¶èÊ̤¹¤ë¤Î¤Ë
   ÍѤ¤¤Æ¤¤¤ëɽ¼¨¤Î¿¤¯¤Ï¡¢¾¦É¸¤È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£

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