svn commit: r38964 - in head/ja_JP.eucJP/books/handbook: mirrors x11

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Jun 2 16:44:37 UTC 2012


Author: ryusuke
Date: Sat Jun  2 16:44:36 2012
New Revision: 38964
URL: http://svn.freebsd.org/changeset/doc/38964

Log:
  - Merge the following from the English version:
  
  	r38694 -> r38952	head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
  	r37879 -> r38826	head/ja_JP.eucJP/books/handbook/x11/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
  head/ja_JP.eucJP/books/handbook/x11/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml	Sat Jun  2 14:57:28 2012	(r38963)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml	Sat Jun  2 16:44:36 2012	(r38964)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.511
+     Original revision: r38952
      $FreeBSD$
 -->
 
@@ -374,6 +374,7 @@
 SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
       
 	  </listitem>
+	  <!--
 	  <listitem>
 	    <para><emphasis>USA</emphasis>:
 	      anoncvs at anoncvs1.FreeBSD.org:/home/ncvs (ssh ¤Ç¤Ï
@@ -382,6 +383,7 @@ SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:
 	    <programlisting>SSH2 HostKey: 2048 53:1f:15:a3:72:5c:43:f6:44:0e:6a:e9:bb:f8:01:62 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
 
 	  </listitem>
+	  -->
       </itemizedlist>
 
       <para>CVS ¤Ï¤«¤Ä¤Æ¸ºß¤·¤¿ (¤â¤·¤¯¤Ï¤³¤ì¤«¤é¸ºß¤¹¤ë¤â¤Î¤â)

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.sgml	Sat Jun  2 14:57:28 2012	(r38963)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.sgml	Sat Jun  2 16:44:36 2012	(r38964)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.208
+     Original revision: r38826
      $FreeBSD$
 -->
 
@@ -1382,10 +1382,10 @@ DisplayManager.requestPort:     0</scree
 
       <para>¥Ç¥Õ¥©¥ë¥È¤Î <application>XDM</application>
 	¤ËÂå¤ï¤ë¤â¤Î¤¬¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£
-	°ì¤Ä¤Ï <application>kdm</application>
+	°ì¤Ä¤Ï <application>KDM</application>
 	(<application>KDE</application> ¤ËÉÕ°¤·¤Æ¤¤¤Þ¤¹)
 	¤Ï¤½¤Î°ì¤Ä¤Ç¤¢¤ê¡¢¤³¤Î¾Ï¤Î¸å¤í¤Ç²òÀ⤷¤Þ¤¹¡£
-	<application>kdm</application> ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ï¡¢
+	<application>KDM</application> ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ï¡¢
 	¥í¥°¥¤¥ó»þ¤Ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ë²Ã¤¨¡¢
 	¸«¤¿Ìܤ⤫¤Ê¤êåºÎï¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
     </sect2>
@@ -1528,7 +1528,7 @@ DisplayManager.requestPort:     0</scree
 	  <link linkend="x11-wm-kde-details">KDE
 	  ¤Î¾ÜºÙ</link>¤Ë¤Ä¤¤¤Æ¤Î¥»¥¯¥·¥ç¥ó¤Ç
 	  <application>KDE</application> ¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ç¤¢¤ë
-	  <application>kdm</application>
+	  <application>KDM</application>
 	  ¤ò»È¤Ã¤Æ¤É¤Î¤è¤¦¤Ë¤¹¤ì¤Ð¤¤¤¤¤Î¤«¤ò²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
       </sect3>
     </sect2>
@@ -1572,7 +1572,7 @@ DisplayManager.requestPort:     0</scree
 
 	  <listitem>
 	    <para>¹ñºÝ²½: <application>KDE</application> ¤Ï
-	      40 ¤ò±Û¤¨¤ë¸À¸ì¤ÇÍøÍѲÄǽ</para>
+	      55 ¤ò±Û¤¨¤ë¸À¸ì¤ÇÍøÍѲÄǽ</para>
 	  </listitem>
 
 	  <listitem>
@@ -1594,13 +1594,16 @@ DisplayManager.requestPort:     0</scree
 	  ¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 	  <application>KDE</application> ¤Ë´Ø¤¹¤ë
 	  FreeBSD ÆÃÍ­¤Î¾ðÊó¤È¥ê¥½¡¼¥¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	  <ulink url="http://freebsd.kde.org/">KDE on FreeBSD
-	  ¥Á¡¼¥à</ulink> ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	  <ulink url="http://freebsd.kde.org/">KDE/FreeBSD
+	    initiative</ulink> ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
 	<para>FreeBSD ¤ÇÍøÍѤǤ­¤ë <application>KDE</application>
 	  ¤Ë¤Ï 2 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
-	  ¥Ð¡¼¥¸¥ç¥ó 3 ¤Ï¡¢Ä¹¤¤´Ö¹­¤¯»È¤ï¤ì¡¢°ÂÄꤷ¤Æ¤¤¤Þ¤¹¡£
-	  ¥Ð¡¼¥¸¥ç¥ó 4 ¤Ï¡¢¼¡À¤Âå¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¡¢Ports Collection ¤«¤éÍøÍѤǤ­¤Þ¤¹¡£
+	  ¥Ð¡¼¥¸¥ç¥ó 3 ¤Ï¡¢Ä¹¤¤´Ö¹­¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+	  ¸½ºß¤Ï¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤Æ¤ª¤é¤º¡¢ÉôʬŪ¤ËÉÔ°ÂÄê¤Ê¤È¤³¤í¤â¤¢¤ê¤Þ¤¹¤¬¡¢
+	  Ports Collection ¤ÇÍøÍѤǤ­¤Þ¤¹¡£
+	  ¥Ð¡¼¥¸¥ç¥ó 4 ¤ÏŬÀڤ˥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢
+	  <application>KDE</application> ¤Î¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
 	  ¤³¤ì¤é¤ò¶¦Â¸¤¹¤ë·Á¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
       </sect3>
 
@@ -1611,12 +1614,12 @@ DisplayManager.requestPort:     0</scree
 	  ¤ä¾¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¡¢
 	  package ¤ä Ports Collection ¤«¤é´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
-	<para><application>KDE3</application> package
+	<para><application>KDE 3</application> package
 	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen>
 
-	<para><application>KDE4</application> package
+	<para><application>KDE 4</application> package
 	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
         <screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
@@ -1624,13 +1627,13 @@ DisplayManager.requestPort:     0</scree
 	<para>&man.pkg.add.1;
 	  ¤Ï¼«Æ°Åª¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎºÇ¿·ÈǤò¼èÆÀ¤·¤Þ¤¹¡£</para>
 
-	<para><application>KDE3</application>
+	<para><application>KDE 3</application>
 	  ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde3</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-        <para><application>KDE4</application>
+        <para><application>KDE 4</application>
 	  ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
 
         <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
@@ -1641,11 +1644,11 @@ DisplayManager.requestPort:     0</scree
 	  <filename>.xinitrc</filename>
 	  ¥Õ¥¡¥¤¥ë¤ò¼¡¤Î¤è¤¦¤ËÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£</para>
 
-	<para><application>KDE3</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para><application>KDE 3</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
         
 	<screen>&prompt.user; <userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
 
-	<para><application>KDE4</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para><application>KDE 4</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
         
 	<screen>&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" &gt; ~/.xinitrc</userinput></screen>
 
@@ -1658,7 +1661,7 @@ DisplayManager.requestPort:     0</scree
 	  ¤Î¤è¤¦¤Ê¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
 	  ÀßÄê¤Ï¾¯¤·°Û¤Ê¤ê¤Þ¤¹¡£Âå¤ï¤ê¤Ë
 	  <filename>.xsession</filename> ¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£
-	  <application>kdm</application>
+	  <application>KDM</application>
 	  ÍѤÎÀâÌÀ¤Ï¤³¤Î¾Ï¤Î¸å¤Î¤Û¤¦¤Ë¤¢¤ê¤Þ¤¹¡£</para>
       </sect3>
     </sect2>
@@ -1689,7 +1692,7 @@ DisplayManager.requestPort:     0</scree
 	  Á°¤Î¾Ï¤Ç½Ò¤Ù¤¿¤è¤¦¤Ë
 	  <link linkend="x-xdm">XDM</link> ¤Ï¤½¤Î¤¿¤á¤Ë»È¤¨¤Þ¤¹¤¬¡¢
 	  <application>KDE</application>
-	  ¤Ë¤Ï¤½¤ÎÂå¤ï¤ê¤Ë¤Ê¤ë <application>kdm</application>
+	  ¤Ë¤Ï¤½¤ÎÂå¤ï¤ê¤Ë¤Ê¤ë <application>KDM</application>
 	  ¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹¡£
 	  ¸«¤¿Ìܤ¬¤è¤êÌ¥ÎÏŪ¤Ç¡¢¥í¥°¥¤¥ó»þ¤Î¥ª¥×¥·¥ç¥ó¤â¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹¡£
 	  ÆÃ¤Ë (¥á¥Ë¥å¡¼¤ò»È¤Ã¤Æ) ¥í¥°¥¤¥ó¸å¤Ë»È¤¦¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­
@@ -1697,22 +1700,22 @@ DisplayManager.requestPort:     0</scree
 	  <application>GNOME</application> ¤Ê¤É)
 	  ¤ò´Êñ¤ËÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-	<para><application>kdm</application>
+	<para><application>KDM</application>
 	  ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢
 	  ÊÔ½¸¤¹¤ë¥Õ¥¡¥¤¥ë¤Ï¡¢<application>KDE</application>
 	  ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë°Í¸¤·¤Þ¤¹¡£</para>
 
-	<para><application>KDE3</application> ¤Ç¤Ï¡¢
+	<para><application>KDE 3</application> ¤Ç¤Ï¡¢
 	  <filename>/etc/ttys</filename> ¤Î¹àÌÜ
 	  <literal>ttyv8</literal> ¤ò°Ê²¼¤Î¤è¤¦¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	 <programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
 
-	<para><application>KDE4</application> ¤Ç¤Ï¡¢
+	<para><application>KDE 4</application> ¤Ç¤Ï¡¢
+	  &man.procfs.5; ¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	  <filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-	<programlisting>local_startup="${local_startup} /usr/local/kde4/etc/rc.d"
-kdm4_enable="YES"</programlisting>
+	<programlisting>kdm4_enable="YES"</programlisting>
       </sect3>
     </sect2>
 


More information about the svn-doc-all mailing list