svn commit: r43563 - head/ja_JP.eucJP/books/handbook/basics

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Jan 18 09:32:41 UTC 2014


Author: ryusuke
Date: Sat Jan 18 09:32:41 2014
New Revision: 43563
URL: http://svnweb.freebsd.org/changeset/doc/43563

Log:
  - Merge the following from the English version:
  
  	r19301 -> r19545	head/ja_JP.eucJP/books/handbook/basics/chapter.xml
  
  Submitted by:	Yuta MASUMOTO <owata _at_ club dot kyutech dot ac dot jp>

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

Modified: head/ja_JP.eucJP/books/handbook/basics/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/basics/chapter.xml	Sat Jan 18 04:27:47 2014	(r43562)
+++ head/ja_JP.eucJP/books/handbook/basics/chapter.xml	Sat Jan 18 09:32:41 2014	(r43563)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r19301
+     Original revision: r19545
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="basics">
@@ -894,7 +894,7 @@ total 530
 
       <para>¤³¤ì¤Þ¤Ç¤Î¤È¤³¤í¡¢¤³¤ì¤Ï¤¢¤Ê¤¿¤Î»È¤Ã¤¿¤³¤È¤Î¤¢¤ë¾¤Î OS
 	¤È¤ª¤½¤é¤¯»÷¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¾¯¤·°ã¤¤¤¬¤¢¤ê¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢DOS ¤Ç¤Ï¥Õ¥¡¥¤¥ë̾¤È¥Ç¥£¥ì¥¯¥È¥ê̾¤òʬ¤±¤ë¤Î¤Ë
+	¤¿¤È¤¨¤Ð¡¢&ms-dos; ¤Ç¤Ï¥Õ¥¡¥¤¥ë̾¤È¥Ç¥£¥ì¥¯¥È¥ê̾¤òʬ¤±¤ë¤Î¤Ë
 	<literal>\</literal> ¤ò»È¤¤¤Þ¤¹¡£
 	°ìÊý¡¢&macos; ¤Ç¤Ï <literal>:</literal> ¤ò»È¤¤¤Þ¤¹¡£</para>
 
@@ -1053,7 +1053,7 @@ total 530
 	</textobject>
       </mediaobject>
 
-      <para>¤â¤·¤¢¤Ê¤¿¤¬ DOS ¤ò»È¤¤¤Ê¤ì¤Æ¤¤¤ë¤Ê¤é¡¢
+      <para>¤â¤·¤¢¤Ê¤¿¤¬ &ms-dos; ¤ò»È¤¤¤Ê¤ì¤Æ¤¤¤ë¤Ê¤é¡¢
 	¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢¤³¤ì¤Ï <command>join</command> ¥³¥Þ¥ó¥É¤È
 	»÷¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -1127,7 +1127,7 @@ total 530
     
       <para>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï¥Ñ¡¼¥Æ¥£¥·¥ç¥óÆâ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
 	FreeBSD ¤Î &unix; °ä»º¤Î¤¿¤á¤Ë¡¢
-	¤³¤ì¤ÏÉáÃʻȤï¤ì¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó (Î㤨¤Ð DOS ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó)
+	¤³¤ì¤ÏÉáÃʻȤï¤ì¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó (Î㤨¤Ð &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó)
 	¤È¤¤¤¦ÍѸì¤Î°ÕÌ£¤È¤Ï°ã¤¦°ÕÌ£¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
 	¤½¤ì¤¾¤ì¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï <literal>a</literal> ¤«¤é
 	<literal>h</literal> ¤Þ¤Ç¤Îʸ»ú¤Ç¶èÊ̤µ¤ì¤Þ¤¹¡£
@@ -1354,8 +1354,8 @@ total 530
 	<para>¤³¤ì¤Ï¥·¥¹¥Æ¥à¤ËÀܳ¤µ¤ì¤¿°ìÈÖÌܤΠIDE 
 	  ¥Ç¥£¥¹¥¯¤Î FreeBSD ¤«¤é¸«¤¿¿Þ¤ò¼¨¤·¤Þ¤¹¡£
 	  ¥Ç¥£¥¹¥¯¥µ¥¤¥º¤Ï 4 GB ¤È²¾Äꤷ¡¢
-	  2 GB ¤Î¥¹¥é¥¤¥¹ (DOS¤Ç¤¤¤¦¥Ñ¡¼¥Æ¥£¥·¥ç¥ó) ¤¬Æó¤Ä¤¢¤ë¤È¤·¤Þ¤¹¡£
-	  °ìÈÖÌܤΥ¹¥é¥¤¥¹¤Ï DOS ¥Ç¥£¥¹¥¯¤Î <filename>C:</filename>
+	  2 GB ¤Î¥¹¥é¥¤¥¹ (&ms-dos; ¤Ç¤¤¤¦¥Ñ¡¼¥Æ¥£¥·¥ç¥ó) ¤¬Æó¤Ä¤¢¤ë¤È¤·¤Þ¤¹¡£
+	  °ìÈÖÌܤΥ¹¥é¥¤¥¹¤Ï &ms-dos; ¥Ç¥£¥¹¥¯¤Î <filename>C:</filename>
 	  ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	  ¤½¤·¤Æ¡¢ÆóÈÖÌܤΥ¹¥é¥¤¥¹¤Ï FreeBSD ¤Î¥Ç¥£¥¹¥¯¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	  ¤³¤ì¤Ï FreeBSD ¥¤¥ó¥¹¥È¡¼¥é¤¬»°¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È°ì¤Ä¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤¿Îã¤Ç¤¹¡£</para>
@@ -2338,7 +2338,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
   <sect1 id="binary-formats">
     <title>Binary Formats</title>
 
-    <para>To understand why FreeBSD uses the <acronym>ELF</acronym>
+    <para>To understand why &os; uses the &man.elf.5;
       format, you must first know a little about the 3 currently
       <quote>dominant</quote> executable formats for &unix;:</para>
 
@@ -2363,7 +2363,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       </listitem>
 
       <listitem>
-        <para><acronym>ELF</acronym></para>
+        <para>&man.elf.5;</para>
 
         <para>The successor to <acronym>COFF</acronym>, featuring
           multiple sections and 32-bit or 64-bit possible values.  One


More information about the svn-doc-all mailing list