svn commit: r41593 - head/ja_JP.eucJP/htdocs/docproj

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat May 11 02:15:54 UTC 2013


Author: ryusuke
Date: Sat May 11 02:15:53 2013
New Revision: 41593
URL: http://svnweb.freebsd.org/changeset/doc/41593

Log:
  - Merge the following from the English version:
  
  	r26978 -> r41577	head/ja_JP.eucJP/htdocs/docproj/Makefile
  	r28473 -> r41577	head/ja_JP.eucJP/htdocs/docproj/docproj.xml
  	r31519 -> r41577 (dead)	head/ja_JP.eucJP/htdocs/docproj/sgml.xml

Deleted:
  head/ja_JP.eucJP/htdocs/docproj/sgml.xml
Modified:
  head/ja_JP.eucJP/htdocs/docproj/Makefile
  head/ja_JP.eucJP/htdocs/docproj/docproj.xml

Modified: head/ja_JP.eucJP/htdocs/docproj/Makefile
==============================================================================
--- head/ja_JP.eucJP/htdocs/docproj/Makefile	Fri May 10 16:53:27 2013	(r41592)
+++ head/ja_JP.eucJP/htdocs/docproj/Makefile	Sat May 11 02:15:53 2013	(r41593)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.11
+# Original revision: r41577
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -9,15 +9,14 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  current.xml
-DOCS+= doc-set.xml
+DOCS=   current.xml
+DOCS+=	doc-set.xml
 #DOCS+=	handbook.xml
 #DOCS+=	handbook3.xml
-DOCS+= sgml.xml
-DOCS+= submitting.xml
-DOCS+= who.xml
-DOCS+= translations.xml
-DOCS+= docproj.xml
+DOCS+=  submitting.xml
+DOCS+=  who.xml
+DOCS+=  translations.xml
+DOCS+=	docproj.xml
 #DOCS+=	todo.xml
 
 INDEXLINK= docproj.html

Modified: head/ja_JP.eucJP/htdocs/docproj/docproj.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/docproj/docproj.xml	Fri May 10 16:53:27 2013	(r41592)
+++ head/ja_JP.eucJP/htdocs/docproj/docproj.xml	Sat May 11 02:15:53 2013	(r41593)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.21 -->
+<!-- Original revision: r41577 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -25,15 +25,13 @@
     <p>³Î¤«¤Ë¡¢BSD Unix (¤È¡¢¤â¤Ã¤È¹­ÈϤʰÕÌ£¤Ç¤Î &unix;)
       ¤Ë´Ø¤¹¤ë½ñÀҤϤ¿¤¯¤µ¤ó¸ºß¤·¤Þ¤¹¡£
       ¤·¤«¤·¡¢FreeBSD ¤Ë¤Ï FreeBSD ¤Ê¤ê¤ÎÆÈÆäʵ¡Ç½¤ä¼ê³¤­¡¢
-      ¥¯¥»¤¬¤¢¤ê¤Þ¤¹¡£
-    </p>
+      ¥¯¥»¤¬¤¢¤ê¤Þ¤¹¡£</p>
 
     <p>¤½¤ì¤Ë²Ã¤¨¤Æ¡¢
        Unix-like ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ë¿¨¤ì¤ë¤Î¤Ï FreeBSD
        ¤¬½é¤á¤Æ¤À¤È¤¤¤¦¥æ¡¼¥¶¤â¤¿¤¯¤µ¤ó¸ºß¤·¤Þ¤¹¡£
        ¤Ç¤¹¤«¤é¡¢
-       ¼Á¤ÎÎɤ¤Àµ³Î¤Ê¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤¬¤â¤Ã¤È¤âÂçÀڤʤΤǤ¹¡£
-    </p>
+       ¼Á¤ÎÎɤ¤Àµ³Î¤Ê¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤¬¤â¤Ã¤È¤âÂçÀڤʤΤǤ¹¡£</p>
 
     <p>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Ï¡¢
       ¥æ¡¼¥¶¤¬¤³¤Î³Ö¤¿¤ê¤òËä¤á¤ë¤Î¤ò½õ¤±¤ë¤¿¤á¤Ë¸ºß¤·¤Þ¤¹¡£
