svn commit: r44004 - head/ja_JP.eucJP/books/handbook/cutting-edge
Ryusuke SUZUKI
ryusuke at FreeBSD.org
Thu Feb 20 11:02:53 UTC 2014
Author: ryusuke
Date: Thu Feb 20 11:02:53 2014
New Revision: 44004
URL: http://svnweb.freebsd.org/changeset/doc/44004
Log:
- Merge the following from the English version:
r43685 -> r43745 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
Modified:
head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml Thu Feb 20 09:08:14 2014 (r44003)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml Thu Feb 20 11:02:53 2014 (r44004)
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r43685
+ Original revision: r43745
$FreeBSD$
-->
<chapter xmlns="http://docbook.org/ns/docbook"
@@ -160,64 +160,69 @@
<see>updating-upgrading</see>
</indexterm>
- <para>¥»¥¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ë¤³¤È¤Ï¡¢¥³¥ó¥Ô¥å¡¼¥¿¥½¥Õ¥È¥¦¥§¥¢¡¢
- Æä˥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò´ÉÍý¤¹¤ë¾å¤Ç½ÅÍפÊÌò³ä¤ò²Ì¤¿¤·¤Þ¤¹¡£
- ¤·¤«¤·¤Ê¤¬¤é¡¢&os; ¤Ë¤ª¤¤¤Æ¤Ï¡¢
- ¤³¤Î¥×¥í¥»¥¹¤Ï´Êñ¤Ê¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£
- ¥½¡¼¥¹¥³¡¼¥É¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¡¢¥³¡¼¥É¤«¤é¥Ð¥¤¥Ê¥ê¤òºÆ¹½ÃÛ¤·¡¢
- ¥Ð¥¤¥Ê¥ê¤òºÆ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤·¤¿¡£</para>
-
- <para>¸½ºß¤Î &os; ¤Ç¤Ï <command>freebsd-update</command>
- ¤È¸Æ¤Ð¤ì¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Äɲ䵤졢¾õ¶·¤ÏÊѤï¤ê¤Þ¤·¤¿¡£
- ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï 2 ¤Ä¤Îµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
- Âè°ì¤Ë¡¢&os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î¥Ó¥ë¥É¤ä¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤³¤È¤Ê¤¯¡¢
- ¥Ð¥¤¥Ê¥ê¤Ë¤è¤Ã¤Æ¥»¥¥å¥ê¥Æ¥£¤ª¤è¤Ó eratta ¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤¤Þ¤¹¡£
- ÂèÆó¤Ë¡¢¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥Þ¥¤¥Ê¡¼¤ª¤è¤Ó¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-
- <note>
- <para>¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¤Ï¡¢
+ <para>¥·¥¹¥Æ¥à´ÉÍý¤Ë¤ª¤±¤ë½ÅÍפʦÌ̤ˡ¢
+ ¤¹¤ß¤ä¤«¤Ë¥»¥¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤òŬÍѤ·¡¢
+ ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+ &os; ¤Ë¤Ï¡¢¤³¤ì¤é¤Î½èÍý¤ò¹Ô¤¦¤¿¤á¤Ë
+ <command>freebsd-update</command>
+ ¤È¸Æ¤Ð¤ì¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
+ <para>¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òÍѤ¤¤ë¤È¡¢
+ &os; ¤Î¥»¥¥å¥ê¥Æ¥£¤ª¤è¤Ó
+ eratta ¥¢¥Ã¥×¥Ç¡¼¥È¤ò¥Ð¥¤¥Ê¥ê¤Ë¤è¤Ã¤Æ¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+ ¼êÆ°¤Ç¥Ñ¥Ã¥Á¤â¤·¤¯¤Ï¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¡¢
+ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
+ ¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¤Ï¡¢
¥»¥¥å¥ê¥Æ¥£¥Á¡¼¥à¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥¢¡¼¥¥Æ¥¯¥Á¥ã¤È¥ê¥ê¡¼¥¹¤ÇÍøÍѤǤ¤Þ¤¹¡£
+ <uri xlink:href="http://www.FreeBSD.org/ja/security/">http://www.FreeBSD.org/ja/security/</uri> ¤Ë¤Ï¡¢
+ ¥µ¥Ý¡¼¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤äÊݼ齪λͽÄêÆü¤Î°ìÍ÷¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
+ <para>¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢¥Þ¥¤¥Ê¡¼¥ê¥ê¡¼¥¹¤Ç¤¢¤Ã¤¿¤ê¡¢
+ ¾¤Î¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÁ°¤Ë¡¢
¥¢¥Ã¥×¥Ç¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÌܤòÄ̤·¡¢
½ÅÍפʾðÊ󤬤ʤ¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï <uri
xlink:href="http://www.FreeBSD.org/ja/releases/">http://www.FreeBSD.org/ja/releases/</uri>
¤Ç³Îǧ¤Ç¤¤Þ¤¹¡£</para>
- </note>
+ <note>
<para>¤â¤· <command>crontab</command> ¤ÎÃæ¤Ë
&man.freebsd-update.8; ¤Îµ¡Ç½¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¤é¡¢
- °Ê²¼¤Îºî¶È¤ò¹Ô¤¦¤Þ¤Ç¤Ï̵¸ú¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
+ ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥¢¥Ã¥×¥°¥ì¡¼¥Éºî¶È¤ò½ª¤¨¤ë¤Þ¤Ç¤Ï̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+ </note>
+
+ <para>¤³¤ÎÀá¤Ç¤Ï¡¢<command>freebsd-update</command>
+ ¤Ç»È¤ï¤ì¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀâÌÀ¡¢
+ ¥»¥¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤ÎŬ±þÊýË¡¤Î¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¡¢
+ ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Ë¹Íθ¤¹¤Ù¤¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
<sect2 xml:id="freebsdupdate-config-file">
<title>ÀßÄê¥Õ¥¡¥¤¥ë</title>
- <para><filename>/etc/freebsd-update.conf</filename>
+ <para><command>freebsd-update</command> ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢
+ ¤½¤Î¤Þ¤Þ¤Ç¤âÍѤ¤¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+ <filename>/etc/freebsd-update.conf</filename>
¤ÎÀßÄê¤ò¥Ç¥Õ¥©¥ë¥È¤«¤é¤¤áºÙ¤«¤¯Ä´À°¤·¤Æ¡¢
¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥»¥¹¤òÀ©¸æ¤¹¤ë¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£
- ¤³¤Îºî¶È¤ÏÎɤ¯Ê¸½ñ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
- °Ê²¼¤Î¹àÌܤˤĤ¤¤Æ¤ÏÀâÌÀ¤¬É¬ÍפǤ·¤ç¤¦¡£</para>
+ ¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥³¥á¥ó¥È¤Ë¤ª¤¤¤ÆÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤¬ÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
+ °Ê²¼¤Î¹àÌܤˤĤ¤¤Æ¤ÏÊ䤬ɬÍפǤ·¤ç¤¦¡£</para>
<programlisting># Components of the base system which should be kept updated.
-Components src world kernel</programlisting>
+Components world kernel</programlisting>
<para>¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¡¢&os; ¤Î¤É¤ÎÉôʬ¤òºÇ¿·¤Ë°Ý»ý¤¹¤ë¤«¤òÀßÄꤷ¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥½¡¼¥¹¥³¡¼¥É¡¢¥Ù¡¼¥¹¥·¥¹¥Æ¥àÁ´ÂΡ¢¤½¤·¤Æ¥«¡¼¥Í¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
- Components ¤ËÀßÄê¤Ç¤¤ë¹àÌܤϡ¢¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÁªÂò¤Ç¤¤ë¤â¤Î¤ÈƱ¤¸¤Ç¤¹¡£
- ¤¿¤È¤¨¤Ð¡¢¤³¤³¤Ç <literal>world/games</literal> ¤òÄɲ乤ë¤È¡¢
- game ¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
- <literal>src/bin</literal> ¤òÄɲ乤ë¤È¡¢
- <filename>src/bin</filename>
- ¥½¡¼¥¹¥³¡¼¥É¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤òµö²Ä¤·¤Þ¤¹¡£</para>
-
- <para>¤³¤ÎÉôʬ¤Ë¤Ä¤¤¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¡¢
+ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥Ù¡¼¥¹¥·¥¹¥Æ¥àÁ´ÂΡ¢¤½¤·¤Æ¥«¡¼¥Í¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
+ <literal>src/base</literal> ¤ä <literal>src/sys</literal>
+ ¤Î¤è¤¦¤Ë¡¢¸Ä¡¹¤Î¹àÌܤò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
+ ¤³¤ÎÉôʬ¤Ë¤Ä¤¤¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¡¢
¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¹àÌܤò¥æ¡¼¥¶¤¬¥ê¥¹¥È¤Ë²Ã¤¨¤ë·Á¤Ë¤¹¤ë¤Î¤¬¥Ù¥¹¥È¤Ç¤·¤ç¤¦¡£
¥½¡¼¥¹¥³¡¼¥É¤È¥Ð¥¤¥Ê¥ê¤¬Æ±´ü¤·¤Æ¤¤¤Ê¤¤¤È¡¢
- Èá»´¤Ê·ë²Ì¤ò¤â¤¿¤é¤¹²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£</para>
+ Ť¤Ç¯·î¤Î´Ö¤ËÈá»´¤Ê·ë²Ì¤¬¤â¤¿¤é¤µ¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£</para>
<programlisting># Paths which start with anything matching an entry in an IgnorePaths
# statement will be ignored.
-IgnorePaths</programlisting>
+IgnorePaths /boot/kernel/linker.hints</programlisting>
<para><filename>/bin</filename> ¤ä
<filename>/sbin</filename>
@@ -234,7 +239,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.
<para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò¡¢
¥í¡¼¥«¥ë¤ÇÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Î¤ß¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
¥æ¡¼¥¶¤¬¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Æ¤¤¤ë¤È¡¢
- ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¼«Æ°¥¢¥Ã¥×¥Ç¡¼¥È¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+ ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¼«Æ°¥¢¥Ã¥×¥Ç¡¼¥È¤Ï˸¤²¤é¤ì¤Þ¤¹¡£
¾¤Ë¡¢<literal>KeepModifiedMetadata</literal>
¤È¤¤¤¦Ê̤Υª¥×¥·¥ç¥ó¤¬Â¸ºß¤·¤Þ¤¹¡£
¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢<command>freebsd-update</command>
@@ -242,7 +247,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.
<programlisting># When upgrading to a new &os; release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/</programlisting>
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints</programlisting>
<para><command>freebsd-update</command>
¤¬¥Þ¡¼¥¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤Ç¤¹¡£
More information about the svn-doc-all
mailing list