svn commit: r39970 - head/ja_JP.eucJP/articles/contributing

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sat Nov 10 07:33:29 2012
New Revision: 39970
URL: http://svnweb.freebsd.org/changeset/doc/39970

Log:
  - Merge the following from the English version:
  
  	r39955 -> r39964	head/ja_JP.eucJP/articles/contributing/article.xml

Modified:
  head/ja_JP.eucJP/articles/contributing/article.xml

Modified: head/ja_JP.eucJP/articles/contributing/article.xml
==============================================================================
--- head/ja_JP.eucJP/articles/contributing/article.xml	Fri Nov  9 18:53:24 2012	(r39969)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Sat Nov 10 07:33:29 2012	(r39970)
@@ -10,7 +10,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39955
+     Original revision: r39964
      $FreeBSD$
 -->
 
@@ -348,31 +348,24 @@
 	¤ÎÊݼéôÅö¼Ô¤ØÁ÷¤ëº¹Ê¬¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ç¤¹¡£¤³¤ì¤Ï &man.diff.1;
 	¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤ª¤³¤Ê¤¤¤Þ¤¹¡£</para>
 
+      <para>º¹Ê¬¥Õ¥¡¥¤¥ë¤ÎÄó½Ð¤Ë¤ª¤¤¤Æ¹¥¤Þ¤·¤¤ &man.diff.1; ¤Î·Á¼°¤Ï¡¢
+	<command>diff -u</command> ¤Ë¤è¤êÀ¸À®¤µ¤ì¤ë
+	unified diff ·Á¼°¤Ç¤¹¡£</para>
+
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>¤¿¤È¤¨¤Ð¡¢</para>
-
-      <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
-      <para>¤Þ¤¿¤Ï</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
-      <para>¤Ç¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê³¬ÁؤËÂФ¹¤ë¥³¥ó¥Æ¥­¥¹¥È·Á¼°¤Îº¹Ê¬¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</para>
-
-      <para>ƱÍͤˡ¢</para>
-
       <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
 
       <para>¤Þ¤¿¤Ï¡¢</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
 
-      <para>¤Ç¡¢unified diff ·Á¼°¤Ç¤¢¤ë°Ê³°¤ÏƱ¤¸·ë²Ì¤¬ÆÀ¤é¤ì¤Þ¤¹¡£</para>
+      <para>¤Ç¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê³¬ÁؤËÂФ¹¤ë
+	unified diff ·Á¼°¤Îº¹Ê¬¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</para>
 
-      <para>¾Ü¤·¤¤ÀâÌÀ¤Ï &man.diff.1; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>¾Ü¤·¤¤ÀâÌÀ¤Ï &man.diff.1; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>º¹Ê¬¥Õ¥¡¥¤¥ë (&man.patch.1; ¥³¥Þ¥ó¥É¤Ç¥Æ¥¹¥È¤Ç¤­¤Þ¤¹)
 	¤òºî¤Ã¤¿¤é¡¢¤½¤ì¤é¤ò FreeBSD
@@ -396,8 +389,7 @@
 	¥×¥í¥°¥é¥à¤Ë¤«¤±¤Æ¤¯¤À¤µ¤¤¡£&man.shar.1;
 	¥¢¡¼¥«¥¤¥Ö¤â´¿·Þ¤·¤Þ¤¹¡£</para>
 
-      <para>¤¿¤È¤¨¤Ð¡¢ºÆÇÛÉÛ¤ËŬÍѤµ¤ì¤ëÃøºî¸¢¤ÎÌäÂê¤Ë¼«¿®¤¬¤Ê¤¤¤È¤«¡¢
-	¤è¤ê¸·¤·¤¤¥ì¥Ó¥å¡¼¤ò¹Ô¤ï¤Ê¤±¤ì¤Ð¤É¤¦¤·¤Æ¤â¥ê¥ê¡¼¥¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ê¤É¡¢
+      <para>¤¿¤È¤¨¤Ð¡¢ºÆÇÛÉÛ¤ËŬÍѤµ¤ì¤ëÃøºî¸¢¤ÎÌäÂê¤Ë¼«¿®¤¬¤Ê¤¤¤È¤¤¤Ã¤¿¡¢
 	¤¢¤Ê¤¿¤ÎÊѹ¹¤¬Èù̯¤ÊÀ­¼Á¤Î¤â¤Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ì¤Ð¡¢
 	&man.send-pr.1; ¤ÇÄó½Ð¤¹¤ë¤è¤ê¤à¤·¤íľÀÜ &a.core;
 	¤ØÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£&a.core; °¸¤Î¥á¡¼¥ë¤Ï¡¢