@@ -42,8 +40,7 @@
     <ol>
       <li><p>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¥á¥ó¥Ð¤Ï¡¢
          ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò½ñ¤­¡¢
-         <em>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó½¸</em>¤Î°ìÉô¤È¤·¤Æ´óÂ÷¤·¤Þ¤¹¡£
-         </p></li>
+         <em>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó½¸</em>¤Î°ìÉô¤È¤·¤Æ´óÂ÷¤·¤Þ¤¹¡£</p></li>
 
       <li><p>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¥á¥ó¥Ð¤Ï¡¢
          <em>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó½¸</em>¤ÎÂκۤ乽À®¤Ë¤Ä¤¤¤ÆµÄÏÀ¤·¡¢
@@ -53,21 +50,18 @@
     <table class="tblbasic">
       <tbody>
       <tr>
-	<td><h2 align="center"><a href="current.html">
-	      ¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È</a></h2>
+	<td><h2 align="center"><a href="current.html">¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È</a></h2>
 
 	  <p>¸½ºß¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ÎÅØÎϤΰì´Ä¤È¤·¤Æ¡¢
             ´ö¤Ä¤â¥×¥í¥¸¥§¥¯¥È¤¬<em>¿Ê¹ÔÃæ¤Ç¤¹</em>¡£
             ¥ê¥¹¥È¤ËÌܤòÄ̤·¤Æ¡¢
-            <b>¤¢¤Ê¤¿</b>¤Ë¤â¤Ç¤­¤ë¤³¤È¤¬¤Ê¤¤¤«¤É¤¦¤«Ä´¤Ù¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-	    </p></td>
+            <b>¤¢¤Ê¤¿</b>¤Ë¤â¤Ç¤­¤ë¤³¤È¤¬¤Ê¤¤¤«¤É¤¦¤«Ä´¤Ù¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</p></td>
 
       </tr>
       </tbody>
     </table>
 
-    <h2><a href="who.html">
-	²æ¡¹¤Ï²¿¼Ô¤«¡¢¤É¤¦¤·¤¿¤é»²²Ã¤Ç¤­¤ë¤Î¤«</a></h2>
+    <h2><a href="who.html">²æ¡¹¤Ï²¿¼Ô¤«¡¢¤É¤¦¤·¤¿¤é»²²Ã¤Ç¤­¤ë¤Î¤«</a></h2>
 
     <p>¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢
        ¤É¤Î¤è¤¦¤Ê¿Í¡¹¤¬¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤ò¹½À®¤·¤Æ¤¤¤ë¤Î¤«¡¢
@@ -79,16 +73,7 @@
       ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤¬¡¢
       ¤½¤ì¤¾¤ì¤ÎÍ×ÁǤËÂФ·¤Æ¹Ô¤Ã¤Æ¤¤¤ëºî¶È¤Ë¤Ä¤¤¤Æ³µÀ⤷¤Æ¤¤¤Þ¤¹¡£</p>
 
-    <h2><a href="sgml.html">
-        SGML ¤È¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</a></h2>
-
-    <p>¥×¥í¥¸¥§¥¯¥È¤Ï¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î¤¿¤á¤Ë SGML
-      ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢
-      SGML ¤Ç¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò¤Ä¤¯¤ëÊýË¡¤ò³µÀ⤷¡¢
-      ¶½Ì£¤ò»ý¤Ã¤¿Æɤ߼ê¤Ë¡¢SGML ¤Ë´Ø¤¹¤ë¹¹¤Ê¤ë¥ê¥½¡¼¥¹¤ò¶µ¤¨¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <h2><a href="submitting.html">
-	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò´óÂ÷¤¹¤ë</a></h2>
+    <h2><a href="submitting.html">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò´óÂ÷¤¹¤ë</a></h2>
 
     <p>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò´óÂ÷¤¹¤ë¤Î¤Ï¡¢
       ¥×¥í¥¸¥§¥¯¥È¤Ë»²²Ã¤¹¤ëºÇÎɤÎÊýË¡¤Ç¤¢¤ê¡¢


More information about the svn-doc-all mailing list