X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=po4a%2Fboot%2Fpo%2Fja.po;h=36d9259f817332e2a55f925ebebed00088c8ce3a;hb=1e4180088d00386dcdebf39cc1882357e9cce486;hp=f1328566ff29843fa0a16664372c53f022ffcd05;hpb=b94bf958b99bf242a3136414df41f7d11c80cd27;p=linuxjm%2FLDP_man-pages.git

diff --git a/po4a/boot/po/ja.po b/po4a/boot/po/ja.po
index f1328566..36d9259f 100644
--- a/po4a/boot/po/ja.po
+++ b/po4a/boot/po/ja.po
@@ -1,77 +1,79 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-19 23:50+0900\n"
-"PO-Revision-Date: 2012-03-22 03:59+0900\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: man-pages-ja\n"
+"POT-Creation-Date: 2013-08-15 19:31+0900\n"
+"PO-Revision-Date: 2013-08-16 11:02+0900\n"
+"Last-Translator: Akihiro MOTOKI <amotoki@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/man-pages-ja/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: TH
-#: build/C/man2/bdflush.2:28
+#: build/C/man2/bdflush.2:27
 #, no-wrap
 msgid "BDFLUSH"
 msgstr "BDFLUSH"
 
 #. type: TH
-#: build/C/man2/bdflush.2:28
+#: build/C/man2/bdflush.2:27
 #, no-wrap
-msgid "2004-06-17"
-msgstr "2004-06-17"
+msgid "2012-03-05"
+msgstr "2012-03-05"
 
 #. type: TH
-#: build/C/man2/bdflush.2:28 build/C/man7/boot.7:12
-#: build/C/man7/bootparam.7:29 build/C/man2/reboot.2:25 build/C/man2/sync.2:36
+#: build/C/man2/bdflush.2:27 build/C/man7/boot.7:15
+#: build/C/man7/bootparam.7:30 build/C/man2/reboot.2:28 build/C/man2/sync.2:36
 #, no-wrap
 msgid "Linux"
 msgstr "Linux"
 
 #. type: TH
-#: build/C/man2/bdflush.2:28 build/C/man7/boot.7:12
-#: build/C/man7/bootparam.7:29 build/C/man2/reboot.2:25 build/C/man2/sync.2:36
-#: build/C/man8/sync.8:6
+#: build/C/man2/bdflush.2:27 build/C/man7/boot.7:15
+#: build/C/man7/bootparam.7:30 build/C/man2/reboot.2:28 build/C/man2/sync.2:36
+#: build/C/man8/sync.8:10
 #, no-wrap
 msgid "Linux Programmer's Manual"
 msgstr "Linux Programmer's Manual"
 
 #. type: SH
-#: build/C/man2/bdflush.2:29 build/C/man7/boot.7:13
-#: build/C/man7/bootparam.7:30 build/C/man2/reboot.2:26 build/C/man2/sync.2:37
-#: build/C/man8/sync.8:7
+#: build/C/man2/bdflush.2:28 build/C/man7/boot.7:16
+#: build/C/man7/bootparam.7:31 build/C/man2/reboot.2:29 build/C/man2/sync.2:37
+#: build/C/man8/sync.8:11
 #, no-wrap
 msgid "NAME"
 msgstr "名前"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:31
+#: build/C/man2/bdflush.2:30
 msgid "bdflush - start, flush, or tune buffer-dirty-flush daemon"
 msgstr ""
 "bdflush - バッファー・ダーティー・フラッシュ・デーモンを起動、フラッシュ、調"
 "整する"
 
 #. type: SH
-#: build/C/man2/bdflush.2:31 build/C/man2/reboot.2:28 build/C/man2/sync.2:39
-#: build/C/man8/sync.8:9
+#: build/C/man2/bdflush.2:30 build/C/man2/reboot.2:31 build/C/man2/sync.2:39
+#: build/C/man8/sync.8:13
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "書式"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:34
+#: build/C/man2/bdflush.2:33
 #, no-wrap
 msgid "B<#include E<lt>sys/kdaemon.hE<gt>>\n"
 msgstr "B<#include E<lt>sys/kdaemon.hE<gt>>\n"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:37
+#: build/C/man2/bdflush.2:36
 #, no-wrap
 msgid ""
 "B<int bdflush(int >I<func>B<, long *>I<address>B<);>\n"
@@ -81,15 +83,30 @@ msgstr ""
 "B<int bdflush(int >I<func>B<, long >I<data>B<);>\n"
 
 #. type: SH
-#: build/C/man2/bdflush.2:38 build/C/man7/boot.7:15
-#: build/C/man7/bootparam.7:32 build/C/man2/reboot.2:49 build/C/man2/sync.2:65
-#: build/C/man8/sync.8:11
+#: build/C/man2/bdflush.2:37 build/C/man7/boot.7:18
+#: build/C/man7/bootparam.7:33 build/C/man2/reboot.2:52 build/C/man2/sync.2:65
+#: build/C/man8/sync.8:15
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "説明"
 
+#.  As noted in a changes in the 2.5.12 source
 #. type: Plain text
-#: build/C/man2/bdflush.2:45
+#: build/C/man2/bdflush.2:48
+msgid ""
+"I<Note>: Since Linux 2.6, this system call is deprecated and does nothing.  "
+"It is likely to disappear altogether in a future kernel release.  Nowadays, "
+"the task performed by B<bdflush>()  is handled by the kernel I<pdflush> "
+"thread."
+msgstr ""
+"I<注意>: Linux 2.6 以降では、このシステムコールは非推奨であり、何も行わな"
+"い。\n"
+"将来のカーネルのリリースで完全になくなる可能性が高い。現在は、B<bdflush>() "
+"が\n"
+"実行していた処理はカーネルの I<pdflush> スレッドによって行われている。"
+
+#. type: Plain text
+#: build/C/man2/bdflush.2:55
 msgid ""
 "B<bdflush>()  starts, flushes, or tunes the buffer-dirty-flush daemon.  Only "
 "a privileged process (one with the B<CAP_SYS_ADMIN> capability) may call "
@@ -101,7 +118,7 @@ msgstr ""
 "B<bdflush>()  を呼び出すことができる。"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:51
+#: build/C/man2/bdflush.2:61
 msgid ""
 "If I<func> is negative or 0, and no daemon has been started, then B<bdflush>"
 "()  enters the daemon code and never returns."
@@ -110,13 +127,13 @@ msgstr ""
 "コードへ入り、戻ってこない。"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:56
+#: build/C/man2/bdflush.2:66
 msgid "If I<func> is 1, some dirty buffers are written to disk."
 msgstr ""
 "I<func> が 1 ならば、 汚れた (dirty) バッファーがディスクへと書き込まれる。"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:65
+#: build/C/man2/bdflush.2:75
 msgid ""
 "If I<func> is 2 or more and is even (low bit is 0), then I<address> is the "
 "address of a long word, and the tuning parameter numbered (I<func>-2)/2 is "
@@ -127,7 +144,7 @@ msgstr ""
 "が返される。"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:74
+#: build/C/man2/bdflush.2:84
 msgid ""
 "If I<func> is 3 or more and is odd (low bit is 1), then I<data> is a long "
 "word, and the kernel sets tuning parameter numbered (I<func>-3)/2 to that "
@@ -137,22 +154,22 @@ msgstr ""
 "指定し、その値を (I<func>-3)/2 で指定された調節パラメーターに設定する。"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:78
+#: build/C/man2/bdflush.2:88
 msgid ""
 "The set of parameters, their values, and their valid ranges are defined in "
-"the kernel source file I<fs/buffer.c>."
+"the Linux kernel source file I<fs/buffer.c>."
 msgstr ""
-"パラメーターの集合やその値、有効な範囲はカーネルのソース・ファイルの I<fs/"
-"buffer.c> に定義されている。"
+"パラメーターの集合やその値、有効な範囲は Linux カーネルソースの I<fs/buffer."
+"c> に定義されている。"
 
 #. type: SH
-#: build/C/man2/bdflush.2:78 build/C/man2/reboot.2:148 build/C/man2/sync.2:76
+#: build/C/man2/bdflush.2:88 build/C/man2/reboot.2:151 build/C/man2/sync.2:76
 #, no-wrap
 msgid "RETURN VALUE"
 msgstr "返り値"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:87
+#: build/C/man2/bdflush.2:97
 msgid ""
 "If I<func> is negative or 0 and the daemon successfully starts, B<bdflush>"
 "()  never returns.  Otherwise, the return value is 0 on success and -1 on "
@@ -163,43 +180,43 @@ msgstr ""
 "され、 I<errno> にそのエラーが指示される。"
 
 #. type: SH
-#: build/C/man2/bdflush.2:87 build/C/man2/reboot.2:161 build/C/man2/sync.2:82
+#: build/C/man2/bdflush.2:97 build/C/man2/reboot.2:164 build/C/man2/sync.2:82
 #, no-wrap
 msgid "ERRORS"
 msgstr "エラー"
 
 #. type: TP
-#: build/C/man2/bdflush.2:88
+#: build/C/man2/bdflush.2:98
 #, no-wrap
 msgid "B<EBUSY>"
 msgstr "B<EBUSY>"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:92
+#: build/C/man2/bdflush.2:102
 msgid ""
 "An attempt was made to enter the daemon code after another process has "
 "already entered."
 msgstr "他のプロセスが既にデーモン・コードに入っているのに、入ろうと試みた。"
 
 #. type: TP
-#: build/C/man2/bdflush.2:92 build/C/man2/reboot.2:162
+#: build/C/man2/bdflush.2:102 build/C/man2/reboot.2:165
 #, no-wrap
 msgid "B<EFAULT>"
 msgstr "B<EFAULT>"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:96
+#: build/C/man2/bdflush.2:106
 msgid "I<address> points outside your accessible address space."
 msgstr "I<address> がアクセス可能なアドレス空間の外部を指している。"
 
 #. type: TP
-#: build/C/man2/bdflush.2:96 build/C/man2/reboot.2:166
+#: build/C/man2/bdflush.2:106 build/C/man2/reboot.2:169
 #, no-wrap
 msgid "B<EINVAL>"
 msgstr "B<EINVAL>"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:100
+#: build/C/man2/bdflush.2:110
 msgid ""
 "An attempt was made to read or write an invalid parameter number, or to "
 "write an invalid value to a parameter."
@@ -208,25 +225,25 @@ msgstr ""
 "した。"
 
 #. type: TP
-#: build/C/man2/bdflush.2:100 build/C/man2/reboot.2:169
+#: build/C/man2/bdflush.2:110 build/C/man2/reboot.2:172
 #, no-wrap
 msgid "B<EPERM>"
 msgstr "B<EPERM>"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:105
+#: build/C/man2/bdflush.2:115
 msgid "Caller does not have the B<CAP_SYS_ADMIN> capability."
 msgstr "呼び出し元に B<CAP_SYS_ADMIN> ケーパビリティがない。"
 
 #. type: SH
-#: build/C/man2/bdflush.2:105 build/C/man2/reboot.2:176 build/C/man2/sync.2:95
-#: build/C/man8/sync.8:61
+#: build/C/man2/bdflush.2:115 build/C/man2/reboot.2:179 build/C/man2/sync.2:96
+#: build/C/man8/sync.8:70
 #, no-wrap
 msgid "CONFORMING TO"
 msgstr "準拠"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:109
+#: build/C/man2/bdflush.2:119
 msgid ""
 "B<bdflush>()  is Linux-specific and should not be used in programs intended "
 "to be portable."
@@ -235,73 +252,76 @@ msgstr ""
 "い。"
 
 #. type: SH
-#: build/C/man2/bdflush.2:109 build/C/man7/boot.7:200
-#: build/C/man7/bootparam.7:1296 build/C/man2/reboot.2:180
-#: build/C/man2/sync.2:118 build/C/man8/sync.8:80
+#: build/C/man2/bdflush.2:119 build/C/man7/boot.7:202
+#: build/C/man7/bootparam.7:1586 build/C/man2/reboot.2:183
+#: build/C/man2/sync.2:119 build/C/man8/sync.8:89
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:114
+#: build/C/man2/bdflush.2:124
 msgid "B<fsync>(2), B<sync>(2), B<sync>(8), B<update>(8)"
 msgstr "B<fsync>(2), B<sync>(2), B<sync>(8), B<update>(8)"
 
 #. type: SH
-#: build/C/man2/bdflush.2:114 build/C/man7/boot.7:206
-#: build/C/man7/bootparam.7:1308 build/C/man2/reboot.2:187
-#: build/C/man2/sync.2:124 build/C/man8/sync.8:85
+#: build/C/man2/bdflush.2:124 build/C/man7/boot.7:208
+#: build/C/man7/bootparam.7:1597 build/C/man2/reboot.2:190
+#: build/C/man2/sync.2:125 build/C/man8/sync.8:94
 #, no-wrap
 msgid "COLOPHON"
-msgstr ""
+msgstr "この文書について"
 
 #. type: Plain text
-#: build/C/man2/bdflush.2:121 build/C/man7/boot.7:213
-#: build/C/man7/bootparam.7:1315 build/C/man2/reboot.2:194
-#: build/C/man2/sync.2:131 build/C/man8/sync.8:92
+#: build/C/man2/bdflush.2:131 build/C/man7/boot.7:215
+#: build/C/man7/bootparam.7:1604 build/C/man2/reboot.2:197
+#: build/C/man2/sync.2:132 build/C/man8/sync.8:101
 msgid ""
-"This page is part of release 3.35 of the Linux I<man-pages> project.  A "
+"This page is part of release 3.53 of the Linux I<man-pages> project.  A "
 "description of the project, and information about reporting bugs, can be "
-"found at http://man7.org/linux/man-pages/."
+"found at \\%http://www.kernel.org/doc/man-pages/."
 msgstr ""
+"この man ページは Linux I<man-pages> プロジェクトのリリース 3.53 の一部\n"
+"である。プロジェクトの説明とバグ報告に関する情報は\n"
+"http://www.kernel.org/doc/man-pages/ に書かれている。"
 
 #. type: TH
-#: build/C/man7/boot.7:12
+#: build/C/man7/boot.7:15
 #, no-wrap
 msgid "BOOT"
 msgstr "BOOT"
 
 #. type: TH
-#: build/C/man7/boot.7:12
+#: build/C/man7/boot.7:15
 #, no-wrap
 msgid "2010-09-19"
 msgstr "2010-09-19"
 
 #. type: Plain text
-#: build/C/man7/boot.7:15
-msgid "boot-scripts - General description of boot sequence"
+#: build/C/man7/boot.7:18
+msgid "boot-scripts - general description of boot sequence"
 msgstr "boot-scripts - ブートシーケンスの一般的な解説"
 
 #. type: Plain text
-#: build/C/man7/boot.7:23
+#: build/C/man7/boot.7:26
 msgid ""
 "The boot sequence varies in details among systems but can be roughly divided "
-"to the following steps: (i) hardware boot, (ii) OS loader, (iii) kernel "
-"startup, (iv) init and inittab, (v) boot scripts.  We will describe each of "
-"these in more detail below."
+"to the following steps: (i) hardware boot, (ii) operating system (OS) "
+"loader, (iii) kernel startup, (iv) init and inittab, (v) boot scripts.  We "
+"will describe each of these in more detail below."
 msgstr ""
 "細かいところはシステムによって異なるが、大まかに言うと、 ブートシーケンスは以"
-"下の段階に分けられる: (1) ハードウェアのブート (2) OS ローダー (3) カーネルの"
-"起動 (4) init と inittab (5) ブートスクリプト"
+"下の段階に分けられる: (1) ハードウェアのブート (2) オペレーティングシステム "
+"(OS) ローダー (3) カーネルの起動 (4) init と inittab (5) ブートスクリプト"
 
 #. type: SS
-#: build/C/man7/boot.7:23
+#: build/C/man7/boot.7:26
 #, no-wrap
 msgid "Hardware-boot"
 msgstr "ハードウェアのブート"
 
 #. type: Plain text
-#: build/C/man7/boot.7:28
+#: build/C/man7/boot.7:31
 msgid ""
 "After power-on or hard reset, control is given to a program stored on read-"
 "only memory (normally PROM).  In PC we usually call this program the B<BIOS>."
@@ -310,7 +330,7 @@ msgstr ""
 "グラムに制御が渡される。 PC ではこのプログラムは通常 B<BIOS> と呼ばれる。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:37
+#: build/C/man7/boot.7:40
 msgid ""
 "This program normally makes a basic self-test of the machine and accesses "
 "nonvolatile memory to read further parameters.  This memory in the PC is "
@@ -325,7 +345,7 @@ msgstr ""
 "しかし PC 以外の世界では、通常 B<nvram> (nonvolatile ram) と呼ばれている。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:42
+#: build/C/man7/boot.7:45
 msgid ""
 "The parameters stored in the nvram vary between systems, but as a minimum, "
 "the hardware boot program should know what is the boot device, or which "
@@ -337,9 +357,9 @@ msgstr ""
 "い。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:46
+#: build/C/man7/boot.7:49
 msgid ""
-"Then the hardware boot stage accesses the boot device, loads the OS Loader, "
+"Then the hardware boot stage accesses the boot device, loads the OS loader, "
 "which is located on a fixed position on the boot device, and transfers "
 "control to it."
 msgstr ""
@@ -348,13 +368,13 @@ msgstr ""
 "す。"
 
 #. type: TP
-#: build/C/man7/boot.7:46 build/C/man7/boot.7:126
+#: build/C/man7/boot.7:49 build/C/man7/boot.7:128
 #, no-wrap
 msgid "Note:"
 msgstr "注意:"
 
 #. type: Plain text
-#: build/C/man7/boot.7:52
+#: build/C/man7/boot.7:55
 msgid ""
 "We do not cover here booting from network.  Those who want to investigate "
 "this subject may want to research: DHCP, TFTP, PXE, Etherboot."
@@ -363,28 +383,28 @@ msgstr ""
 "は、 DHCP, TFTP, PXE, Etherboot 等について調べてみるとよい。"
 
 #. type: SS
-#: build/C/man7/boot.7:52
+#: build/C/man7/boot.7:55
 #, no-wrap
-msgid "OS Loader"
+msgid "OS loader"
 msgstr "OS ローダー"
 
 #. type: Plain text
-#: build/C/man7/boot.7:56
+#: build/C/man7/boot.7:59
 msgid ""
-"In PC, the OS Loader is located in the first sector of the boot device - "
+"In PC, the OS loader is located in the first sector of the boot device - "
 "this is the B<MBR> (Master Boot Record)."
 msgstr ""
 "PC では、OS ローダーはブートデバイスの先頭セクタに置かれる。 これは B<MBR> "
 "(Master Boot Record) と呼ばれる。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:64
+#: build/C/man7/boot.7:67
 msgid ""
 "In most systems, this primary loader is very limited due to various "
 "constraints.  Even on non-PC systems there are some limitations to the size "
 "and complexity of this loader, but the size limitation of the PC MBR (512 "
 "bytes including the partition table) makes it almost impossible to squeeze a "
-"full OS Loader into it."
+"full OS loader into it."
 msgstr ""
 "様々な制約のため、 ほとんどのシステムで第一ローダーは非常に簡単な機能しか持っ"
 "ていない。 PC 以外のシステムでも、 サイズの制限やローダーの機能などにある程度"
@@ -392,7 +412,7 @@ msgstr ""
 "の MBR では、OS ローダーの全機能をここに押し込むのはまず不可能だ。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:68
+#: build/C/man7/boot.7:71
 msgid ""
 "Therefore, most operating systems make the primary loader call a secondary "
 "OS loader which may be located on a specified disk partition."
@@ -401,7 +421,7 @@ msgstr ""
 "後者はあらかじめ指定されたディスクパーティションに置けるようになっている。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:78
+#: build/C/man7/boot.7:81
 msgid ""
 "In Linux the OS loader is normally B<lilo>(8)  or B<grub>(8).  Both of them "
 "may install either as secondary loaders (where the DOS installed MBR points "
@@ -417,9 +437,9 @@ msgstr ""
 "トストラップコードが含まれている。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:86
+#: build/C/man7/boot.7:89
 msgid ""
-"The main job of the OS Loader is to locate the kernel on the disk, load it "
+"The main job of the OS loader is to locate the kernel on the disk, load it "
 "and run it.  Most OS loaders allow interactive use, to enable specification "
 "of alternative kernel (maybe a backup in case the last compiled one isn't "
 "functioning) and to pass optional parameters to the kernel."
@@ -431,13 +451,13 @@ msgstr ""
 "クアップのカーネルを指定して起動するといったことができる)。"
 
 #. type: SS
-#: build/C/man7/boot.7:86
+#: build/C/man7/boot.7:89
 #, no-wrap
-msgid "Kernel Startup"
+msgid "Kernel startup"
 msgstr "カーネルの起動"
 
 #. type: Plain text
-#: build/C/man7/boot.7:91
+#: build/C/man7/boot.7:94
 msgid ""
 "When the kernel is loaded, it initializes the devices (via their drivers), "
 "starts the swapper (it is a \"kernel process\", called kswapd in modern "
@@ -448,7 +468,7 @@ msgstr ""
 "ス」になる)、 ルートファイルシステム (/) をマウントする。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:98
+#: build/C/man7/boot.7:101
 msgid ""
 "Some of the parameters that may be passed to the kernel relate to these "
 "activities (e.g: You can override the default root file system).  For "
@@ -459,7 +479,7 @@ msgstr ""
 "パラメータに関するより詳しい情報は B<bootparam>(7)  を読んでほしい。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:105
+#: build/C/man7/boot.7:108
 msgid ""
 "Only then the kernel creates the first (user land)  process which is "
 "numbered 1.  This process executes the program I</sbin/init>, passing any "
@@ -470,13 +490,13 @@ msgstr ""
 "カーネルによって解釈されていないパラメータはすべて I</sbin/init> に渡される。"
 
 #. type: SS
-#: build/C/man7/boot.7:105
+#: build/C/man7/boot.7:108
 #, no-wrap
 msgid "init and inittab"
 msgstr "init と inittab"
 
 #. type: Plain text
-#: build/C/man7/boot.7:110
+#: build/C/man7/boot.7:113
 msgid ""
 "When init starts it reads I</etc/inittab> for further instructions.  This "
 "file defines what should be run in different I<run-levels>."
@@ -486,22 +506,22 @@ msgstr ""
 "定義する。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:120
+#: build/C/man7/boot.7:123
 msgid ""
 "This gives the system administrator an easy management scheme, where each "
-"run-level is associated with a set of services (e.g: B<S> is I<single-user>, "
-"on B<2> most network services start, etc.).  The administrator may change "
-"the current run-level via B<init>(8)  and query the current run-level via "
+"run-level is associated with a set of services (e.g, B<S> is I<single-user>, "
+"on B<2> most network services start).  The administrator may change the "
+"current run-level via B<init>(8)  and query the current run-level via "
 "B<runlevel>(8)."
 msgstr ""
-"これによってシステム管理者の管理が楽になる。 各I<ランレベル>は提供するサービ"
-"スの集合に対応する (例えば B<S> は I<シングルユーザ>、 B<2> では大抵のネット"
-"ワークサービスを起動する、など)。 システム管理者は、 B<init>(8)  を用いて現在"
-"のランレベルを変更でき、 B<runlevel>(8)  によって現在のランレベルを確認でき"
-"る。"
+"これによってシステム管理者の管理が楽になる。各I<ランレベル>は提供する\n"
+"サービスの集合に対応する (例えば、 B<S> は I<シングルユーザ>、 B<2> で\n"
+"は大抵のネットワークサービスを起動する)。\n"
+"システム管理者は、 B<init>(8) を用いて現在のランレベルを変更でき、\n"
+"B<runlevel>(8) によって現在のランレベルを確認できる。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:124
+#: build/C/man7/boot.7:127
 msgid ""
 "However, since it is not convenient to manage individual services by editing "
 "this file, inittab only bootstraps a set of scripts that actually start/stop "
@@ -512,13 +532,13 @@ msgstr ""
 "個々のサービスの起動や停止は、これらのスクリプトで行う。"
 
 #. type: SS
-#: build/C/man7/boot.7:124
+#: build/C/man7/boot.7:127
 #, no-wrap
-msgid "Boot Scripts"
+msgid "Boot scripts"
 msgstr "ブートスクリプト"
 
 #. type: Plain text
-#: build/C/man7/boot.7:134
+#: build/C/man7/boot.7:136
 msgid ""
 "The following description applies to System V release 4-based systems, which "
 "currently covers most commercial UNIX systems (Solaris, HP-UX, Irix, Tru64)  "
@@ -533,7 +553,7 @@ msgstr ""
 "らか異なることもある (Slackware Linux, FreeBSD, OpenBSD など)。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:147
+#: build/C/man7/boot.7:149
 msgid ""
 "For each managed service (mail, nfs server, cron, etc.) there is a single "
 "startup script located in a specific directory (I</etc/init.d> in most "
@@ -554,13 +574,13 @@ msgstr ""
 "る。"
 
 #. type: SS
-#: build/C/man7/boot.7:147
+#: build/C/man7/boot.7:149
 #, no-wrap
-msgid "Sequencing Directories"
+msgid "Sequencing directories"
 msgstr "順序づけディレクトリ"
 
 #. type: Plain text
-#: build/C/man7/boot.7:155
+#: build/C/man7/boot.7:157
 msgid ""
 "To make specific scripts start/stop at specific run-levels and in specific "
 "order, there are I<sequencing directories>.  These are normally in I</etc/rc"
@@ -573,7 +593,7 @@ msgstr ""
 "トリに置かれたスクリプトへのリンク (ふつうはシンボリックリンク)  が置かれる。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:164
+#: build/C/man7/boot.7:166
 msgid ""
 "A primary script (usually I</etc/rc>) is called from B<inittab>(5)  and "
 "calls the services scripts via the links in the sequencing directories.  All "
@@ -589,7 +609,7 @@ msgstr ""
 "けて呼び出される (すなわちサービスが停止する)。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:174
+#: build/C/man7/boot.7:176
 msgid ""
 "To define the starting or stopping order within the same run-level, the "
 "names of the links contain order-numbers.  Also, to make the names clearer, "
@@ -606,7 +626,7 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:179
+#: build/C/man7/boot.7:181
 msgid ""
 "To manage the boot order and run-levels, we have to manage these links.  "
 "However, on many versions of Linux, there are tools to help with this task "
@@ -617,13 +637,13 @@ msgstr ""
 "くれるツールが存在する (例えば B<chkconfig>(8)  など)。"
 
 #. type: SS
-#: build/C/man7/boot.7:179
+#: build/C/man7/boot.7:181
 #, no-wrap
-msgid "Boot Configuration"
+msgid "Boot configuration"
 msgstr "ブートの設定"
 
 #. type: Plain text
-#: build/C/man7/boot.7:188
+#: build/C/man7/boot.7:190
 msgid ""
 "Usually the daemons started may optionally receive command-line options and "
 "parameters.  To allow system administrators to change these parameters "
@@ -638,7 +658,7 @@ msgstr ""
 "れ、ブートスクリプトから参照される。"
 
 #. type: Plain text
-#: build/C/man7/boot.7:195
+#: build/C/man7/boot.7:197
 msgid ""
 "In older UNIX systems, these files contained the actual command line options "
 "for the daemons, but in modern Linux systems (and also in HP-UX), these "
@@ -652,42 +672,42 @@ msgstr ""
 "値を用いる。"
 
 #. type: SH
-#: build/C/man7/boot.7:195
+#: build/C/man7/boot.7:197
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: Plain text
-#: build/C/man7/boot.7:200
+#: build/C/man7/boot.7:202
 msgid "I</etc/init.d/>, I</etc/rc[S0-6].d/>, I</etc/sysconfig/>"
 msgstr "I</etc/init.d/>, I</etc/rc[S0-6].d/>, I</etc/sysconfig/>"
 
 #. type: Plain text
-#: build/C/man7/boot.7:206
+#: build/C/man7/boot.7:208
 msgid ""
 "B<inittab>(5), B<bootparam>(7), B<init>(8), B<runlevel>(8), B<shutdown>(8)"
 msgstr ""
 "B<inittab>(5), B<bootparam>(7), B<init>(8), B<runlevel>(8), B<shutdown>(8)"
 
 #. type: TH
-#: build/C/man7/bootparam.7:29
+#: build/C/man7/bootparam.7:30
 #, no-wrap
 msgid "BOOTPARAM"
 msgstr "BOOTPARAM"
 
 #. type: TH
-#: build/C/man7/bootparam.7:29
+#: build/C/man7/bootparam.7:30
 #, no-wrap
-msgid "2007-12-16"
-msgstr "2007-12-16"
+msgid "2013-06-08"
+msgstr "2013-06-08"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:32
-msgid "bootparam - Introduction to boot time parameters of the Linux kernel"
+#: build/C/man7/bootparam.7:33
+msgid "bootparam - introduction to boot time parameters of the Linux kernel"
 msgstr "bootparam - Linux カーネル起動時パラメータの解説"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:39
+#: build/C/man7/bootparam.7:40
 msgid ""
 "The Linux kernel accepts certain 'command-line options' or 'boot time "
 "parameters' at the moment it is started.  In general this is used to supply "
@@ -701,94 +721,62 @@ msgstr ""
 "に無効にしたり変更したりする場合に用いる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:49
+#: build/C/man7/bootparam.7:46
 msgid ""
 "When the kernel is booted directly by the BIOS (say from a floppy to which "
 "you copied a kernel using 'cp zImage /dev/fd0'), you have no opportunity to "
 "specify any parameters.  So, in order to take advantage of this possibility "
-"you have to use software that is able to pass parameters, like LILO or "
-"loadlin.  For a few parameters one can also modify the kernel image itself, "
-"using rdev, see B<rdev>(8)  for further details."
-msgstr ""
-"カーネルが BIOS から直接起動されるとき (たとえば 'cp zImage /dev/fd0' でフ"
-"ロッピーにコピーしたカーネルから起動するなど) は、 パラメータを指定する機会は"
-"ない。 ゆえに、この起動時パラメータ機能を利用するためには、 I<LILO> や "
-"I<loadlin> のようにパラメータを指定できるソフトウェアを使用しなければならな"
-"い。 いくつかのパラメータについては、 I<rdev> を使ってカーネルイメージそのも"
-"のを修正することもできる。 詳細は B<rdev>(8)  を参照のこと。"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:59
-msgid ""
-"The LILO program (LInux LOader) written by Werner Almesberger is the most "
-"commonly used.  It has the ability to boot various kernels, and stores the "
-"configuration information in a plain text file.  (See B<lilo>(8)  and B<lilo."
-"conf>(5).)  LILO can boot DOS, OS/2, Linux, FreeBSD, UnixWare, etc., and is "
-"quite flexible."
-msgstr ""
-"Werner Almesberger による LILO (LInux LOader) プログラムは最も広く使用されて"
-"いる。 LILO はいろいろなカーネルを選択してブートさせることができ、 設定情報を"
-"テキストファイルに保持する (B<lilo>(8)  と B<lilo.conf>(5)  を参照)。 LILO "
-"は DOS, OS/2, Linux, FreeBSD などを起動でき、 非常に柔軟である。"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:64
-msgid ""
-"The other commonly used Linux loader is 'LoadLin' which is a DOS program "
-"that has the capability to launch a Linux kernel from the DOS prompt (with "
-"boot-args) assuming that certain resources are available.  This is good for "
-"people that want to launch Linux from DOS."
-msgstr ""
-"ほかには I<loadLin> もよく使われている Linux ローダである。 これは DOS のプロ"
-"グラムで、DOS プロンプトから (起動時引数とともに) Linux カーネルを起動できる "
-"(いくつかの特定のリソースが利用可能でなければならない)。 loadlin は DOS から "
-"Linux を起動させたい人にあっている。"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:73
-msgid ""
-"It is also very useful if you have certain hardware which relies on the "
-"supplied DOS driver to put the hardware into a known state.  A common "
-"example is 'SoundBlaster Compatible' sound cards that require the DOS driver "
-"to twiddle a few mystical registers to put the card into a SB compatible "
-"mode.  Booting DOS with the supplied driver, and then loading Linux from the "
-"DOS prompt with loadlin avoids the reset of the card that happens if one "
-"rebooted instead."
-msgstr ""
-"また loadlin は、DOS のドライバである状態に 設定しなければならないハードウェ"
-"アを 使っている場合にも非常に便利である。 よくある例は 「SoundBlaster 互換」"
-"のサウンドカードで、 これらの中には DOS のドライバを使って いくつか秘密のレジ"
-"スタをいじってやらないと、 本当の SB 互換モードにはならないようなものがあ"
-"る。 まずハードウェアについてきたドライバを組み込んで DOS を起動し、 その後 "
-"loadlin を使用して Linux カーネルを読み込めば、 リブートによってカードの設定"
-"がリセットされるのを防げるわけだ。"
-
+"you have to use a boot loader that is able to pass parameters, such as GRUB."
+msgstr "カーネルが BIOS から直接起動されるとき (たとえば 'cp zImage /dev/fd0' でフロッピーにコピーしたカーネルから起動するなど) は、 パラメータを指定する機会はない。 そのため、この起動時パラメータ機能を利用するためには、 GRUB のようなパラメータを指定できるブートローダーを使用しなければならない。"
+
+#.  The LILO program (LInux LOader) written by Werner Almesberger is the
+#.  most commonly used.
+#.  It has the ability to boot various kernels, and
+#.  stores the configuration information in a plain text file.
+#.  (See
+#.  .BR lilo (8)
+#.  and
+#.  .BR lilo.conf (5).)
+#.  LILO can boot DOS, OS/2, Linux, FreeBSD, UnixWare, etc., and is quite flexible.
+#.  The other commonly used Linux loader is 'LoadLin', which is a DOS
+#.  program that has the capability to launch a Linux kernel from the DOS
+#.  prompt (with boot-args) assuming that certain resources are available.
+#.  This is good for people that want to launch Linux from DOS.
+#.  It is also very useful if you have certain hardware which relies on
+#.  the supplied DOS driver to put the hardware into a known state.
+#.  A common example is 'SoundBlaster Compatible' sound cards that require
+#.  the DOS driver to twiddle a few mystical registers to put the card
+#.  into a SB compatible mode.
+#.  Booting DOS with the supplied driver, and
+#.  then loading Linux from the DOS prompt with loadlin avoids the reset
+#.  of the card that happens if one rebooted instead.
 #. type: SS
-#: build/C/man7/bootparam.7:73
+#: build/C/man7/bootparam.7:70
 #, no-wrap
-msgid "The Argument List"
+msgid "The argument list"
 msgstr "引数リスト"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:77
+#: build/C/man7/bootparam.7:74
 msgid ""
 "The kernel command line is parsed into a list of strings (boot arguments) "
-"separated by spaces.  Most of the boot args take the form of:"
+"separated by spaces.  Most of the boot arguments take have the form:"
 msgstr ""
-"カーネルのコマンドラインはスペースで区切られた文字列 (I<起動時引数: boot "
-"arguments>)  のリストから成っている。ほとんどの起動時引数は次の書式に従う。"
+"カーネルのコマンドラインはパースされ、スペースで区切られた文字列 (I<起動時引"
+"数: boot arguments>)  のリストとなる。 ほとんどの起動時引数は次の書式である。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:79
-msgid "name[=value_1][,value_2]...[,value_10]"
-msgstr "name[=value_1][,value_2]...[,value_10]"
+#: build/C/man7/bootparam.7:78
+#, no-wrap
+msgid "name[=value_1][,value_2]...[,value_10]\n"
+msgstr "name[=value_1][,value_2]...[,value_10]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:87
+#: build/C/man7/bootparam.7:88
 msgid ""
 "where 'name' is a unique keyword that is used to identify what part of the "
 "kernel the associated values (if any) are to be given to.  Note the limit of "
-"10 is real, as the present code only handles 10 comma separated parameters "
+"10 is real, as the present code handles only 10 comma separated parameters "
 "per keyword.  (However, you can reuse the same keyword with up to an "
 "additional 10 parameters in unusually complicated situations, assuming the "
 "setup function supports it.)"
@@ -802,20 +790,20 @@ msgstr ""
 "だが。)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:93
+#: build/C/man7/bootparam.7:95
 msgid ""
-"Most of the sorting goes on in linux/init/main.c.  First, the kernel checks "
-"to see if the argument is any of the special arguments 'root=', "
-"\\&'nfsroot=', 'nfsaddrs=', 'ro', 'rw', 'debug' or 'init'.  The meaning of "
-"these special arguments is described below."
+"Most of the sorting is coded in the kernel source file I<init/main.c>.  "
+"First, the kernel checks to see if the argument is any of the special "
+"arguments 'root=', \\&'nfsroot=', 'nfsaddrs=', 'ro', 'rw', 'debug' or "
+"'init'.  The meaning of these special arguments is described below."
 msgstr ""
-"カーネルコマンドラインの扱いはほとんど linux/init/main.c が行なっている。 初"
-"めに、カーネルは \\&'root=', 'nfsroot=', 'nfsaddrs=', 'ro', 'rw', 'debug', "
-"'init' といった特別な引数があるかをチェックする。 これらの意味については後述"
-"する。"
+"カーネルコマンドラインの識別はほとんどがカーネルソースファイル I<init/main."
+"c> に書かれている。 最初に、カーネルは \\&'root=', 'nfsroot=', 'nfsaddrs=', "
+"'ro', 'rw', 'debug', 'init' といった特別な引数があるかをチェックする。 これら"
+"の意味については後述する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:104
+#: build/C/man7/bootparam.7:106
 msgid ""
 "Then it walks a list of setup functions (contained in the bootsetups array) "
 "to see if the specified argument string (such as 'foo') has been associated "
@@ -834,7 +822,7 @@ msgstr ""
 "インに与えられた引数である 3, 4, 5, 6 を設定関数に渡す。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:110
+#: build/C/man7/bootparam.7:112
 msgid ""
 "Anything of the form 'foo=bar' that is not accepted as a setup function as "
 "described above is then interpreted as an environment variable to be set.  A "
@@ -845,37 +833,38 @@ msgstr ""
 "ては、'TERM=VT100' がある。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:120
+#: build/C/man7/bootparam.7:128
 msgid ""
 "Any remaining arguments that were not picked up by the kernel and were not "
 "interpreted as environment variables are then passed onto process one, which "
-"is usually the init program.  The most common argument that is passed to the "
-"init process is the word 'single' which instructs init to boot the computer "
-"in single user mode, and not launch all the usual daemons.  Check the manual "
-"page for the version of init installed on your system to see what arguments "
-"it accepts."
+"is usually the B<init>(1)  program.  The most common argument that is passed "
+"to the I<init> process is the word 'single' which instructs it to boot the "
+"computer in single user mode, and not launch all the usual daemons.  Check "
+"the manual page for the version of B<init>(1)  installed on your system to "
+"see what arguments it accepts."
 msgstr ""
 "カーネルによって処理されず、環境変数としても解釈されなかった 残りの引数は、プ"
-"ロセス 1 に渡されることになる。 通常このプロセス 1 は I<init> プログラムであ"
-"る。 プロセス 1 に渡される引数で最も良く使われるのは、 \\&'single' というキー"
-"ワードである。 これを指定すると init はシングルユーザモードでコンピュータを起"
-"動し、 通常使われるデーモンは一切起動しない。 システムにインストールされてい"
-"る init が どんな引数を受け付けるかは、 マニュアルページで調べること。"
+"ロセス 1 に渡されることになる。 通常このプロセス 1 は B<init>(1) プログラムで"
+"ある。 I<init> プロセスに渡される引数で最もよく使われるのは、 'single' という"
+"キーワードである。 これを指定すると init はシングルユーザモードでコンピュータ"
+"を起動し、 通常使われるデーモンは一切起動しない。 システムにインストールされ"
+"ている B<init>(1) が どんな引数を受け付けるかは、 マニュアルページで調べるこ"
+"と。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:120
+#: build/C/man7/bootparam.7:128
 #, no-wrap
-msgid "General Non-device Specific Boot Arguments"
+msgid "General non-device specific boot arguments"
 msgstr "一般的な、デバイス固有ではない起動時引き数"
 
 #. type: TP
-#: build/C/man7/bootparam.7:121
+#: build/C/man7/bootparam.7:129
 #, no-wrap
 msgid "B<'init=...'>"
 msgstr "B<'init=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:133
+#: build/C/man7/bootparam.7:141
 msgid ""
 "This sets the initial command to be executed by the kernel.  If this is not "
 "set, or cannot be found, the kernel will try I</sbin/init>, then I</etc/"
@@ -887,13 +876,13 @@ msgstr ""
 "起こす。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:133
+#: build/C/man7/bootparam.7:141
 #, no-wrap
 msgid "B<'nfsaddrs=...'>"
 msgstr "B<'nfsaddrs=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:137
+#: build/C/man7/bootparam.7:145
 msgid ""
 "This sets the nfs boot address to the given string.  This boot address is "
 "used in case of a net boot."
@@ -902,13 +891,13 @@ msgstr ""
 "ワークブートの場合に用いられる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:137
+#: build/C/man7/bootparam.7:145
 #, no-wrap
 msgid "B<'nfsroot=...'>"
 msgstr "B<'nfsroot=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:144
+#: build/C/man7/bootparam.7:152
 msgid ""
 "This sets the nfs root name to the given string.  If this string does not "
 "begin with '/' or ',' or a digit, then it is prefixed by \\&'/tftpboot/'.  "
@@ -919,20 +908,20 @@ msgstr ""
 "トの場合に用いられる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:144
+#: build/C/man7/bootparam.7:152
 #, no-wrap
 msgid "B<'no387'>"
 msgstr "B<'no387'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:157
+#: build/C/man7/bootparam.7:165
 msgid ""
 "(Only when B<CONFIG_BUGi386> is defined.)  Some i387 coprocessor chips have "
 "bugs that show up when used in 32 bit protected mode.  For example, some of "
 "the early ULSI-387 chips would cause solid lockups while performing floating-"
-"point calculations.  Using the 'no387' boot arg causes Linux to ignore the "
-"maths coprocessor even if you have one.  Of course you must then have your "
-"kernel compiled with math emulation support!"
+"point calculations.  Using the 'no387' boot argument causes Linux to ignore "
+"the maths coprocessor even if you have one.  Of course you must then have "
+"your kernel compiled with math emulation support!"
 msgstr ""
 "(カーネルのコンパイル時に B<CONFIG_BUGi386> が指定されたときのみ有効。)  一部"
 "の i387 コプロセッサチップには、 32 ビットプロテクトモードでの使用時に生じる"
@@ -943,13 +932,13 @@ msgstr ""
 "らない!"
 
 #. type: TP
-#: build/C/man7/bootparam.7:157
+#: build/C/man7/bootparam.7:165
 #, no-wrap
 msgid "B<'no-hlt'>"
 msgstr "B<'no-hlt'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:170
+#: build/C/man7/bootparam.7:178
 msgid ""
 "(Only when B<CONFIG_BUGi386> is defined.)  Some of the early i486DX-100 "
 "chips have a problem with the 'hlt' instruction, in that they can't reliably "
@@ -965,32 +954,30 @@ msgstr ""
 "る。 これによって、そのようなバグのあるチップでも Linux を使用できる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:170
+#: build/C/man7/bootparam.7:178
 #, no-wrap
 msgid "B<'root=...'>"
 msgstr "B<'root=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:182
+#: build/C/man7/bootparam.7:188
 msgid ""
 "This argument tells the kernel what device is to be used as the root file "
 "system while booting.  The default of this setting is determined at compile "
 "time, and usually is the value of the root device of the system that the "
 "kernel was built on.  To override this value, and select the second floppy "
-"drive as the root device, one would use 'root=/dev/fd1'.  (The root device "
-"can also be set using B<rdev>(8).)"
+"drive as the root device, one would use 'root=/dev/fd1'."
 msgstr ""
 "起動時にルートファイルシステムとして使われるデバイスをカーネルに指定する。 デ"
 "フォルトはコンパイル時に決定され、 通常はカーネルを構築したシステムのルートデ"
 "バイスになる。 この値を無効にして、 例えば 2 番目のフロッピーディスクドライブ"
-"をルートデバイスに指定する場合は、 \\&'root=/dev/fd1' とする。 (ルートデバイ"
-"スは B<rdev>(8)  を用いても設定できる。)"
+"をルートデバイスに指定する場合は、 \\&'root=/dev/fd1' とする。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:198
+#: build/C/man7/bootparam.7:206
 msgid ""
 "The root device can be specified symbolically or numerically.  A symbolic "
-"specification has the form /dev/XXYN, where XX designates the device type "
+"specification has the form I</dev/XXYN>, where XX designates the device type "
 "('hd' for ST-506 compatible hard disk, with Y in \\&'a'-'d'; 'sd' for SCSI "
 "compatible disk, with Y in 'a'-'e'; \\&'ad' for Atari ACSI disk, with Y in "
 "'a'-'e', \\&'ez' for a Syquest EZ135 parallel port removable drive, with "
@@ -1003,10 +990,10 @@ msgid ""
 "nfs specifies a net boot; ram refers to a ram disk.)"
 msgstr ""
 "ルートデバイスの指定にはシンボル形式と数値形式を用いることができる。 シンボル"
-"形式の場合は /dev/XXYN という書式で指定する。 XX にはデバイスタイプを指定す"
-"る。 Y にはドライブレターもしくはドライブ番号、 N には (フロッピーディスクを"
-"除く) ディスクの パーティション番号を 10 進数の数値で指定する。 (ST-506 互換"
-"ハードディスクではデバイスタイプが 'hd' で Y の範囲は 'a' から 'd'、 SCSI "
+"形式の場合は I</dev/XXYN> という書式で指定する。 XX にはデバイスタイプを指定"
+"する。 Y にはドライブレターもしくはドライブ番号、 N には (フロッピーディスク"
+"を除く) ディスクの パーティション番号を 10 進数の数値で指定する。 (ST-506 互"
+"換ハードディスクではデバイスタイプが 'hd' で Y の範囲は 'a' から 'd'、 SCSI "
 "ディスクは 'sd' で Y は 'a' から 'e'、 Atari ACSI ディスクは 'ad' で Y は "
 "'a' から 'e'、 Syquest EZ135 パラレルポートリムーバブルディスクは 'ez' で Y "
 "は 'a' のみ、 XT ディスクは 'xt' で Y は 'a' か 'b'、 フロッピーディスクは "
@@ -1017,7 +1004,7 @@ msgstr ""
 "(nfs はネットワークブートに、ram は RAM ディスクを使用する場合に用いる。)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:202
+#: build/C/man7/bootparam.7:210
 msgid ""
 "Note that this has nothing to do with the designation of these devices on "
 "your file system.  The '/dev/' part is purely conventional."
@@ -1026,24 +1013,45 @@ msgstr ""
 "\\&'/dev/' を用いるのは単に慣習に過ぎない。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:207
+#: build/C/man7/bootparam.7:217
 msgid ""
 "The more awkward and less portable numeric specification of the above "
-"possible root devices in major/minor format is also accepted.  (E.g., /dev/"
-"sda3 is major 8, minor 3, so you could use 'root=0x803' as an alternative.)"
+"possible root devices in major/minor format is also accepted.  (E.g., I</dev/"
+"sda3> is major 8, minor 3, so you could use 'root=0x803' as an alternative.)"
 msgstr ""
 "扱いにくいし移植性も良くないが、 上記のデバイスを major/minor 番号の数値で指"
-"定してもよい。 (例えば /dev/sda3 は major 番号 8、minor 番号 3 なので、 "
+"定してもよい。 (例えば I</dev/sda3> は major 番号 8、minor 番号 3 なので、 "
 "\\&'root=0x803' と記述できる。)"
 
 #. type: TP
-#: build/C/man7/bootparam.7:207
+#: build/C/man7/bootparam.7:217
+#, no-wrap
+msgid "B<'rootfstype=...'>"
+msgstr "B<'rootfstype=...'>"
+
+#. type: Plain text
+#: build/C/man7/bootparam.7:225
+msgid ""
+"The 'rootfstype' option tells the kernel to mount the root filesystem as if "
+"it where of the type specified.  This can be useful (for example) to mount "
+"an ext3 filesystem as ext2 and then remove the journal in the root "
+"filesystem, in fact reverting its format from ext3 to ext2 without the need "
+"to boot the box from alternate media."
+msgstr ""
+"'rootfstype' オプションが指定されると、 カーネルは、 指定されたタイプであると"
+"みなしてルートファイルシステムをマウントする。 このオプションは、 例えば、"
+"ext3 ファイルシステムを ext2 としてマウントし、 ルートファイルシステムの"
+"ジャーナルを削除する場合に便利である。 こうすると、 別のメディアからマシンを"
+"起動することなく ext3 から ext2 へ戻すことができる。"
+
+#. type: TP
+#: build/C/man7/bootparam.7:225
 #, no-wrap
 msgid "B<'ro'> and B<'rw'>"
 msgstr "B<'ro'> と B<'rw'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:217
+#: build/C/man7/bootparam.7:235
 msgid ""
 "The 'ro' option tells the kernel to mount the root file system as 'read-"
 "only' so that file system consistency check programs (fsck)  can do their "
@@ -1051,14 +1059,14 @@ msgid ""
 "file system in question until it is 'remounted' as read/write capable, for "
 "example, by 'mount -w -n -o remount /'.  (See also B<mount>(8).)"
 msgstr ""
-"\\&'ro' オプションは、ルートファイルシステムを 「読み出し専用」でマウントする"
-"ようカーネルに指示し、 fsck プログラムがファイルシステムの矛盾を検査できるよ"
-"うにする。 ファイルシステムが「読み書き可能」として再マウントされる (つまり "
-"'mount -w -n -o remount /') までの間は、 いかなるプロセスもこのファイルシステ"
-"ム上のファイルに書き込むことはできない。 (B<mount>(8)  も参照せよ。)"
+"\\&'ro' オプションは、 ルートファイルシステムを 「読み出し専用」でマウントす"
+"るようカーネルに指示し、 fsck プログラムがファイルシステムの矛盾を検査できる"
+"ようにする。 ファイルシステムが「読み書き可能」として再マウントされる (つま"
+"り 'mount -w -n -o remount /') までの間は、 いかなるプロセスもこのファイルシ"
+"ステム上のファイルに書き込むことはできない。 (B<mount>(8)  も参照。)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:220
+#: build/C/man7/bootparam.7:238
 msgid ""
 "The 'rw' option tells the kernel to mount the root file system read/write.  "
 "This is the default."
@@ -1066,22 +1074,37 @@ msgstr ""
 "rw オプションはルートファイルシステムを 「読み書き可能」でマウントするよう"
 "カーネルに指示する。 こちらがデフォルトである。"
 
+#. type: TP
+#: build/C/man7/bootparam.7:239
+#, no-wrap
+msgid "B<'resume=...'>"
+msgstr "B<'resume=...'>"
+
 #. type: Plain text
-#: build/C/man7/bootparam.7:223
+#: build/C/man7/bootparam.7:243
 msgid ""
-"The choice between read-only and read/write can also be set using B<rdev>(8)."
+"This tells the kernel the location of the suspend-to-disk data that you want "
+"the machine to resume from after hibernation.  Usually, it is the same as "
+"your swap partition or file. Example:"
 msgstr ""
-"省略時の指定を「読み出し専用」と 「読み書き可能」とのどちらにするかは、 "
-"B<rdev>(8)  によっても設定できる。"
+"このオプションは、 マシンを休止状態 (ハイバネーション) から再起動する際の、"
+"ディスク上に保存したデータの起動位置をカーネルに指示する。 通常は、スワップ"
+"パーティションやスワップファイルと同じである。例えば、"
+
+#. type: Plain text
+#: build/C/man7/bootparam.7:247
+#, no-wrap
+msgid "resume=/dev/hda2\n"
+msgstr "resume=/dev/hda2\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:223
+#: build/C/man7/bootparam.7:249
 #, no-wrap
 msgid "B<'reserve=...'>"
 msgstr "B<'reserve=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:227
+#: build/C/man7/bootparam.7:253
 msgid ""
 "This is used to protect I/O port regions from probes.  The form of the "
 "command is:"
@@ -1090,12 +1113,13 @@ msgstr ""
 "下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:229
-msgid "B<reserve=>I<iobase,extent[,iobase,extent]...>"
-msgstr "B<reserve=>I<iobase,extent[,iobase,extent]...>"
+#: build/C/man7/bootparam.7:257
+#, no-wrap
+msgid "B<reserve=>I<iobase,extent[,iobase,extent]...>\n"
+msgstr "B<reserve=>I<iobase,extent[,iobase,extent]...>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:236
+#: build/C/man7/bootparam.7:266
 msgid ""
 "In some machines it may be necessary to prevent device drivers from checking "
 "for devices (auto-probing) in a specific region.  This may be because of "
@@ -1109,7 +1133,7 @@ msgstr ""
 "ハードウェアを初期化させたくない場合などがありうるだろう。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:241
+#: build/C/man7/bootparam.7:271
 msgid ""
 "The reserve boot-time argument specifies an I/O port region that shouldn't "
 "be probed.  A device driver will not probe a reserved region, unless another "
@@ -1120,17 +1144,18 @@ msgstr ""
 "約された範囲に対して自動検出動作を行わない。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:243
+#: build/C/man7/bootparam.7:273
 msgid "For example, the boot line"
 msgstr "例えばブート時のコマンドラインに"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:245
-msgid "reserve=0x300,32 blah=0x300"
-msgstr "reserve=0x300,32 blah=0x300"
+#: build/C/man7/bootparam.7:277
+#, no-wrap
+msgid "reserve=0x300,32  blah=0x300\n"
+msgstr "reserve=0x300,32  blah=0x300\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:248
+#: build/C/man7/bootparam.7:282
 msgid ""
 "keeps all device drivers except the driver for 'blah' from probing "
 "0x300-0x31f."
@@ -1139,19 +1164,19 @@ msgstr ""
 "を自動検出の対象外とする。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:248
+#: build/C/man7/bootparam.7:282
 #, no-wrap
 msgid "B<'mem=...'>"
 msgstr "B<'mem=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:261
+#: build/C/man7/bootparam.7:295
 msgid ""
 "The BIOS call defined in the PC specification that returns the amount of "
-"installed memory was only designed to be able to report up to 64MB.  Linux "
+"installed memory was designed only to be able to report up to 64MB.  Linux "
 "uses this BIOS call at boot to determine how much memory is installed.  If "
-"you have more than 64MB of RAM installed, you can use this boot arg to tell "
-"Linux how much memory you have.  The value is in decimal or hexadecimal "
+"you have more than 64MB of RAM installed, you can use this boot argument to "
+"tell Linux how much memory you have.  The value is in decimal or hexadecimal "
 "(prefix 0x), and the suffixes 'k' (times 1024) or 'M' (times 1048576) can be "
 "used.  Here is a quote from Linus on usage of the 'mem=' parameter."
 msgstr ""
@@ -1164,7 +1189,7 @@ msgstr ""
 "る 'mem=' パラメータの解説である。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:268
+#: build/C/man7/bootparam.7:302
 msgid ""
 "The kernel will accept any 'mem=xx' parameter you give it, and if it turns "
 "out that you lied to it, it will crash horribly sooner or later.  The "
@@ -1179,7 +1204,7 @@ msgstr ""
 "のマシンなら 'mem=0x6000000' だ。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:280
+#: build/C/man7/bootparam.7:314
 msgid ""
 "B<NOTE>: some machines might use the top of memory for BIOS caching or "
 "whatever, so you might not actually have up to the full 96MB addressable.  "
@@ -1198,7 +1223,7 @@ msgstr ""
 "いかもしれないけど、ゆくゆくは確実にね。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:285
+#: build/C/man7/bootparam.7:319
 msgid ""
 "You can also use the boot argument 'mem=nopentium' to turn off 4 MB page "
 "tables on kernels configured for IA32 systems with a pentium or newer CPU."
@@ -1208,30 +1233,36 @@ msgstr ""
 "ことができる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:285
+#: build/C/man7/bootparam.7:319
 #, no-wrap
 msgid "B<'panic=N'>"
 msgstr "B<'panic=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:290
+#: build/C/man7/bootparam.7:324
 msgid ""
 "By default the kernel will not reboot after a panic, but this option will "
 "cause a kernel reboot after N seconds (if N is greater than zero).  This "
-"panic timeout can also be set by \"echo N E<gt> /proc/sys/kernel/panic\"."
+"panic timeout can also be set by"
 msgstr ""
 "デフォルトでは、カーネルはパニックの後リブートしない。 このオプションを用い"
 "て (N を 0 より大きな値とすれば)  N 秒後にリブートするようになる。 この値は、"
-"起動後に \"echo N E<gt> /proc/sys/kernel/panic\" として設定することもできる。"
+"起動後に以下のようにして設定することもできる。"
+
+#. type: Plain text
+#: build/C/man7/bootparam.7:328
+#, no-wrap
+msgid "echo N E<gt> /proc/sys/kernel/panic\n"
+msgstr "echo N E<gt> /proc/sys/kernel/panic\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:290
+#: build/C/man7/bootparam.7:330
 #, no-wrap
 msgid "B<'reboot=[warm|cold][,[bios|hard]]'>"
 msgstr "B<'reboot=[warm|cold][,[bios|hard]]'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:305
+#: build/C/man7/bootparam.7:345
 msgid ""
 "(Only when B<CONFIG_BUGi386> is defined.)  Since 2.0.22 a reboot is by "
 "default a cold reboot.  One asks for the old default with 'reboot=warm'.  (A "
@@ -1253,13 +1284,13 @@ msgstr ""
 "る。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:305
+#: build/C/man7/bootparam.7:345
 #, no-wrap
 msgid "B<'nosmp'> and B<'maxcpus=N'>"
 msgstr "B<'nosmp'> と B<'maxcpus=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:311
+#: build/C/man7/bootparam.7:351
 msgid ""
 "(Only when __SMP__ is defined.)  A command-line option of 'nosmp' or "
 "'maxcpus=0' will disable SMP activation entirely; an option 'maxcpus=N' "
@@ -1271,19 +1302,19 @@ msgstr ""
 "効にする CPU の最大数を N に制限する。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:311
+#: build/C/man7/bootparam.7:351
 #, no-wrap
-msgid "Boot Arguments for Use by Kernel Developers"
+msgid "Boot arguments for use by kernel developers"
 msgstr "カーネル開発者用の起動時引数"
 
 #. type: TP
-#: build/C/man7/bootparam.7:312
+#: build/C/man7/bootparam.7:352
 #, no-wrap
 msgid "B<'debug'>"
 msgstr "B<'debug'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:328
+#: build/C/man7/bootparam.7:369
 msgid ""
 "Kernel messages are handed off to the kernel log daemon klogd so that they "
 "may be logged to disk.  Messages with a priority above I<console_loglevel> "
@@ -1300,16 +1331,16 @@ msgstr ""
 "あらゆるメッセージを記録するよう設定されている (デバッグメッセージは含まな"
 "い)。 この起動時引数を指定すると、 カーネルはプライオリティが DEBUG のメッ"
 "セージも出力するようになる。 I<console_loglevel> も klogd にオプションを渡せ"
-"ば実行時に設定できる。 B<klogd>(8)  を見よ。"
+"ば実行時に設定できる。 B<klogd>(8)  を参照。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:328
+#: build/C/man7/bootparam.7:369
 #, no-wrap
 msgid "B<'profile=N'>"
 msgstr "B<'profile=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:346
+#: build/C/man7/bootparam.7:387
 msgid ""
 "It is possible to enable a kernel profiling function, if one wishes to find "
 "out where the kernel is spending its CPU cycles.  Profiling is enabled by "
@@ -1333,12 +1364,13 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:348
-msgid "profile[address E<gt>E<gt> prof_shift]++;"
-msgstr "profile[address E<gt>E<gt> prof_shift]++;"
+#: build/C/man7/bootparam.7:391
+#, no-wrap
+msgid "profile[address E<gt>E<gt> prof_shift]++;\n"
+msgstr "profile[address E<gt>E<gt> prof_shift]++;\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:355
+#: build/C/man7/bootparam.7:400
 msgid ""
 "The raw profiling information can be read from I</proc/profile>.  Probably "
 "you'll want to use a tool such as readprofile.c to digest it.  Writing to I</"
@@ -1349,13 +1381,13 @@ msgstr ""
 "profile> に任意のデータを書込むと、 カウンタはリセットされる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:355
+#: build/C/man7/bootparam.7:400
 #, no-wrap
 msgid "B<'swap=N1,N2,N3,N4,N5,N6,N7,N8'>"
 msgstr "B<'swap=N1,N2,N3,N4,N5,N6,N7,N8'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:361
+#: build/C/man7/bootparam.7:406
 msgid ""
 "Set the eight parameters max_page_age, page_advance, page_decline, "
 "page_initial_age, age_cluster_fract, age_cluster_min, pageout_weight, "
@@ -1368,13 +1400,13 @@ msgstr ""
 "カーネルをチューンする人のためのオプションである。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:361
+#: build/C/man7/bootparam.7:406
 #, no-wrap
 msgid "B<'buff=N1,N2,N3,N4,N5,N6'>"
 msgstr "B<'buff=N1,N2,N3,N4,N5,N6'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:367
+#: build/C/man7/bootparam.7:412
 msgid ""
 "Set the six parameters max_buff_age, buff_advance, buff_decline, "
 "buff_initial_age, bufferout_weight, buffermem_grace that control kernel "
@@ -1386,13 +1418,13 @@ msgstr ""
 "プションである。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:367
+#: build/C/man7/bootparam.7:412
 #, no-wrap
-msgid "Boot Arguments for Ramdisk Use"
+msgid "Boot arguments for ramdisk use"
 msgstr "RAM ディスク関連の起動時引数"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:378
+#: build/C/man7/bootparam.7:423
 msgid ""
 "(Only if the kernel was compiled with B<CONFIG_BLK_DEV_RAM>.)  In general it "
 "is a bad idea to use a ramdisk under Linux\\(emthe system will use available "
@@ -1410,51 +1442,51 @@ msgstr ""
 "システムもあるだろう。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:390
+#: build/C/man7/bootparam.7:434
 msgid ""
 "In Linux 1.3.48, ramdisk handling was changed drastically.  Earlier, the "
 "memory was allocated statically, and there was a 'ramdisk=N' parameter to "
-"tell its size.  (This could also be set in the kernel image at compile time, "
-"or by use of B<rdev>(8).)  These days ram disks use the buffer cache, and "
-"grow dynamically.  For a lot of information (e.g., how to use B<rdev>(8)  in "
-"conjunction with the new ramdisk setup), see I</usr/src/linux/Documentation/"
-"ramdisk.txt>."
+"tell its size.  (This could also be set in the kernel image at compile "
+"time.)  These days ram disks use the buffer cache, and grow dynamically.  "
+"For a lot of information in conjunction with the new ramdisk setup, see the "
+"kernel source file I<Documentation/blockdev/ramdisk.txt> (I<Documentation/"
+"ramdisk.txt> in older kernels)."
 msgstr ""
 "Linux のバージョン 1.3.48 において、 RAM ディスクの取り扱いが根底から変化し"
 "た。 それ以前までは、メモリは静的に割り当てられ、 \\&'ramdisk=N' パラメータで"
-"そのサイズを指定していた。 (この値はカーネルのコンパイル時や B<rdev>(8)  に"
-"よっても変更できた。)  現在は RAM ディスクはバッファキャッシュを使用してお"
-"り、 動的に成長する。 さらに多くの情報 (たとえば B<rdev>(8)  が新しい RAM "
-"ディスクの設定とどのように関係するか) については、 I</usr/src/linux/"
-"Documentation/ramdisk.txt> を参照。"
+"そのサイズを指定していた (この値はコンパイル時にカーネルイメージに指定するこ"
+"ともできた)。  現在は RAM ディスクはバッファキャッシュを使用しており、 動的に"
+"拡張される。 新しい RAM ディスクの動作に関する多くの情報が、 カーネルソース"
+"ファイル I<Documentation/blockdev/ramdisk.txt> (古いカーネルでは "
+"I<Documentation/ramdisk.txt>) にある。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:392
+#: build/C/man7/bootparam.7:436
 msgid "There are four parameters, two boolean and two integral."
 msgstr ""
 "4 つのパラメータがある。論理値をとるものが 2 つ、整数値をとるものが 2 つ。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:392
+#: build/C/man7/bootparam.7:436
 #, no-wrap
 msgid "B<'load_ramdisk=N'>"
 msgstr "B<'load_ramdisk=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:397
+#: build/C/man7/bootparam.7:441
 msgid ""
 "If N=1, do load a ramdisk.  If N=0, do not load a ramdisk.  (This is the "
 "default.)"
 msgstr "N=1 なら RAM ディスクをロードする。N=0 ならロードしない (デフォルト)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:397
+#: build/C/man7/bootparam.7:441
 #, no-wrap
 msgid "B<'prompt_ramdisk=N'>"
 msgstr "B<'prompt_ramdisk=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:403
+#: build/C/man7/bootparam.7:447
 msgid ""
 "If N=1, do prompt for insertion of the floppy.  (This is the default.)  If "
 "N=0, do not prompt.  (Thus, this parameter is never needed.)"
@@ -1463,13 +1495,13 @@ msgstr ""
 "トを出さない。 (従って、このパラメータを指定する必要はまず無いであろう。)"
 
 #. type: TP
-#: build/C/man7/bootparam.7:403
+#: build/C/man7/bootparam.7:447
 #, no-wrap
 msgid "B<'ramdisk_size=N'> or (obsolete) B<'ramdisk=N'>"
 msgstr "B<'ramdisk_size=N'> もしくは (古い形式の) B<'ramdisk=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:407
+#: build/C/man7/bootparam.7:451
 msgid ""
 "Set the maximal size of the ramdisk(s) to N kB.  The default is 4096 (4 MB)."
 msgstr ""
@@ -1477,13 +1509,13 @@ msgstr ""
 "MB)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:407
+#: build/C/man7/bootparam.7:451
 #, no-wrap
 msgid "B<'ramdisk_start=N'>"
 msgstr "B<'ramdisk_start=N'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:412
+#: build/C/man7/bootparam.7:456
 msgid ""
 "Sets the starting block number (the offset on the floppy where the ramdisk "
 "starts) to N.  This is needed in case the ramdisk follows a kernel image."
@@ -1493,43 +1525,43 @@ msgstr ""
 "を置く場合に必要となる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:412
+#: build/C/man7/bootparam.7:456
 #, no-wrap
 msgid "B<'noinitrd'>"
 msgstr "B<'noinitrd'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:425
+#: build/C/man7/bootparam.7:475
 msgid ""
 "(Only if the kernel was compiled with B<CONFIG_BLK_DEV_RAM> and "
 "B<CONFIG_BLK_DEV_INITRD>.)  These days it is possible to compile the kernel "
 "to use initrd.  When this feature is enabled, the boot process will load the "
 "kernel and an initial ramdisk; then the kernel converts initrd into a "
-"\"normal\" ramdisk, which is mounted read-write as root device; then /"
-"linuxrc is executed; afterward the \"real\" root file system is mounted, and "
-"the initrd file system is moved over to /initrd; finally the usual boot "
-"sequence (e.g., invocation of /sbin/init) is performed."
+"\"normal\" ramdisk, which is mounted read-write as root device; then I</"
+"linuxrc> is executed; afterward the \"real\" root file system is mounted, "
+"and the initrd file system is moved over to I</initrd>; finally the usual "
+"boot sequence (e.g., invocation of I</sbin/init>)  is performed."
 msgstr ""
 "(カーネルのコンパイル時に B<CONFIG_BLK_DEV_RAM> と B<CONFIG_BLK_DEV_INITRD> "
 "が指定されているときのみ有効。)  最近は initrd を使用するようにカーネルをコン"
 "パイルできる。 このオプションが指定されると、 ブートプロセスはカーネルと RAM "
 "ディスクをロードし、 カーネルは initrd を「普通の」 RAM ディスクに変換し、 こ"
-"の RAM ディスクがルートデバイスとして「読み書き可能」でマウントされる。 次"
-"に /linuxrc が実行される。 その後「真の」ルートファイルシステムがマウントさ"
-"れ、 initrd ファイルシステムは /initrd に移される。 最後に通常のブートシーケ"
-"ンス (具体的には /sbin/init の呼び出し) が実行される。"
+"の RAM ディスクがルートデバイスとして「読み書き可能」でマウントされる。 次に "
+"I</linuxrc> が実行される。 その後「真の」ルートファイルシステムがマウントさ"
+"れ、 initrd ファイルシステムは I</initrd> に移される。 最後に通常のブートシー"
+"ケンス (具体的には I</sbin/init> の呼び出し) が実行される。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:428
+#: build/C/man7/bootparam.7:478
 msgid ""
-"For a detailed description of the initrd feature, see I</usr/src/linux/"
-"Documentation/initrd.txt>."
+"For a detailed description of the initrd feature, see the kernel source file "
+"I<Documentation/initrd.txt>."
 msgstr ""
-"initrd に関する詳細な解説は I</usr/src/linux/Documentation/initrd.txt> を参"
-"照。"
+"initrd に関する詳細な解説はカーネルソースファイル I<Documentation/initrd."
+"txt> を参照。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:436
+#: build/C/man7/bootparam.7:486
 msgid ""
 "The 'noinitrd' option tells the kernel that although it was compiled for "
 "operation with initrd, it should not go through the above steps, but leave "
@@ -1543,18 +1575,18 @@ msgstr ""
 "タを使った最後のプロセスが I</dev/initrd> をクローズするとすぐに解放される。)"
 
 #. type: SS
-#: build/C/man7/bootparam.7:436
+#: build/C/man7/bootparam.7:486
 #, no-wrap
-msgid "Boot Arguments for SCSI Devices"
+msgid "Boot arguments for SCSI devices"
 msgstr "SCSI デバイス用の起動時引数"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:438
+#: build/C/man7/bootparam.7:488
 msgid "General notation for this section:"
 msgstr "この節における用語："
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:443
+#: build/C/man7/bootparam.7:493
 msgid ""
 "I<iobase> -- the first I/O port that the SCSI host occupies.  These are "
 "specified in hexadecimal notation, and usually lie in the range from 0x200 "
@@ -1564,12 +1596,12 @@ msgstr ""
 "記で指定し、通常 0x200 から 0x3ff の範囲に位置する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:451
+#: build/C/man7/bootparam.7:501
 msgid ""
 "I<irq> -- the hardware interrupt that the card is configured to use.  Valid "
 "values will be dependent on the card in question, but will usually be 5, 7, "
 "9, 10, 11, 12, and 15.  The other values are usually used for common "
-"peripherals like IDE hard disks, floppies, serial ports, etc."
+"peripherals like IDE hard disks, floppies, serial ports, and so on."
 msgstr ""
 "I<irq> -- カードが利用するハードウェア割り込み。有効な値はカードに よって異な"
 "るが、通常は 5, 7, 9, 10, 11, 12, 15 である。 これ以外の値は通常、IDE ハード"
@@ -1577,7 +1609,7 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:459
+#: build/C/man7/bootparam.7:509
 msgid ""
 "I<scsi-id> -- the ID that the host adapter uses to identify itself on the "
 "SCSI bus.  Only some host adapters allow you to change this value, as most "
@@ -1590,7 +1622,7 @@ msgstr ""
 "もしくは Future Domain 製の TMC-950 ボードでは 6 が使われる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:467
+#: build/C/man7/bootparam.7:517
 msgid ""
 "I<parity> -- whether the SCSI host adapter expects the attached devices to "
 "supply a parity value with all information exchanges.  Specifying a one "
@@ -1604,13 +1636,13 @@ msgstr ""
 "るパリティの選択を サポートするわけではない。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:467
+#: build/C/man7/bootparam.7:517
 #, no-wrap
 msgid "B<'max_scsi_luns=...'>"
 msgstr "B<'max_scsi_luns=...'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:478
+#: build/C/man7/bootparam.7:528
 msgid ""
 "A SCSI device can have a number of 'subdevices' contained within itself.  "
 "The most common example is one of the new SCSI CD-ROMs that handle more than "
@@ -1627,7 +1659,7 @@ msgstr ""
 "らなる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:484
+#: build/C/man7/bootparam.7:534
 msgid ""
 "Some poorly designed SCSI devices cannot handle being probed for LUNs not "
 "equal to zero.  Therefore, if the compile-time flag B<CONFIG_SCSI_MULTI_LUN> "
@@ -1638,7 +1670,7 @@ msgstr ""
 "されていないと、 最近のカーネルではデフォルトでは LUN 番号 0 のみを検出する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:490
+#: build/C/man7/bootparam.7:540
 msgid ""
 "To specify the number of probed LUNs at boot, one enters "
 "\\&'max_scsi_luns=n' as a boot arg, where n is a number between one and "
@@ -1650,13 +1682,13 @@ msgstr ""
 "ば、 このようないかれた機械にひどい目にあわされずにすむだろう。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:490
+#: build/C/man7/bootparam.7:540
 #, no-wrap
 msgid "B<SCSI tape configuration>"
 msgstr "B<SCSI テープドライブの設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:494
+#: build/C/man7/bootparam.7:544
 msgid ""
 "Some boot time configuration of the SCSI tape driver can be achieved by "
 "using the following:"
@@ -1664,12 +1696,13 @@ msgstr ""
 "SCSI テープドライバの起動時設定の一部は以下のようにして行なうことができる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:496
-msgid "B<st=>I<buf_size[,write_threshold[,max_bufs]]>"
-msgstr "B<st=>I<buf_size[,write_threshold[,max_bufs]]>"
+#: build/C/man7/bootparam.7:548
+#, no-wrap
+msgid "B<st=>I<buf_size[,write_threshold[,max_bufs]]>\n"
+msgstr "B<st=>I<buf_size[,write_threshold[,max_bufs]]>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:509
+#: build/C/man7/bootparam.7:563
 msgid ""
 "The first two numbers are specified in units of kB.  The default I<buf_size> "
 "is 32kB, and the maximum size that can be specified is a ridiculous "
@@ -1686,27 +1719,28 @@ msgstr ""
 "す。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:511
-msgid "st=32,30,2"
-msgstr "st=32,30,2"
+#: build/C/man7/bootparam.7:567
+#, no-wrap
+msgid "st=32,30,2\n"
+msgstr "st=32,30,2\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:517
+#: build/C/man7/bootparam.7:575
 msgid ""
 "Full details can be found in the file I<Documentation/scsi/st.txt> (or "
-"I<drivers/scsi/README.st> for older kernels) in the kernel source."
+"I<drivers/scsi/README.st> for older kernels) in the Linux kernel source."
 msgstr ""
-"詳細はカーネルソース内の I<Documentation/scsi/st.txt> (古いカーネルの場合は "
-"I<drivers/scsi/README.st>)  に書かれている。"
+"詳細は Linux カーネルソース内の I<Documentation/scsi/st.txt> (古いカーネルの"
+"場合は I<drivers/scsi/README.st>) に書かれている。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:517
+#: build/C/man7/bootparam.7:575
 #, no-wrap
 msgid "B<Adaptec aha151x, aha152x, aic6260, aic6360, SB16-SCSI configuration>"
 msgstr "B<Adaptec aha151x, aha152x, aic6260, aic6360, SB16-SCSI の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:521
+#: build/C/man7/bootparam.7:579
 msgid ""
 "The aha numbers refer to cards and the aic numbers refer to the actual SCSI "
 "chip on these type of cards, including the Soundblaster-16 SCSI."
@@ -1715,23 +1749,24 @@ msgstr ""
 "チップを表す (Soundblaster-16 SCSI も後者に含まれる)。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:526
+#: build/C/man7/bootparam.7:584
 msgid ""
 "The probe code for these SCSI hosts looks for an installed BIOS, and if none "
 "is present, the probe will not find your card.  Then you will have to use a "
-"boot arg of the form:"
+"boot argument of the form:"
 msgstr ""
 "SCSI ホストの検出コードは、 インストールされている BIOS を探す。 見つからない"
 "と、カードは検出できない。 この場合は以下のように起動時引数を指定することにな"
 "る。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:528
-msgid "B<aha152x=>I<iobase[,irq[,scsi-id[,reconnect[,parity]]]]>"
-msgstr "B<aha152x=>I<iobase[,irq[,scsi-id[,reconnect[,parity]]]]>"
+#: build/C/man7/bootparam.7:588
+#, no-wrap
+msgid "B<aha152x=>I<iobase[,irq[,scsi-id[,reconnect[,parity]]]]>\n"
+msgstr "B<aha152x=>I<iobase[,irq[,scsi-id[,reconnect[,parity]]]]>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:531
+#: build/C/man7/bootparam.7:593
 msgid ""
 "If the driver was compiled with debugging enabled, a sixth value can be "
 "specified to set the debug level."
@@ -1740,7 +1775,7 @@ msgstr ""
 "値でデバッグレベルを指定できる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:537
+#: build/C/man7/bootparam.7:599
 msgid ""
 "All the parameters are as described at the top of this section, and the "
 "I<reconnect> value will allow device disconnect/reconnect if a nonzero value "
@@ -1751,12 +1786,13 @@ msgstr ""
 "る。 以下に例を示す。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:539
-msgid "aha152x=0x340,11,7,1"
-msgstr "aha152x=0x340,11,7,1"
+#: build/C/man7/bootparam.7:603
+#, no-wrap
+msgid "aha152x=0x340,11,7,1\n"
+msgstr "aha152x=0x340,11,7,1\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:543
+#: build/C/man7/bootparam.7:609
 msgid ""
 "Note that the parameters must be specified in order, meaning that if you "
 "want to specify a parity setting, then you will have to specify an iobase, "
@@ -1767,18 +1803,18 @@ msgstr ""
 "指定する必要がある。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:543
+#: build/C/man7/bootparam.7:609
 #, no-wrap
 msgid "B<Adaptec aha154x configuration>"
 msgstr "B<Adaptec aha154x の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:551
+#: build/C/man7/bootparam.7:617
 msgid ""
 "The aha1542 series cards have an i82077 floppy controller onboard, while the "
 "aha1540 series cards do not.  These are busmastering cards, and have "
 "parameters to set the \"fairness\" that is used to share the bus with other "
-"devices.  The boot arg looks like the following."
+"devices.  The boot argument looks like the following."
 msgstr ""
 "aha1542 シリーズのカードは i82077 フロッピーディスクコントローラをボードに搭"
 "載している。 一方 aha1540 シリーズのカードは搭載していない。 これらは共にバス"
@@ -1787,12 +1823,13 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:553
-msgid "B<aha1542=>I<iobase[,buson,busoff[,dmaspeed]]>"
-msgstr "B<aha1542=>I<iobase[,buson,busoff[,dmaspeed]]>"
+#: build/C/man7/bootparam.7:621
+#, no-wrap
+msgid "B<aha1542=>I<iobase[,buson,busoff[,dmaspeed]]>\n"
+msgstr "B<aha1542=>I<iobase[,buson,busoff[,dmaspeed]]>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:557
+#: build/C/man7/bootparam.7:627
 msgid ""
 "Valid iobase values are usually one of: 0x130, 0x134, 0x230, 0x234, 0x330, "
 "0x334.  Clone cards may permit other values."
@@ -1801,7 +1838,7 @@ msgstr ""
 "クローンカードの中には他の値を指定できるものもある。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:565
+#: build/C/man7/bootparam.7:635
 msgid ""
 "The I<buson>, I<busoff> values refer to the number of microseconds that the "
 "card dominates the ISA bus.  The defaults are 11us on, and 4us off, so that "
@@ -1813,7 +1850,7 @@ msgstr ""
 "えば ISA LANCE イーサネットカード) も ISA バスにアクセスできる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:576
+#: build/C/man7/bootparam.7:646
 msgid ""
 "The I<dmaspeed> value refers to the rate (in MB/s) at which the DMA (Direct "
 "Memory Access) transfers proceed.  The default is 5MB/s.  Newer revision "
@@ -1829,23 +1866,24 @@ msgstr ""
 "注意して実験してからにすること。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:576
+#: build/C/man7/bootparam.7:646
 #, no-wrap
 msgid "B<Adaptec aha274x, aha284x, aic7xxx configuration>"
 msgstr "B<Adaptec aha274x, aha284x, aic7xxx の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:579
+#: build/C/man7/bootparam.7:649
 msgid "These boards can accept an argument of the form:"
 msgstr "これらのボードは以下の形式で指定する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:581
-msgid "B<aic7xxx=>I<extended,no_reset>"
-msgstr "B<aic7xxx=>I<extended,no_reset>"
+#: build/C/man7/bootparam.7:653
+#, no-wrap
+msgid "B<aic7xxx=>I<extended,no_reset>\n"
+msgstr "B<aic7xxx=>I<extended,no_reset>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:590
+#: build/C/man7/bootparam.7:664
 msgid ""
 "The I<extended> value, if nonzero, indicates that extended translation for "
 "large disks is enabled.  The I<no_reset> value, if nonzero, tells the driver "
@@ -1856,17 +1894,17 @@ msgstr ""
 "る SCSI バスの初期化を行わない。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:590
+#: build/C/man7/bootparam.7:664
 #, no-wrap
 msgid "B<AdvanSys SCSI Hosts configuration ('advansys=')>"
 msgstr "B<AdvanSys SCSI ホストアダプタの設定 ('advansys=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:603
+#: build/C/man7/bootparam.7:677
 msgid ""
-"The AdvanSys driver can accept up to four i/o addresses that will be probed "
+"The AdvanSys driver can accept up to four I/O addresses that will be probed "
 "for an AdvanSys SCSI card.  Note that these values (if used) do not effect "
-"EISA or PCI probing in any way.  They are only used for probing ISA and VLB "
+"EISA or PCI probing in any way.  They are used only for probing ISA and VLB "
 "cards.  In addition, if the driver has been compiled with debugging enabled, "
 "the level of debugging output can be set by adding an 0xdeb[0-f] parameter.  "
 "The 0-f allows setting the level of the debugging messages to any of 16 "
@@ -1879,40 +1917,59 @@ msgstr ""
 "追加できる。 0-f によりデバッグメッセージの情報のレベルを 16 段階で指定する。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:603
+#: build/C/man7/bootparam.7:677
 #, no-wrap
 msgid "B<AM53C974>"
 msgstr "B<AM53C974>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:607
-msgid "B<AM53C974=>I<host-scsi-id,target-scsi-id,max-rate,max-offset>"
-msgstr "B<AM53C974=>I<host-scsi-id,target-scsi-id,max-rate,max-offset>"
+#: build/C/man7/bootparam.7:680 build/C/man7/bootparam.7:690
+#: build/C/man7/bootparam.7:732 build/C/man7/bootparam.7:741
+#: build/C/man7/bootparam.7:750 build/C/man7/bootparam.7:766
+#: build/C/man7/bootparam.7:808 build/C/man7/bootparam.7:825
+#: build/C/man7/bootparam.7:893 build/C/man7/bootparam.7:902
+#: build/C/man7/bootparam.7:1047 build/C/man7/bootparam.7:1076
+#: build/C/man7/bootparam.7:1103 build/C/man7/bootparam.7:1163
+#: build/C/man7/bootparam.7:1400 build/C/man7/bootparam.7:1412
+#: build/C/man7/bootparam.7:1426 build/C/man7/bootparam.7:1440
+#: build/C/man7/bootparam.7:1484 build/C/man7/bootparam.7:1505
+#: build/C/man7/bootparam.7:1522 build/C/man7/bootparam.7:1547
+#: build/C/man7/bootparam.7:1564
+msgid "Syntax:"
+msgstr "構文は以下の通り。"
+
+#. type: Plain text
+#: build/C/man7/bootparam.7:684
+#, no-wrap
+msgid "B<AM53C974=>I<host-scsi-id,target-scsi-id,max-rate,max-offset>\n"
+msgstr "B<AM53C974=>I<host-scsi-id,target-scsi-id,max-rate,max-offset>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:607
+#: build/C/man7/bootparam.7:686
 #, no-wrap
 msgid "B<BusLogic SCSI Hosts configuration ('BusLogic=')>"
 msgstr "B<BusLogic SCSI ホストアダプタの設定 ('BusLogic=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:611
-msgid "B<BusLogic=>I<N1,N2,N3,N4,N5,S1,S2,...>"
-msgstr "B<BusLogic=>I<N1,N2,N3,N4,N5,S1,S2,...>"
+#: build/C/man7/bootparam.7:693
+#, no-wrap
+msgid "B<BusLogic=>I<N1,N2,N3,N4,N5,S1,S2,...>\n"
+msgstr "B<BusLogic=>I<N1,N2,N3,N4,N5,S1,S2,...>\n"
 
+#.  (lines 3149-3270 in the kernel version I am looking at).
 #. type: Plain text
-#: build/C/man7/bootparam.7:618
+#: build/C/man7/bootparam.7:702
 msgid ""
-"For an extensive discussion of the BusLogic command line parameters, see I</"
-"usr/src/linux/drivers/scsi/BusLogic.c> (lines 3149-3270 in the kernel "
-"version I am looking at).  The text below is a very much abbreviated extract."
+"For an extensive discussion of the BusLogic command line parameters, see the "
+"kernel source file I<drivers/scsi/BusLogic.c>.  The text below is a very "
+"much abbreviated extract."
 msgstr ""
-"Buslogic のコマンドラインパラメータに関する詳細な議論は I</usr/src/linux/"
-"drivers/scsi/BusLogic.c> (著者がいま見ているカーネルでは 4350-4497 行目) を参"
-"照すること。 以下はこれを非常におおざっぱに要約したものである。"
+"Buslogic のコマンドラインパラメータに関する詳細な議論はカーネルソースファイ"
+"ル I<drivers/scsi/BusLogic.c> を参照すること。 以下はこれを非常におおざっぱに"
+"要約したものである。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:630
+#: build/C/man7/bootparam.7:714
 msgid ""
 "The parameters N1-N5 are integers.  The parameters S1,... are strings.  N1 "
 "is the I/O Address at which the Host Adapter is located.  N2 is the Tagged "
@@ -1931,7 +1988,7 @@ msgstr ""
 "アダプタ用)。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:636
+#: build/C/man7/bootparam.7:720
 msgid ""
 "The string options are used to provide control over Tagged Queuing (TQ:"
 "Default, TQ:Enable, TQ:Disable, TQ:E<lt>Per-Target-SpecE<gt>), over Error "
@@ -1945,57 +2002,61 @@ msgstr ""
 "ストアダプタの検出 (NoProbe, NoProbeISA, NoSortPCI)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:636
+#: build/C/man7/bootparam.7:720
 #, no-wrap
 msgid "B<EATA/DMA configuration>"
 msgstr "B<EATA/DMA の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:639 build/C/man7/bootparam.7:746
-msgid "The default list of i/o ports to be probed can be changed by"
+#: build/C/man7/bootparam.7:723 build/C/man7/bootparam.7:884
+msgid "The default list of I/O ports to be probed can be changed by"
 msgstr ""
 "検出対象にする I/O ポートのデフォルトのリストは以下のようにして変更できる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:641 build/C/man7/bootparam.7:748
-msgid "B<eata=>I<iobase,iobase,...>B<.>"
-msgstr "B<eata=>I<iobase,iobase,...>B<.>"
+#: build/C/man7/bootparam.7:727 build/C/man7/bootparam.7:888
+#, no-wrap
+msgid "B<eata=>I<iobase,iobase,...>B<.>\n"
+msgstr "B<eata=>I<iobase,iobase,...>B<.>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:641
+#: build/C/man7/bootparam.7:729
 #, no-wrap
 msgid "B<Future Domain TMC-16x0 configuration>"
 msgstr "B<Future Domain TMC-16x0 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:645
-msgid "B<fdomain=>I<iobase,irq[,adapter_id]>"
-msgstr "B<fdomain=>I<iobase,irq[,adapter_id]>"
+#: build/C/man7/bootparam.7:736
+#, no-wrap
+msgid "B<fdomain=>I<iobase,irq[,adapter_id]>\n"
+msgstr "B<fdomain=>I<iobase,irq[,adapter_id]>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:645
+#: build/C/man7/bootparam.7:738
 #, no-wrap
 msgid "B<Great Valley Products (GVP) SCSI controller configuration>"
 msgstr "B<Great Valley Products (GVP) SCSI コントローラの設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:649
-msgid "B<gvp11=>I<dma_transfer_bitmask>"
-msgstr "B<gvp11=>I<dma_transfer_bitmask>"
+#: build/C/man7/bootparam.7:745
+#, no-wrap
+msgid "B<gvp11=>I<dma_transfer_bitmask>\n"
+msgstr "B<gvp11=>I<dma_transfer_bitmask>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:649
+#: build/C/man7/bootparam.7:747
 #, no-wrap
 msgid "B<Future Domain TMC-8xx, TMC-950 configuration>"
 msgstr "B<Future Domain 製 TMC-8xx, TMC-950 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:653
-msgid "B<tmc8xx=>I<mem_base,irq>"
-msgstr "B<tmc8xx=>I<mem_base,irq>"
+#: build/C/man7/bootparam.7:754
+#, no-wrap
+msgid "B<tmc8xx=>I<mem_base,irq>\n"
+msgstr "B<tmc8xx=>I<mem_base,irq>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:660 build/C/man7/bootparam.7:733
+#: build/C/man7/bootparam.7:763 build/C/man7/bootparam.7:867
 msgid ""
 "The I<mem_base> value is the value of the memory mapped I/O region that the "
 "card uses.  This will usually be one of the following values: 0xc8000, "
@@ -2006,109 +2067,114 @@ msgstr ""
 "0xde000。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:660
+#: build/C/man7/bootparam.7:763
 #, no-wrap
 msgid "B<IN2000 configuration>"
 msgstr "B<IN2000 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:664
-msgid "B<in2000=>I<S>"
-msgstr "B<in2000=>I<S>"
+#: build/C/man7/bootparam.7:770
+#, no-wrap
+msgid "B<in2000=>I<S>\n"
+msgstr "B<in2000=>I<S>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:671
+#: build/C/man7/bootparam.7:779
 msgid ""
 "where S is a comma-separated string of items keyword[:value].  Recognized "
 "keywords (possibly with value) are: ioport:addr, noreset, nosync:x, period:"
 "ns, disconnect:x, debug:x, proc:x.  For the function of these parameters, "
-"see I</usr/src/linux/drivers/scsi/in2000.c>."
+"see the kernel source file I<drivers/scsi/in2000.c>."
 msgstr ""
 "S はコンマ区切りの文字列で、各項目は keyword[:value] 形式で指定する。 指定で"
 "きるキーワードは以下の通り。 ioport:addr, noreset, nosync:x, period:ns, "
-"disconnect:x, debug:x, proc:x。 これらのパラメータの機能については I</usr/"
-"src/linux/drivers/scsi/in2000.c> を参照。"
+"disconnect:x, debug:x, proc:x。 これらのパラメータの機能についてはカーネル"
+"ソースファイル I<drivers/scsi/in2000.c> を参照。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:671
+#: build/C/man7/bootparam.7:779
 #, no-wrap
 msgid "B<NCR5380 and NCR53C400 configuration>"
 msgstr "B<NCR5380 および NCR53C400 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:674
-msgid "The boot arg is of the form"
+#: build/C/man7/bootparam.7:782
+msgid "The boot argument is of the form"
 msgstr "この起動時引数は以下の書式で指定する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:676
-msgid "B<ncr5380=>I<iobase,irq,dma>"
-msgstr "B<ncr5380=>I<iobase,irq,dma>"
+#: build/C/man7/bootparam.7:786
+#, no-wrap
+msgid "B<ncr5380=>I<iobase,irq,dma>\n"
+msgstr "B<ncr5380=>I<iobase,irq,dma>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:678
+#: build/C/man7/bootparam.7:790
 msgid "or"
 msgstr "または"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:680
-msgid "B<ncr53c400=>I<iobase,irq>"
-msgstr "B<ncr53c400=>I<iobase,irq>"
+#: build/C/man7/bootparam.7:794
+#, no-wrap
+msgid "B<ncr53c400=>I<iobase,irq>\n"
+msgstr "B<ncr53c400=>I<iobase,irq>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:689
+#: build/C/man7/bootparam.7:805
 msgid ""
 "If the card doesn't use interrupts, then an IRQ value of 255 (0xff) will "
 "disable interrupts.  An IRQ value of 254 means to autoprobe.  More details "
 "can be found in the file I<Documentation/scsi/g_NCR5380.txt> (or I<drivers/"
-"scsi/README.g_NCR5380> for older kernels) in the kernel source."
+"scsi/README.g_NCR5380> for older kernels) in the Linux kernel source."
 msgstr ""
 "カードが IRQ を使用しない場合は、 255 (0xff) を指定すれば無効にできる。 IRQ "
-"に 254 を指定すると自動検出する。 詳細はカーネルソース内の I<Documentation/"
-"scsi/g_NCR5380.txt> (古いカーネルの場合は I<drivers/scsi/README.g_NCR5380>)  "
-"に書かれている。"
+"に 254 を指定すると自動検出する。 詳細は Linux カーネルソース内の "
+"I<Documentation/scsi/g_NCR5380.txt> (古いカーネルの場合は I<drivers/scsi/"
+"README.g_NCR5380>)  に書かれている。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:689
+#: build/C/man7/bootparam.7:805
 #, no-wrap
 msgid "B<NCR53C8xx configuration>"
 msgstr "B<NCR53C8xx の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:693
-msgid "B<ncr53c8xx=>I<S>"
-msgstr "B<ncr53c8xx=>I<S>"
+#: build/C/man7/bootparam.7:812
+#, no-wrap
+msgid "B<ncr53c8xx=>I<S>\n"
+msgstr "B<ncr53c8xx=>I<S>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:701
+#: build/C/man7/bootparam.7:822
 msgid ""
 "where S is a comma-separated string of items keyword:value.  Recognized "
 "keywords are: mpar (master_parity), spar (scsi_parity), disc "
 "(disconnection), specf (special_features), ultra (ultra_scsi), fsn "
 "(force_sync_nego), tags (default_tags), sync (default_sync), verb (verbose), "
 "debug (debug), burst (burst_max).  For the function of the assigned values, "
-"see I</usr/src/linux/drivers/scsi/ncr53c8xx.c>."
+"see the kernel source file I<drivers/scsi/ncr53c8xx.c>."
 msgstr ""
 "S はコンマ区切りの文字列で、各項目は keyword[:value] 形式で指定する。 指定で"
 "きるキーワードは以下の通り。 mpar (master_parity), spar (scsi_parity), disc "
 "(disconnection), specf (special_features), ultra (ultra_scsi), fsn "
 "(force_sync_nego), tags (default_tags), sync (default_sync), verb (verbose), "
-"debug (debug), burst (burst_max)。 これらのオプションの機能については I</usr/"
-"src/linux/drivers/scsi/README.ncr53c8xx> を参照すること。"
+"debug (debug), burst (burst_max)。 これらのオプションの機能についてはカーネル"
+"ソースファイル I<drivers/scsi/ncr53c8xx.c> を参照すること。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:701
+#: build/C/man7/bootparam.7:822
 #, no-wrap
 msgid "B<NCR53c406a configuration>"
 msgstr "B<NCR53c406a の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:705
-msgid "B<ncr53c406a=>I<iobase[,irq[,fastpio]]>"
-msgstr "B<ncr53c406a=>I<iobase[,irq[,fastpio]]>"
+#: build/C/man7/bootparam.7:829
+#, no-wrap
+msgid "B<ncr53c406a=>I<iobase[,irq[,fastpio]]>\n"
+msgstr "B<ncr53c406a=>I<iobase[,irq[,fastpio]]>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:708
+#: build/C/man7/bootparam.7:834
 msgid ""
 "Specify irq = 0 for noninterrupt driven mode.  Set fastpio = 1 for fast pio "
 "mode, 0 for slow mode."
@@ -2117,27 +2183,28 @@ msgstr ""
 "fastpio に 1 を指定し、低速モードは 0 を指定する。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:708
+#: build/C/man7/bootparam.7:834
 #, no-wrap
 msgid "B<Pro Audio Spectrum configuration>"
 msgstr "B<Pro Audio Spectrum の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:713
+#: build/C/man7/bootparam.7:839
 msgid ""
 "The PAS16 uses a NC5380 SCSI chip, and newer models support jumperless "
-"configuration.  The boot arg is of the form:"
+"configuration.  The boot argument is of the form:"
 msgstr ""
 "PAS16 は NC5380 SCSI チップを使用しており、 最近のモデルはジャンパレスの設定"
 "をサポートしている。 起動時引数の書式は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:715
-msgid "B<pas16=>I<iobase,irq>"
-msgstr "B<pas16=>I<iobase,irq>"
+#: build/C/man7/bootparam.7:843
+#, no-wrap
+msgid "B<pas16=>I<iobase,irq>\n"
+msgstr "B<pas16=>I<iobase,irq>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:720
+#: build/C/man7/bootparam.7:850
 msgid ""
 "The only difference is that you can specify an IRQ value of 255, which will "
 "tell the driver to work without using interrupts, albeit at a performance "
@@ -2147,31 +2214,32 @@ msgstr ""
 "指示できる (パフォーマンスは低下する)。 通常 iobase は 0x388 である。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:720
+#: build/C/man7/bootparam.7:850
 #, no-wrap
 msgid "B<Seagate ST-0x configuration>"
 msgstr "B<Seagate 製 ST-0x の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:724
+#: build/C/man7/bootparam.7:854
 msgid ""
 "If your card is not detected at boot time, you will then have to use a boot "
-"arg of the form:"
+"argument of the form:"
 msgstr "カードが起動時に認識されない場合は以下のような指定が必要になるだろう。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:726
-msgid "B<st0x=>I<mem_base,irq>"
-msgstr "B<st0x=>I<mem_base,irq>"
+#: build/C/man7/bootparam.7:858
+#, no-wrap
+msgid "B<st0x=>I<mem_base,irq>\n"
+msgstr "B<st0x=>I<mem_base,irq>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:733
+#: build/C/man7/bootparam.7:867
 #, no-wrap
 msgid "B<Trantor T128 configuration>"
 msgstr "B<Trantor 製 T128 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:737
+#: build/C/man7/bootparam.7:871
 msgid ""
 "These cards are also based on the NCR5380 chip, and accept the following "
 "options:"
@@ -2179,12 +2247,13 @@ msgstr ""
 "このカードも NCR5380 チップを利用しており、 以下のオプションを受け付ける。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:739
-msgid "B<t128=>I<mem_base,irq>"
-msgstr "B<t128=>I<mem_base,irq>"
+#: build/C/man7/bootparam.7:875
+#, no-wrap
+msgid "B<t128=>I<mem_base,irq>\n"
+msgstr "B<t128=>I<mem_base,irq>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:743
+#: build/C/man7/bootparam.7:881
 msgid ""
 "The valid values for I<mem_base> are as follows: 0xcc000, 0xc8000, 0xdc000, "
 "0xd8000."
@@ -2192,59 +2261,61 @@ msgstr ""
 "有効な I<mem_base> の値は次の通りである: 0xcc000, 0xc8000, 0xdc000, 0xd8000。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:743
+#: build/C/man7/bootparam.7:881
 #, no-wrap
 msgid "B<UltraStor 14F/34F configuration>"
 msgstr "B<UltraStor 製 14F/34F の設定>"
 
 #. type: TP
-#: build/C/man7/bootparam.7:748
+#: build/C/man7/bootparam.7:890
 #, no-wrap
 msgid "B<WD7000 configuration>"
 msgstr "B<WD7000 の設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:752
-msgid "B<wd7000=>I<irq,dma,iobase>"
-msgstr "B<wd7000=>I<irq,dma,iobase>"
+#: build/C/man7/bootparam.7:897
+#, no-wrap
+msgid "B<wd7000=>I<irq,dma,iobase>\n"
+msgstr "B<wd7000=>I<irq,dma,iobase>\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:752
+#: build/C/man7/bootparam.7:899
 #, no-wrap
 msgid "B<Commodore Amiga A2091/590 SCSI controller configuration>"
 msgstr "B<Commodore Amiga 製 A2091/590 SCSI コントローラの設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:756
-msgid "B<wd33c93=>I<S>"
-msgstr "B<wd33c93=>I<S>"
+#: build/C/man7/bootparam.7:906
+#, no-wrap
+msgid "B<wd33c93=>I<S>\n"
+msgstr "B<wd33c93=>I<S>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:763
+#: build/C/man7/bootparam.7:915
 msgid ""
 "where S is a comma-separated string of options.  Recognized options are "
 "nosync:bitmask, nodma:x, period:ns, disconnect:x, debug:x, clock:x, next.  "
-"For details, see I</usr/src/linux/drivers/scsi/wd33c93.c>."
+"For details, see the kernel source file I<drivers/scsi/wd33c93.c>."
 msgstr ""
 "S はコンマ区切りの文字列で、各項目は keyword[:value] 形式で指定する。 認識さ"
 "れるオプションは以下の通り。 nosync:bitmask, nodma:x, period:ns, disconnect:"
-"x, debug:x, clock:x, next。 詳細は I</usr/src/linux/drivers/scsi/wd33c93.c> "
-"を参照せよ。"
+"x, debug:x, clock:x, next。 詳細はカーネルソースファイル I<drivers/scsi/"
+"wd33c93.c> を参照。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:763
+#: build/C/man7/bootparam.7:915
 #, no-wrap
-msgid "Hard Disks"
+msgid "Hard disks"
 msgstr "ハードディスク"
 
 #. type: TP
-#: build/C/man7/bootparam.7:764
+#: build/C/man7/bootparam.7:916
 #, no-wrap
 msgid "B<IDE Disk/CD-ROM Driver Parameters>"
 msgstr "B<IDE Disk/CD-ROM ドライバのパラメータ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:769
+#: build/C/man7/bootparam.7:921
 msgid ""
 "The IDE driver accepts a number of parameters, which range from disk "
 "geometry specifications, to support for broken controller chips.  Drive-"
@@ -2255,7 +2326,7 @@ msgstr ""
 "を使う。 ここで X には 'a' から 'h' の文字を指定する。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:773
+#: build/C/man7/bootparam.7:925
 msgid ""
 "Non-drive-specific options are specified with the prefix 'hd='.  Note that "
 "using a drive-specific prefix for a non-drive-specific option will still "
@@ -2266,27 +2337,27 @@ msgstr ""
 "い。 そのオプションは期待通りそのドライブに適用される。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:783
+#: build/C/man7/bootparam.7:935
 msgid ""
 "Also note that 'hd=' can be used to refer to the next unspecified drive in "
 "the (a, ..., h) sequence.  For the following discussions, the 'hd=' option "
 "will be cited for brevity.  See the file I<Documentation/ide.txt> (or "
-"I<drivers/block/README.ide> for older kernels) in the kernel source for more "
-"details."
+"I<drivers/block/README.ide> for older kernels) in the Linux kernel source "
+"for more details."
 msgstr ""
 "\\&'hd=' は、(a, ..., h) のシーケンスにおいて、 まだ指定されていない次のドラ"
 "イブを指すためにも使える。 これ以降では簡単のために 'hd=' を使って説明する。 "
-"さらに詳しい情報を得るには、カーネルソース内の I<Documentation/ide.txt> (古い"
-"カーネルの場合は I<drivers/block/README.ide>)  を参照のこと。"
+"さらに詳しい情報を得るには、Linux カーネルソース内の I<Documentation/ide."
+"txt> (古いカーネルの場合は I<drivers/block/README.ide>) を参照のこと。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:783
+#: build/C/man7/bootparam.7:935
 #, no-wrap
 msgid "B<The 'hd=cyls,heads,sects[,wpcom[,irq]]' options>"
 msgstr "B<'hd=cyls,heads,sects[,wpcom[,irq]]' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:794
+#: build/C/man7/bootparam.7:946
 msgid ""
 "These options are used to specify the physical geometry of the disk.  Only "
 "the first three values are required.  The cylinder/head/sectors values will "
@@ -2302,13 +2373,13 @@ msgstr ""
 "メータではない)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:794
+#: build/C/man7/bootparam.7:946
 #, no-wrap
 msgid "B<The 'hd=serialize' option>"
 msgstr "B<'hd=serialize' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:802
+#: build/C/man7/bootparam.7:954
 msgid ""
 "The dual IDE interface CMD-640 chip is broken as designed such that when "
 "drives on the secondary interface are used at the same time as drives on the "
@@ -2322,13 +2393,13 @@ msgstr ""
 "にする。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:802
+#: build/C/man7/bootparam.7:954
 #, no-wrap
 msgid "B<The 'hd=dtc2278' option>"
 msgstr "B<'hd=dtc2278' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:807
+#: build/C/man7/bootparam.7:959
 msgid ""
 "This option tells the driver that you have a DTC-2278D IDE interface.  The "
 "driver then tries to do DTC-specific operations to enable the second "
@@ -2339,23 +2410,24 @@ msgstr ""
 "送モード)  を使用可能にするよう試みる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:807
+#: build/C/man7/bootparam.7:959
 #, no-wrap
 msgid "B<The 'hd=noprobe' option>"
 msgstr "B<'hd=noprobe' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:811
+#: build/C/man7/bootparam.7:963
 msgid "Do not probe for this drive.  For example,"
 msgstr "このドライブの自動検出をしない。 例えば"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:813
-msgid "hdb=noprobe hdb=1166,7,17"
-msgstr "hdb=noprobe hdb=1166,7,17"
+#: build/C/man7/bootparam.7:967
+#, no-wrap
+msgid "hdb=noprobe hdb=1166,7,17\n"
+msgstr "hdb=noprobe hdb=1166,7,17\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:817
+#: build/C/man7/bootparam.7:973
 msgid ""
 "would disable the probe, but still specify the drive geometry so that it "
 "would be registered as a valid block device, and hence usable."
@@ -2364,13 +2436,13 @@ msgstr ""
 "で、 このドライブは正しいブロックデバイスとして登録され、使用可能になる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:817
+#: build/C/man7/bootparam.7:973
 #, no-wrap
 msgid "B<The 'hd=nowerr' option>"
 msgstr "B<'hd=nowerr' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:823
+#: build/C/man7/bootparam.7:979
 msgid ""
 "Some drives apparently have the B<WRERR_STAT> bit stuck on permanently.  "
 "This enables a work-around for these broken devices."
@@ -2380,13 +2452,13 @@ msgstr ""
 "回避機能が有効になる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:823
+#: build/C/man7/bootparam.7:979
 #, no-wrap
 msgid "B<The 'hd=cdrom' option>"
 msgstr "B<'hd=cdrom' オプション>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:829
+#: build/C/man7/bootparam.7:985
 msgid ""
 "This tells the IDE driver that there is an ATAPI compatible CD-ROM attached "
 "in place of a normal IDE hard disk.  In most cases the CD-ROM is identified "
@@ -2397,17 +2469,17 @@ msgstr ""
 "が、 うまく行かない場合に試してみると良い。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:829
+#: build/C/man7/bootparam.7:985
 #, no-wrap
 msgid "B<Standard ST-506 Disk Driver Options ('hd=')>"
 msgstr "B<スタンダード ST-506 ディスクドライバのオプション ('hd=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:838
+#: build/C/man7/bootparam.7:994
 msgid ""
 "The standard disk driver can accept geometry arguments for the disks similar "
-"to the IDE driver.  Note however that it only expects three values (C/H/S); "
-"any more or any less and it will silently ignore you.  Also, it only accepts "
+"to the IDE driver.  Note however that it expects only three values (C/H/S); "
+"any more or any less and it will silently ignore you.  Also, it accepts only "
 "'hd=' as an argument, that is, 'hda=' and so on are not valid here.  The "
 "format is as follows:"
 msgstr ""
@@ -2418,12 +2490,13 @@ msgstr ""
 "定はここでは正しくない。 書式は次の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:840
-msgid "hd=cyls,heads,sects"
-msgstr "hd=cyls,heads,sects"
+#: build/C/man7/bootparam.7:998
+#, no-wrap
+msgid "hd=cyls,heads,sects\n"
+msgstr "hd=cyls,heads,sects\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:843
+#: build/C/man7/bootparam.7:1003
 msgid ""
 "If there are two disks installed, the above is repeated with the geometry "
 "parameters of the second disk."
@@ -2432,30 +2505,31 @@ msgstr ""
 "リが設定される。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:843
+#: build/C/man7/bootparam.7:1003
 #, no-wrap
 msgid "B<XT Disk Driver Options ('xd=')>"
 msgstr "B<XT ディスクドライバのオプション ('xd=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:848
+#: build/C/man7/bootparam.7:1009
 msgid ""
 "If you are unfortunate enough to be using one of these old 8 bit cards that "
 "move data at a whopping 125kB/s then here is the scoop.  If the card is not "
-"recognized, you will have to use a boot arg of the form:"
+"recognized, you will have to use a boot argument of the form:"
 msgstr ""
 "これらの古い 8 bit カード (125kB/s の転送速度しかない!)  を使わなければならな"
 "い不幸な人のためのオプションである。 カードが認識されない場合は以下の書式で起"
 "動時引数を指定する必要があるだろう。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:850
-msgid "xd=type,irq,iobase,dma_chan"
-msgstr "xd=type,irq,iobase,dma_chan"
+#: build/C/man7/bootparam.7:1013
+#, no-wrap
+msgid "xd=type,irq,iobase,dma_chan\n"
+msgstr "xd=type,irq,iobase,dma_chan\n"
 
 #.  1.1.50, 1.3.81, 1.3.99, 2.0.34, 2.1.67, 2.1.78, 2.1.127
 #. type: Plain text
-#: build/C/man7/bootparam.7:866
+#: build/C/man7/bootparam.7:1031
 msgid ""
 "The type value specifies the particular manufacturer of the card, overriding "
 "autodetection.  For the types to use, consult the I<drivers/block/xd.c> "
@@ -2476,7 +2550,7 @@ msgstr ""
 "与えられているが、 それらは等価である。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:873
+#: build/C/man7/bootparam.7:1038
 msgid ""
 "The xd_setup() function does no checking on the values, and assumes that you "
 "entered all four values.  Don't disappoint it.  Here is an example usage for "
@@ -2489,94 +2563,100 @@ msgstr ""
 "「デフォルト」の値を使っている)。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:875
-msgid "xd=2,5,0x320,3"
-msgstr "xd=2,5,0x320,3"
+#: build/C/man7/bootparam.7:1042
+#, no-wrap
+msgid "xd=2,5,0x320,3\n"
+msgstr "xd=2,5,0x320,3\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:875
+#: build/C/man7/bootparam.7:1044
 #, no-wrap
 msgid "B<Syquest's EZ* removable disks>"
 msgstr "B<Syquest 製 EZ* リムーバブルディスク>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:879
-msgid "B<ez=>I<iobase[,irq[,rep[,nybble]]]>"
-msgstr "B<ez=>I<iobase[,irq[,rep[,nybble]]]>"
+#: build/C/man7/bootparam.7:1051
+#, no-wrap
+msgid "B<ez=>I<iobase[,irq[,rep[,nybble]]]>\n"
+msgstr "B<ez=>I<iobase[,irq[,rep[,nybble]]]>\n"
 
 #. type: SS
-#: build/C/man7/bootparam.7:879
+#: build/C/man7/bootparam.7:1053
 #, no-wrap
-msgid "IBM MCA Bus Devices"
+msgid "IBM MCA bus devices"
 msgstr "IBM MCA バス上のデバイス"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:882
-msgid "See also I</usr/src/linux/Documentation/mca.txt>."
-msgstr "I</usr/src/linux/Documentation/mca.txt> も参照。"
+#: build/C/man7/bootparam.7:1056
+msgid "See also the kernel source file I<Documentation/mca.txt>."
+msgstr "カーネルソースファイル I<Documentation/mca.txt> も参照。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:882
+#: build/C/man7/bootparam.7:1056
 #, no-wrap
 msgid "B<PS/2 ESDI hard disks>"
 msgstr "B<PS/2 ESDI ハードディスク>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:885
+#: build/C/man7/bootparam.7:1059
 msgid "It is possible to specify the desired geometry at boot time:"
 msgstr "起動時に所望のジオメトリを指定できる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:887
-msgid "B<ed=>I<cyls,heads,sectors.>"
-msgstr "B<ed=>I<cyls,heads,sectors.>"
+#: build/C/man7/bootparam.7:1063
+#, no-wrap
+msgid "B<ed=>I<cyls,heads,sectors.>\n"
+msgstr "B<ed=>I<cyls,heads,sectors.>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:889
+#: build/C/man7/bootparam.7:1067
 msgid "For a ThinkPad-720, add the option"
 msgstr "ThinkPad-720 を使用する場合は以下のオプションを追加すること。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:891
-msgid "B<tp720=1>."
-msgstr "B<tp720=1>"
+#: build/C/man7/bootparam.7:1071
+#, no-wrap
+msgid "B<tp720=1>.\n"
+msgstr "B<tp720=1>.\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:891
+#: build/C/man7/bootparam.7:1073
 #, no-wrap
 msgid "B<IBM Microchannel SCSI Subsystem configuration>"
 msgstr "B<IBM Microchannel SCSI サブシステムの設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:895
-msgid "B<ibmmcascsi=>I<N>"
-msgstr "B<ibmmcascsi=>I<N>"
+#: build/C/man7/bootparam.7:1080
+#, no-wrap
+msgid "B<ibmmcascsi=>I<N>\n"
+msgstr "B<ibmmcascsi=>I<N>\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:897
+#: build/C/man7/bootparam.7:1086
 msgid "where N is the I<pun> (SCSI ID) of the subsystem."
 msgstr "N はサブシステムの I<pun> (SCSI ID) を表す。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:897
+#: build/C/man7/bootparam.7:1086
 #, no-wrap
 msgid "B<The Aztech Interface>"
 msgstr "B<Aztech インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:900 build/C/man7/bootparam.7:985
-#: build/C/man7/bootparam.7:990 build/C/man7/bootparam.7:1001
-#: build/C/man7/bootparam.7:1006
+#: build/C/man7/bootparam.7:1089 build/C/man7/bootparam.7:1205
+#: build/C/man7/bootparam.7:1214 build/C/man7/bootparam.7:1229
+#: build/C/man7/bootparam.7:1238
 msgid "The syntax for this type of card is:"
 msgstr "このタイプのカードの構文は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:902
-msgid "aztcd=iobase[,magic_number]"
-msgstr "aztcd=iobase[,magic_number]"
+#: build/C/man7/bootparam.7:1093
+#, no-wrap
+msgid "aztcd=iobase[,magic_number]\n"
+msgstr "aztcd=iobase[,magic_number]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:907
+#: build/C/man7/bootparam.7:1100
 msgid ""
 "If you set the magic_number to 0x79 then the driver will try and run anyway "
 "in the event of an unknown firmware version.  All other values are ignored."
@@ -2585,32 +2665,23 @@ msgstr ""
 "分からない場合でも、 とにかく実行を試みる。 その他の値はすべて無視される。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:907
+#: build/C/man7/bootparam.7:1100
 #, no-wrap
 msgid "B<Parallel port CD-ROM drives>"
 msgstr "B<パラレルポート CD-ROM ドライブ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:910 build/C/man7/bootparam.7:955
-#: build/C/man7/bootparam.7:1152 build/C/man7/bootparam.7:1160
-#: build/C/man7/bootparam.7:1170 build/C/man7/bootparam.7:1180
-#: build/C/man7/bootparam.7:1213 build/C/man7/bootparam.7:1230
-#: build/C/man7/bootparam.7:1242 build/C/man7/bootparam.7:1266
-msgid "Syntax:"
-msgstr "構文は以下の通り。"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:912
-msgid "pcd.driveN=prt,pro,uni,mod,slv,dly"
-msgstr "pcd.driveN=port,pro,uni,mod,slv,dly"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:914
-msgid "pcd.nice=nice"
-msgstr "pcd.nice=nice"
+#: build/C/man7/bootparam.7:1108
+#, no-wrap
+msgid ""
+"pcd.driveN=prt,pro,uni,mod,slv,dly\n"
+"pcd.nice=nice\n"
+msgstr ""
+"pcd.driveN=prt,pro,uni,mod,slv,dly\n"
+"pcd.nice=nice\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:921
+#: build/C/man7/bootparam.7:1117
 msgid ""
 "where 'port' is the base address, 'pro' is the protocol number, 'uni' is the "
 "unit selector (for chained devices), 'mod' is the mode (or -1 to choose the "
@@ -2625,13 +2696,13 @@ msgstr ""
 "間の使い方を制御する。 ただし速度はある程度低下する。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:921
+#: build/C/man7/bootparam.7:1117
 #, no-wrap
 msgid "B<The CDU-31A and CDU-33A Sony Interface>"
 msgstr "B<Sony 製 CDU-31A と CDU-33A のインターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:926
+#: build/C/man7/bootparam.7:1122
 msgid ""
 "This CD-ROM interface is found on some of the Pro Audio Spectrum sound "
 "cards, and other Sony supplied interface cards.  The syntax is as follows:"
@@ -2640,12 +2711,13 @@ msgstr ""
 "ニーが供給するインターフェースカードで使われている。 構文は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:928
-msgid "cdu31a=iobase,[irq[,is_pas_card]]"
-msgstr "cdu31a=iobase,[irq[,is_pas_card]]"
+#: build/C/man7/bootparam.7:1126
+#, no-wrap
+msgid "cdu31a=iobase,[irq[,is_pas_card]]\n"
+msgstr "cdu31a=iobase,[irq[,is_pas_card]]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:934
+#: build/C/man7/bootparam.7:1134
 msgid ""
 "Specifying an IRQ value of zero tells the driver that hardware interrupts "
 "aren't supported (as on some PAS cards).  If your card supports interrupts, "
@@ -2657,7 +2729,7 @@ msgstr ""
 "使用すべきである。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:939
+#: build/C/man7/bootparam.7:1139
 msgid ""
 "The I<is_pas_card> should be entered as 'PAS' if using a Pro Audio Spectrum "
 "card, and otherwise it should not be specified at all."
@@ -2666,24 +2738,25 @@ msgstr ""
 "指定し、 そうでないときにはなにも指定しない。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:939
+#: build/C/man7/bootparam.7:1139
 #, no-wrap
 msgid "B<The CDU-535 Sony Interface>"
 msgstr "B<Sony 製 CDU-535 インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:942 build/C/man7/bootparam.7:950
-#: build/C/man7/bootparam.7:966
+#: build/C/man7/bootparam.7:1142 build/C/man7/bootparam.7:1154
+#: build/C/man7/bootparam.7:1178
 msgid "The syntax for this CD-ROM interface is:"
 msgstr "この CD-ROM インターフェースの構文は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:944
-msgid "sonycd535=iobase[,irq]"
-msgstr "sonycd535=iobase[,irq]"
+#: build/C/man7/bootparam.7:1146
+#, no-wrap
+msgid "sonycd535=iobase[,irq]\n"
+msgstr "sonycd535=iobase[,irq]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:947
+#: build/C/man7/bootparam.7:1151
 msgid ""
 "A zero can be used for the I/O base as a 'placeholder' if one wishes to "
 "specify an IRQ value."
@@ -2692,51 +2765,54 @@ msgstr ""
 "れる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:947
+#: build/C/man7/bootparam.7:1151
 #, no-wrap
 msgid "B<The GoldStar Interface>"
 msgstr "B<GoldStar インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:952
-msgid "gscd=iobase"
-msgstr "gscd=iobase"
+#: build/C/man7/bootparam.7:1158
+#, no-wrap
+msgid "gscd=iobase\n"
+msgstr "gscd=iobase\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:952
+#: build/C/man7/bootparam.7:1160
 #, no-wrap
 msgid "B<The ISP16 CD-ROM Interface>"
 msgstr "B<ISP16 CD-ROM インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:957
-msgid "isp16=[iobase[,irq[,dma[,type]]]]"
-msgstr "isp16=[iobase[,irq[,dma[,type]]]]"
+#: build/C/man7/bootparam.7:1167
+#, no-wrap
+msgid "isp16=[iobase[,irq[,dma[,type]]]]\n"
+msgstr "isp16=[iobase[,irq[,dma[,type]]]]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:963
+#: build/C/man7/bootparam.7:1175
 msgid ""
-"(three integers and a string).  If the type is given as 'noisp16', the "
+"(Three integers and a string.)  If the type is given as 'noisp16', the "
 "interface will not be configured.  Other recognized types are: 'Sanyo\", "
 "'Sony', 'Panasonic' and 'Mitsumi'."
 msgstr ""
-"(整数値 3 つと文字列 1 つ。) type に 'noisp16' を指定すると、 インターフェー"
-"スの設定は行なわれない。 type にはこの他にも 'Sanyo', 'Sony', 'Panasonic', "
-"'Mitsumi' が指定できる。"
+"(整数値 3 つと文字列 1 つの形式) type に 'noisp16' を指定すると、 インター"
+"フェースの設定は行なわれない。 type にはこの他にも 'Sanyo', 'Sony', "
+"'Panasonic', 'Mitsumi' が指定できる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:963
+#: build/C/man7/bootparam.7:1175
 #, no-wrap
 msgid "B<The Mitsumi Standard Interface>"
 msgstr "B<Mitsumi 標準インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:968
-msgid "mcd=iobase,[irq[,wait_value]]"
-msgstr "mcd=iobase,[irq[,wait_value]]"
+#: build/C/man7/bootparam.7:1182
+#, no-wrap
+msgid "mcd=iobase,[irq[,wait_value]]\n"
+msgstr "mcd=iobase,[irq[,wait_value]]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:976
+#: build/C/man7/bootparam.7:1192
 msgid ""
 "The I<wait_value> is used as an internal timeout value for people who are "
 "having problems with their drive, and may or may not be implemented "
@@ -2749,47 +2825,50 @@ msgstr ""
 "しない。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:976
+#: build/C/man7/bootparam.7:1192
 #, no-wrap
 msgid "B<The Mitsumi XA/MultiSession Interface>"
 msgstr "B<Mitsumi XA/マルチセッションインターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:980
+#: build/C/man7/bootparam.7:1196
 msgid ""
 "This is for the same hardware as above, but the driver has extended "
 "features.  Syntax:"
 msgstr "これは上記と同じハードウェアだが、拡張機能がある。 構文は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:982
-msgid "mcdx=iobase[,irq]"
-msgstr "mcdx=iobase[,irq]"
+#: build/C/man7/bootparam.7:1200
+#, no-wrap
+msgid "mcdx=iobase[,irq]\n"
+msgstr "mcdx=iobase[,irq]\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:982
+#: build/C/man7/bootparam.7:1202
 #, no-wrap
 msgid "B<The Optics Storage Interface>"
 msgstr "B<Optics ストレージインターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:987
-msgid "optcd=iobase"
-msgstr "optcd=iobase"
+#: build/C/man7/bootparam.7:1209
+#, no-wrap
+msgid "optcd=iobase\n"
+msgstr "optcd=iobase\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:987
+#: build/C/man7/bootparam.7:1211
 #, no-wrap
 msgid "B<The Phillips CM206 Interface>"
 msgstr "B<Phillips CM206 インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:992
-msgid "cm206=[iobase][,irq]"
-msgstr "cm206=[iobase][,irq]"
+#: build/C/man7/bootparam.7:1218
+#, no-wrap
+msgid "cm206=[iobase][,irq]\n"
+msgstr "cm206=[iobase][,irq]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:998
+#: build/C/man7/bootparam.7:1226
 msgid ""
 "The driver assumes numbers between 3 and 11 are IRQ values, and numbers "
 "between 0x300 and 0x370 are I/O ports, so you can specify one, or both "
@@ -2800,29 +2879,31 @@ msgstr ""
 "わない。 \\&'cm206=auto' とすることにより自動検出もできる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:998
+#: build/C/man7/bootparam.7:1226
 #, no-wrap
 msgid "B<The Sanyo Interface>"
 msgstr "B<Sanyo インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1003
-msgid "sjcd=iobase[,irq[,dma_channel]]"
-msgstr "sjcd=iobase[,irq[,dma_channel]]"
+#: build/C/man7/bootparam.7:1233
+#, no-wrap
+msgid "sjcd=iobase[,irq[,dma_channel]]\n"
+msgstr "sjcd=iobase[,irq[,dma_channel]]\n"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1003
+#: build/C/man7/bootparam.7:1235
 #, no-wrap
 msgid "B<The SoundBlaster Pro Interface>"
 msgstr "B<SoundBlaster Pro インターフェース>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1008
-msgid "sbpcd=iobase,type"
-msgstr "sbpcd=iobase,type"
+#: build/C/man7/bootparam.7:1242
+#, no-wrap
+msgid "sbpcd=iobase,type\n"
+msgstr "sbpcd=iobase,type\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1013
+#: build/C/man7/bootparam.7:1249
 msgid ""
 "where type is one of the following (case sensitive) strings: "
 "\\&'SoundBlaster', 'LaserMate', or 'SPEA'.  The I/O base is that of the CD-"
@@ -2833,13 +2914,13 @@ msgstr ""
 "ドのサウンド部の値と間違えないこと。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1013
+#: build/C/man7/bootparam.7:1249
 #, no-wrap
-msgid "Ethernet Devices"
+msgid "Ethernet devices"
 msgstr "イーサネットデバイス"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1017
+#: build/C/man7/bootparam.7:1253
 msgid ""
 "Different drivers make use of different parameters, but they all at least "
 "share having an IRQ, an I/O port base value, and a name.  In its most "
@@ -2850,12 +2931,13 @@ msgstr ""
 "つ。 最も一般的な形式は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1019
-msgid "ether=irq,iobase[,param_1[,...param_8]],name"
-msgstr "ether=irq,iobase[,param_1[,...param_8]],name"
+#: build/C/man7/bootparam.7:1257
+#, no-wrap
+msgid "ether=irq,iobase[,param_1[,...param_8]],name\n"
+msgstr "ether=irq,iobase[,param_1[,...param_8]],name\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1026
+#: build/C/man7/bootparam.7:1266
 msgid ""
 "The first nonnumeric argument is taken as the name.  The param_n values (if "
 "applicable) usually have different meanings for each different card/driver.  "
@@ -2867,10 +2949,10 @@ msgstr ""
 "フェースの選択、 DMA チャネルなどである。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1030
+#: build/C/man7/bootparam.7:1270
 msgid ""
 "The most common use of this parameter is to force probing for a second "
-"ethercard, as the default is to only probe for one.  This can be "
+"ethercard, as the default is to probe only for one.  This can be "
 "accomplished with a simple:"
 msgstr ""
 "このパラメータの最もよくある利用法は、 2 番目の Ethernet カードを強制的に検出"
@@ -2878,12 +2960,13 @@ msgstr ""
 "にすればよい。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1032
-msgid "ether=0,0,eth1"
-msgstr "ether=0,0,eth1"
+#: build/C/man7/bootparam.7:1274
+#, no-wrap
+msgid "ether=0,0,eth1\n"
+msgstr "ether=0,0,eth1\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1035
+#: build/C/man7/bootparam.7:1279
 msgid ""
 "Note that the values of zero for the IRQ and I/O base in the above example "
 "tell the driver(s) to autoprobe."
@@ -2892,7 +2975,7 @@ msgstr ""
 "出をするよう伝えているのである。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1041
+#: build/C/man7/bootparam.7:1285
 msgid ""
 "The Ethernet-HowTo has extensive documentation on using multiple cards and "
 "on the card/driver-specific implementation of the param_n values where "
@@ -2905,31 +2988,31 @@ msgstr ""
 "い。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1041
+#: build/C/man7/bootparam.7:1285
 #, no-wrap
-msgid "The Floppy Disk Driver"
+msgid "The floppy disk driver"
 msgstr "フロッピーディスクドライバ"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1049
+#: build/C/man7/bootparam.7:1293
 msgid ""
 "There are many floppy driver options, and they are all listed in "
 "I<Documentation/floppy.txt> (or I<drivers/block/README.fd> for older "
-"kernels) in the kernel source.  This information is taken directly from that "
-"file."
+"kernels) in the Linux kernel source.  This information is taken directly "
+"from that file."
 msgstr ""
-"フロッピードライバのオプションは多数あり、 カーネルソース内の "
+"フロッピードライバのオプションは多数あり、 Linux カーネルソース内の "
 "I<Documentation/floppy.txt> (古いカーネルの場合は I<drivers/block/README."
 "fd>)  にすべて記載されている。 以下の情報はこのファイルからとったものである。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1049
+#: build/C/man7/bootparam.7:1293
 #, no-wrap
 msgid "B<floppy=mask,allowed_drive_mask>"
 msgstr "B<floppy=mask,allowed_drive_mask>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1059
+#: build/C/man7/bootparam.7:1303
 msgid ""
 "Sets the bit mask of allowed drives to mask.  By default, only units 0 and 1 "
 "of each floppy controller are allowed.  This is done because certain "
@@ -2944,13 +3027,13 @@ msgstr ""
 "導入によって、 このオプションはあまり使われなくなった。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1059
+#: build/C/man7/bootparam.7:1303
 #, no-wrap
 msgid "B<floppy=all_drives>"
 msgstr "B<floppy=all_drives>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1064
+#: build/C/man7/bootparam.7:1308
 msgid ""
 "Sets the bit mask of allowed drives to all drives.  Use this if you have "
 "more than two drives connected to a floppy controller."
@@ -2959,25 +3042,25 @@ msgstr ""
 "ロッピーコントローラに 2 台以上のドライブを接続する場合に用いる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1064
+#: build/C/man7/bootparam.7:1308
 #, no-wrap
 msgid "B<floppy=asus_pci>"
 msgstr "B<floppy=asus_pci>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1068
+#: build/C/man7/bootparam.7:1312
 msgid "Sets the bit mask to allow only units 0 and 1.  (The default)"
 msgstr ""
 "ユニット 0 と 1 のみを許可するようビットマスクを設定する。 (デフォルト)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1068
+#: build/C/man7/bootparam.7:1312
 #, no-wrap
 msgid "B<floppy=daring>"
 msgstr "B<floppy=daring>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1075
+#: build/C/man7/bootparam.7:1319
 msgid ""
 "Tells the floppy driver that you have a well behaved floppy controller.  "
 "This allows more efficient and smoother operation, but may fail on certain "
@@ -2988,13 +3071,13 @@ msgstr ""
 "は動作に失敗することがある。 これを指定するとある種の動作が高速になる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1075
+#: build/C/man7/bootparam.7:1319
 #, no-wrap
 msgid "B<floppy=0,daring>"
 msgstr "B<floppy=0,daring>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1079
+#: build/C/man7/bootparam.7:1323
 msgid ""
 "Tells the floppy driver that your floppy controller should be used with "
 "caution."
@@ -3003,25 +3086,25 @@ msgstr ""
 "る。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1079
+#: build/C/man7/bootparam.7:1323
 #, no-wrap
 msgid "B<floppy=one_fdc>"
 msgstr "B<floppy=one_fdc>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1082
+#: build/C/man7/bootparam.7:1326
 msgid "Tells the floppy driver that you have only floppy controller (default)"
 msgstr ""
 "フロッピーコントローラがひとつしかないことをドライバに伝える (デフォルト)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1082
+#: build/C/man7/bootparam.7:1326
 #, no-wrap
 msgid "B<floppy=two_fdc> or B<floppy=address,two_fdc>"
 msgstr "B<floppy=two_fdc> または B<floppy=address,two_fdc>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1088
+#: build/C/man7/bootparam.7:1332
 msgid ""
 "Tells the floppy driver that you have two floppy controllers.  The second "
 "floppy controller is assumed to be at address.  If address is not given, "
@@ -3032,13 +3115,13 @@ msgstr ""
 "が使われる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1088
+#: build/C/man7/bootparam.7:1332
 #, no-wrap
 msgid "B<floppy=thinkpad>"
 msgstr "B<floppy=thinkpad>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1093
+#: build/C/man7/bootparam.7:1337
 msgid ""
 "Tells the floppy driver that you have a Thinkpad.  Thinkpads use an inverted "
 "convention for the disk change line."
@@ -3047,24 +3130,24 @@ msgstr ""
 "Thinkpad はディスク取出の検出信号を反転して使っている。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1093
+#: build/C/man7/bootparam.7:1337
 #, no-wrap
 msgid "B<floppy=0,thinkpad>"
 msgstr "B<floppy=0,thinkpad>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1096
+#: build/C/man7/bootparam.7:1340
 msgid "Tells the floppy driver that you don't have a Thinkpad."
 msgstr "Thinkpad を使っていないことをドライバに伝える。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1096
+#: build/C/man7/bootparam.7:1340
 #, no-wrap
 msgid "B<floppy=drive,type,cmos>"
 msgstr "B<floppy=drive,type,cmos>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1107
+#: build/C/man7/bootparam.7:1351
 msgid ""
 "Sets the cmos type of drive to type.  Additionally, this drive is allowed in "
 "the bit mask.  This is useful if you have more than two floppy drives (only "
@@ -3080,26 +3163,26 @@ msgstr ""
 "る。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1107
+#: build/C/man7/bootparam.7:1351
 #, no-wrap
 msgid "B<floppy=unexpected_interrupts>"
 msgstr "B<floppy=unexpected_interrupts>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1111
+#: build/C/man7/bootparam.7:1355
 msgid ""
 "Print a warning message when an unexpected interrupt is received (default "
 "behavior)"
 msgstr "予期しない割り込みを受けた時に警告メッセージを表示する (デフォルト)。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1111
+#: build/C/man7/bootparam.7:1355
 #, no-wrap
 msgid "B<floppy=no_unexpected_interrupts> or B<floppy=L40SX>"
 msgstr "B<floppy=no_unexpected_interrupts> または B<floppy=L40SX>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1119
+#: build/C/man7/bootparam.7:1363
 msgid ""
 "Don't print a message when an unexpected interrupt is received.  This is "
 "needed on IBM L40SX laptops in certain video modes.  (There seems to be an "
@@ -3112,32 +3195,33 @@ msgstr ""
 "込みは性能だけに影響し、無視しても安全である。)"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1119
+#: build/C/man7/bootparam.7:1363
 #, no-wrap
-msgid "The Sound Driver"
+msgid "The sound driver"
 msgstr "サウンドドライバ"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1129
+#: build/C/man7/bootparam.7:1373
 msgid ""
-"The sound driver can also accept boot args to override the compiled in "
+"The sound driver can also accept boot arguments to override the compiled in "
 "values.  This is not recommended, as it is rather complex.  It is described "
-"in the kernel source file I<Documentation/sound/oss/README.OSS> (I<drivers/"
-"sound/Readme.linux> in older kernel versions).  It accepts a boot arg of the "
-"form:"
+"in the Linux kernel source file I<Documentation/sound/oss/README.OSS> "
+"(I<drivers/sound/Readme.linux> in older kernel versions).  It accepts a boot "
+"argument of the form:"
 msgstr ""
 "サウンドドライバも起動時引数を受け付け、 コンパイル時に指定された値を変更でき"
-"る。 これはやや面倒なため、あまりお薦めできない。 詳細は、カーネルソース内の "
-"I<Documentation/sound/oss/README.OSS> (古いカーネルの場合は I<drivers/sound/"
-"Readme.linux>)  に記載されている。 引数の形式は以下の通り。"
+"る。 これはやや面倒なため、あまりお薦めできない。 詳細は、Linux カーネルソー"
+"ス内の I<Documentation/sound/oss/README.OSS> (古いカーネルの場合は I<drivers/"
+"sound/Readme.linux>)  に記載されている。 引数の形式は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1131
-msgid "sound=device1[,device2[,device3...[,device10]]]"
-msgstr "sound=device1[,device2[,device3...[,device10]]]"
+#: build/C/man7/bootparam.7:1377
+#, no-wrap
+msgid "sound=device1[,device2[,device3...[,device10]]]\n"
+msgstr "sound=device1[,device2[,device3...[,device10]]]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1134
+#: build/C/man7/bootparam.7:1382
 msgid ""
 "where each deviceN value is of the following format 0xTaaaId and the bytes "
 "are used as follows:"
@@ -3146,7 +3230,7 @@ msgstr ""
 "通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1137
+#: build/C/man7/bootparam.7:1385
 msgid ""
 "T - device type: 1=FM, 2=SB, 3=PAS, 4=GUS, 5=MPU401, 6=SB16, 7=SB16-MPU401"
 msgstr ""
@@ -3154,50 +3238,51 @@ msgstr ""
 "MPU401"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1139
+#: build/C/man7/bootparam.7:1387
 msgid "aaa - I/O address in hex."
 msgstr "aaa - I/O ポートアドレス (16進値)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1141
+#: build/C/man7/bootparam.7:1389
 msgid "I - interrupt line in hex (i.e 10=a, 11=b, ...)"
 msgstr "I - 割り込み番号 (16 進値。例: 10=a, 11=b, ...)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1143
+#: build/C/man7/bootparam.7:1391
 msgid "d - DMA channel."
 msgstr "d - DMA チャネル"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1148
+#: build/C/man7/bootparam.7:1396
 msgid ""
 "As you can see it gets pretty messy, and you are better off to compile in "
-"your own personal values as recommended.  Using a boot arg of \\&'sound=0' "
-"will disable the sound driver entirely."
+"your own personal values as recommended.  Using a boot argument of "
+"\\&'sound=0' will disable the sound driver entirely."
 msgstr ""
 "上記の通り、かなり扱いにくい形式となっており、 コンパイル時に自分にあった値を"
 "指定する方が良いだろう。 なお起動時引数として 'sound=0' を指定すると、 サウン"
 "ドドライバを完全に無効にする。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1148
+#: build/C/man7/bootparam.7:1396
 #, no-wrap
-msgid "ISDN Drivers"
+msgid "ISDN drivers"
 msgstr "ISDN ドライバ"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1149
+#: build/C/man7/bootparam.7:1397
 #, no-wrap
 msgid "B<The ICN ISDN driver>"
 msgstr "B<ICN ISDN ドライバ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1154
-msgid "icn=iobase,membase,icn_id1,icn_id2"
-msgstr "icn=iobase,membase,icn_id1,icn_id2"
+#: build/C/man7/bootparam.7:1404
+#, no-wrap
+msgid "icn=iobase,membase,icn_id1,icn_id2\n"
+msgstr "icn=iobase,membase,icn_id1,icn_id2\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1157
+#: build/C/man7/bootparam.7:1409
 msgid ""
 "where icn_id1,icn_id2 are two strings used to identify the card in kernel "
 "messages."
@@ -3206,18 +3291,19 @@ msgstr ""
 "セージで用いられる。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1157
+#: build/C/man7/bootparam.7:1409
 #, no-wrap
 msgid "B<The PCBIT ISDN driver>"
 msgstr "B<PCBIT ISDN ドライバ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1162
-msgid "pcbit=membase1,irq1[,membase2,irq2]"
-msgstr "pcbit=membase1,irq1[,membase2,irq2]"
+#: build/C/man7/bootparam.7:1416
+#, no-wrap
+msgid "pcbit=membase1,irq1[,membase2,irq2]\n"
+msgstr "pcbit=membase1,irq1[,membase2,irq2]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1167
+#: build/C/man7/bootparam.7:1423
 msgid ""
 "where membaseN is the shared memory base of the N'th card, and irqN is the "
 "interrupt setting of the N'th card.  The default is IRQ 5 and membase "
@@ -3228,20 +3314,21 @@ msgstr ""
 "る。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1167
+#: build/C/man7/bootparam.7:1423
 #, no-wrap
 msgid "B<The Teles ISDN driver>"
 msgstr "B<Teles ISDN ドライバ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1172
-msgid "teles=iobase,irq,membase,protocol,teles_id"
-msgstr "teles=iobase,irq,membase,protocol,teles_id"
+#: build/C/man7/bootparam.7:1430
+#, no-wrap
+msgid "teles=iobase,irq,membase,protocol,teles_id\n"
+msgstr "teles=iobase,irq,membase,protocol,teles_id\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1176
+#: build/C/man7/bootparam.7:1436
 msgid ""
-"where iobase is the i/o port address of the card, membase is the shared "
+"where iobase is the I/O port address of the card, membase is the shared "
 "memory base address of the card, irq is the interrupt channel the card uses, "
 "and teles_id is the unique ASCII string identifier."
 msgstr ""
@@ -3250,36 +3337,39 @@ msgstr ""
 "スキー文字列による識別文字列である (他と重ならないようにする)。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1176
+#: build/C/man7/bootparam.7:1436
 #, no-wrap
-msgid "Serial Port Drivers"
+msgid "Serial port drivers"
 msgstr "シリアルポートドライバ"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1177
+#: build/C/man7/bootparam.7:1437
 #, no-wrap
 msgid "B<The RISCom/8 Multiport Serial Driver ('riscom8=')>"
 msgstr "B<RISCom/8 マルチポートシリアルドライバ ('riscom8=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1182
-msgid "riscom=iobase1[,iobase2[,iobase3[,iobase4]]]"
-msgstr "riscom=iobase1[,iobase2[,iobase3[,iobase4]]]"
+#: build/C/man7/bootparam.7:1444
+#, no-wrap
+msgid "riscom=iobase1[,iobase2[,iobase3[,iobase4]]]\n"
+msgstr "riscom=iobase1[,iobase2[,iobase3[,iobase4]]]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1185
+#: build/C/man7/bootparam.7:1449
 msgid ""
-"More details can be found in I</usr/src/linux/Documentation/riscom8.txt>."
-msgstr "詳細は I</usr/src/linux/Documentation/riscom8.txt> を参照のこと。"
+"More details can be found in the kernel source file I<Documentation/riscom8."
+"txt>."
+msgstr ""
+"詳細はカーネルソースファイル I<Documentation/riscom8.txt> を参照のこと。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1185
+#: build/C/man7/bootparam.7:1449
 #, no-wrap
 msgid "B<The DigiBoard Driver ('digi=')>"
 msgstr "B<DigiBoard ドライバ ('digi=')>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1189
+#: build/C/man7/bootparam.7:1453
 msgid ""
 "If this option is used, it should have precisely six parameters.  Syntax:"
 msgstr ""
@@ -3288,12 +3378,13 @@ msgstr ""
 "構文は以下の通り。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1191
-msgid "digi=status,type,altpin,numports,iobase,membase"
-msgstr "digi=status,type,altpin,numports,iobase,membase"
+#: build/C/man7/bootparam.7:1457
+#, no-wrap
+msgid "digi=status,type,altpin,numports,iobase,membase\n"
+msgstr "digi=status,type,altpin,numports,iobase,membase\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1203
+#: build/C/man7/bootparam.7:1471
 msgid ""
 "The parameters maybe given as integers, or as strings.  If strings are used, "
 "then iobase and membase should be given in hexadecimal.  The integer "
@@ -3314,62 +3405,65 @@ msgstr ""
 "たがって以下のふたつの起動時引数は同じ意味を持つ。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1205
-msgid "digi=E,PC/Xi,D,16,200,D0000"
-msgstr "digi=E,PC/Xi,D,16,200,D0000"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:1207
-msgid "digi=1,0,0,16,0x200,851968"
-msgstr "digi=1,0,0,16,0x200,851968"
+#: build/C/man7/bootparam.7:1476
+#, no-wrap
+msgid ""
+"digi=E,PC/Xi,D,16,200,D0000\n"
+"digi=1,0,0,16,0x200,851968\n"
+msgstr ""
+"digi=E,PC/Xi,D,16,200,D0000\n"
+"digi=1,0,0,16,0x200,851968\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1210
+#: build/C/man7/bootparam.7:1481
 msgid ""
-"More details can be found in I</usr/src/linux/Documentation/digiboard.txt>."
-msgstr "詳細は I</usr/src/linux/Documentation/digiboard.txt> を参照。"
+"More details can be found in the kernel source file I<Documentation/"
+"digiboard.txt>."
+msgstr "詳細はカーネルソースファイル I<Documentation/digiboard.txt> を参照。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1210
+#: build/C/man7/bootparam.7:1481
 #, no-wrap
 msgid "B<The Baycom Serial/Parallel Radio Modem>"
 msgstr "B<Baycom シリアル・パラレル ラジオモデム>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1215
-msgid "baycom=iobase,irq,modem"
-msgstr "baycom=iobase,irq,modem"
+#: build/C/man7/bootparam.7:1488
+#, no-wrap
+msgid "baycom=iobase,irq,modem\n"
+msgstr "baycom=iobase,irq,modem\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1227
+#: build/C/man7/bootparam.7:1502
 msgid ""
 "There are precisely 3 parameters; for several cards, give several 'baycom=' "
 "commands.  The modem parameter is a string that can take one of the values "
 "ser12, ser12*, par96, par96*.  Here the * denotes that software DCD is to be "
 "used, and ser12/par96 chooses between the supported modem types.  For more "
 "details, see the file I<Documentation/networking/baycom.txt> (or I<drivers/"
-"net/README.baycom> for older kernels) in the kernel source."
+"net/README.baycom> for older kernels) in the Linux kernel source."
 msgstr ""
 "ちょうど 3 つのパラメータを与える。 複数のカードがある場合は、'baycom=' コマ"
 "ンドも複数記述する。 modem パラメータは文字列で、 ser12, ser12*, par96, "
 "par96* の中からひとつを選ぶ。 * をつけるとソフトウェア DCD を使用する。 モデ"
-"ムの種類に応じて ser12 か par96 かを選択する。 詳細はカーネルソース内の "
-"I<Documentation/networking/baycom.txt> (古いカーネルの場合は I<drivers/net/"
-"README.baycom>)  を参照。"
+"ムの種類に応じて ser12 か par96 かを選択する。 詳細は Linux カーネルソース内"
+"の I<Documentation/networking/baycom.txt> (古いカーネルの場合は I<drivers/"
+"net/README.baycom>)  を参照。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1227
+#: build/C/man7/bootparam.7:1502
 #, no-wrap
 msgid "B<Soundcard radio modem driver>"
 msgstr "B<サウンドカードラジオモデムドライバ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1232
-msgid "soundmodem=iobase,irq,dma[,dma2[,serio[,pario]]],0,mode"
-msgstr "soundmodem=iobase,irq,dma[,dma2[,serio[,pario]]],0,mode"
+#: build/C/man7/bootparam.7:1509
+#, no-wrap
+msgid "soundmodem=iobase,irq,dma[,dma2[,serio[,pario]]],0,mode\n"
+msgstr "soundmodem=iobase,irq,dma[,dma2[,serio[,pario]]],0,mode\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1238
+#: build/C/man7/bootparam.7:1517
 msgid ""
 "All parameters except the last are integers; the dummy 0 is required because "
 "of a bug in the setup code.  The mode parameter is a string with syntax hw:"
@@ -3382,39 +3476,33 @@ msgstr ""
 "afsk1200, fsk9600 のどちらかを選択して記述する。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1238
+#: build/C/man7/bootparam.7:1517
 #, no-wrap
-msgid "The Line Printer Driver"
+msgid "The line printer driver"
 msgstr "ラインプリンタドライバ"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1239
+#: build/C/man7/bootparam.7:1518
 #, no-wrap
 msgid "B<'lp='>"
 msgstr "B<'lp='>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1244
-msgid "lp=0"
-msgstr "lp=0"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:1246
-msgid "lp=auto"
-msgstr "lp=auto"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:1248
-msgid "lp=reset"
-msgstr "lp=reset"
-
-#. type: Plain text
-#: build/C/man7/bootparam.7:1250
-msgid "lp=port[,port...]"
-msgstr "lp=port[,port...]"
+#: build/C/man7/bootparam.7:1529
+#, no-wrap
+msgid ""
+"lp=0\n"
+"lp=auto\n"
+"lp=reset\n"
+"lp=port[,port...]\n"
+msgstr ""
+"lp=0\n"
+"lp=auto\n"
+"lp=reset\n"
+"lp=port[,port...]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1256
+#: build/C/man7/bootparam.7:1537
 msgid ""
 "You can tell the printer driver what ports to use and what ports not to "
 "use.  The latter comes in handy if you don't want the printer driver to "
@@ -3427,7 +3515,7 @@ msgstr ""
 "るようにしたい場合に便利である。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1263
+#: build/C/man7/bootparam.7:1544
 msgid ""
 "The format of the argument is multiple port names.  For example, lp=none,"
 "parport0 would use the first parallel port for lp1, and disable lp0.  To "
@@ -3438,61 +3526,63 @@ msgstr ""
 "全に無効にするには lp=0 とすればよい。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1263
+#: build/C/man7/bootparam.7:1544
 #, no-wrap
 msgid "B<WDT500/501 driver>"
 msgstr "B<WDT500/501 ドライバ>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1268
-msgid "wdt=io,irq"
-msgstr "wdt=io,irq"
+#: build/C/man7/bootparam.7:1551
+#, no-wrap
+msgid "wdt=io,irq\n"
+msgstr "wdt=io,irq\n"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1268
+#: build/C/man7/bootparam.7:1553
 #, no-wrap
-msgid "Mouse Drivers"
+msgid "Mouse drivers"
 msgstr "マウスドライバ"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1269
+#: build/C/man7/bootparam.7:1554
 #, no-wrap
 msgid "B<'bmouse=irq'>"
 msgstr "B<'bmouse=irq'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1273
+#: build/C/man7/bootparam.7:1558
 msgid ""
-"The busmouse driver only accepts one parameter, that being the hardware IRQ "
+"The busmouse driver accepts only one parameter, that being the hardware IRQ "
 "value to be used."
 msgstr ""
 "バスマウスドライバはパラメータをひとつだけとり、 ハードウェア IRQ を指定でき"
 "る。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1273
+#: build/C/man7/bootparam.7:1558
 #, no-wrap
 msgid "B<'msmouse=irq'>"
 msgstr "B<'msmouse=irq'>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1276
+#: build/C/man7/bootparam.7:1561
 msgid "And precisely the same is true for the msmouse driver."
 msgstr "msmouse ドライバでもこの事情はまったく同じである。"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1276
+#: build/C/man7/bootparam.7:1561
 #, no-wrap
 msgid "B<ATARI mouse setup>"
 msgstr "B<ATARI マウスの設定>"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1280
-msgid "atamouse=threshold[,y-threshold]"
-msgstr "atamouse=threshold[,y-threshold]"
+#: build/C/man7/bootparam.7:1568
+#, no-wrap
+msgid "atamouse=threshold[,y-threshold]\n"
+msgstr "atamouse=threshold[,y-threshold]\n"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1286
+#: build/C/man7/bootparam.7:1576
 msgid ""
 "If only one argument is given, it is used for both x-threshold and y-"
 "threshold.  Otherwise, the first argument is the x-threshold, and the second "
@@ -3505,13 +3595,13 @@ msgstr ""
 "指定する。 デフォルトは 2。"
 
 #. type: SS
-#: build/C/man7/bootparam.7:1286
+#: build/C/man7/bootparam.7:1576
 #, no-wrap
-msgid "Video Hardware"
+msgid "Video hardware"
 msgstr "ビデオ機器"
 
 #. type: TP
-#: build/C/man7/bootparam.7:1287
+#: build/C/man7/bootparam.7:1577
 #, no-wrap
 msgid "B<'no-scroll'>"
 msgstr "B<'no-scroll'>"
@@ -3519,7 +3609,7 @@ msgstr "B<'no-scroll'>"
 #.  .SH AUTHORS
 #.  Linus Torvalds (and many others)
 #. type: Plain text
-#: build/C/man7/bootparam.7:1296
+#: build/C/man7/bootparam.7:1586
 msgid ""
 "This option tells the console driver not to use hardware scroll (where a "
 "scroll is effected by moving the screen origin in video memory, instead of "
@@ -3531,43 +3621,42 @@ msgstr ""
 "マシンではこの指定が必要となる。"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1302
-msgid "B<lilo.conf>(5), B<klogd>(8), B<lilo>(8), B<mount>(8), B<rdev>(8)"
-msgstr "B<lilo.conf>(5), B<klogd>(8), B<lilo>(8), B<mount>(8), B<rdev>(8)"
+#: build/C/man7/bootparam.7:1591
+msgid "B<lilo.conf>(5), B<klogd>(8), B<lilo>(8), B<mount>(8)"
+msgstr "B<lilo.conf>(5), B<klogd>(8), B<lilo>(8), B<mount>(8)"
 
 #. type: Plain text
-#: build/C/man7/bootparam.7:1308
+#: build/C/man7/bootparam.7:1597
 msgid ""
 "Large parts of this man page have been derived from the Boot Parameter HOWTO "
 "(version 1.0.1) written by Paul Gortmaker.  More information may be found in "
-"this (or a more recent) HOWTO.  An up-to-date source of information is I</"
-"usr/src/linux/Documentation/kernel-parameters.txt>."
+"this (or a more recent) HOWTO.  An up-to-date source of information is the "
+"kernel source file I<Documentation/kernel-parameters.txt>."
 msgstr ""
 "このマニュアルページの大部分は Paul Gortmaker による Boot Parameter HOWTO "
 "(version 1.0.1) を基にしている。 この (あるいは最新の) HOWTO をあたれば、 さ"
-"らに多くの情報が入手できるだろう。 最新の情報源は I</usr/src/linux/"
-"Documentation/kernel-parameters.txt> である。"
+"らに多くの情報が入手できるだろう。 最新の情報源はカーネルソースファイル "
+"I<Documentation/kernel-parameters.txt> である。"
 
 #. type: TH
-#: build/C/man2/reboot.2:25
+#: build/C/man2/reboot.2:28
 #, no-wrap
 msgid "REBOOT"
 msgstr "REBOOT"
 
 #. type: TH
-#: build/C/man2/reboot.2:25
-#, fuzzy, no-wrap
-#| msgid "2010-09-19"
+#: build/C/man2/reboot.2:28
+#, no-wrap
 msgid "2010-10-31"
-msgstr "2010-09-19"
+msgstr "2010-10-31"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:28
+#: build/C/man2/reboot.2:31
 msgid "reboot - reboot or enable/disable Ctrl-Alt-Del"
 msgstr "reboot - 再起動する。または Ctrl-Alt-Delを有効・無効にする"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:33
+#: build/C/man2/reboot.2:36
 #, no-wrap
 msgid ""
 "/* For libc4 and libc5 the library call and the system call\n"
@@ -3581,17 +3670,17 @@ msgstr ""
 "   指定することができる。*/\n"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:35 build/C/man2/reboot.2:45 build/C/man2/sync.2:41
+#: build/C/man2/reboot.2:38 build/C/man2/reboot.2:48 build/C/man2/sync.2:41
 msgid "B<#include E<lt>unistd.hE<gt>>"
 msgstr "B<#include E<lt>unistd.hE<gt>>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:37
+#: build/C/man2/reboot.2:40
 msgid "B<#include E<lt>linux/reboot.hE<gt>>"
 msgstr "B<#include E<lt>linux/reboot.hE<gt>>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:39
+#: build/C/man2/reboot.2:42
 msgid ""
 "B<int reboot(int >I<magic>B<, int >I<magic2>B<, int >I<cmd>B<, void "
 "*>I<arg>B<);>"
@@ -3600,7 +3689,7 @@ msgstr ""
 "*>I<arg>B<);>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:43
+#: build/C/man2/reboot.2:46
 #, no-wrap
 msgid ""
 "/* Under glibc some of the constants involved have gotten\n"
@@ -3612,17 +3701,17 @@ msgstr ""
 "   ラッパ (wrapper) となっている。 */\n"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:47
+#: build/C/man2/reboot.2:50
 msgid "B<#include E<lt>sys/reboot.hE<gt>>"
 msgstr "B<#include E<lt>sys/reboot.hE<gt>>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:49
+#: build/C/man2/reboot.2:52
 msgid "B<int reboot(int >I<cmd>B<);>"
 msgstr "B<int reboot(int >I<cmd>B<);>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:56
+#: build/C/man2/reboot.2:59
 msgid ""
 "The B<reboot>()  call reboots the system, or enables/disables the reboot "
 "keystroke (abbreviated CAD, since the default is Ctrl-Alt-Delete; it can be "
@@ -3633,7 +3722,7 @@ msgstr ""
 "よって変更できる。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:83
+#: build/C/man2/reboot.2:86
 msgid ""
 "This system call will fail (with B<EINVAL>)  unless I<magic> equals "
 "B<LINUX_REBOOT_MAGIC1> (that is, 0xfee1dead) and I<magic2> equals "
@@ -3653,13 +3742,13 @@ msgstr ""
 "る)。 I<cmd> 引数には以下の値を指定できる。"
 
 #. type: TP
-#: build/C/man2/reboot.2:83
+#: build/C/man2/reboot.2:86
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_CAD_OFF>"
 msgstr "B<LINUX_REBOOT_CMD_CAD_OFF>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:92
+#: build/C/man2/reboot.2:95
 msgid ""
 "(RB_DISABLE_CAD, 0).  CAD is disabled.  This means that the CAD keystroke "
 "will cause a B<SIGINT> signal to be sent to init (process 1), whereupon this "
@@ -3672,13 +3761,13 @@ msgstr ""
 "すべてのプロセスの kill, sync, 再起動)。"
 
 #. type: TP
-#: build/C/man2/reboot.2:92
+#: build/C/man2/reboot.2:95
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_CAD_ON>"
 msgstr "B<LINUX_REBOOT_CMD_CAD_ON>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:99
+#: build/C/man2/reboot.2:102
 msgid ""
 "(RB_ENABLE_CAD, 0x89abcdef).  CAD is enabled.  This means that the CAD "
 "keystroke will immediately cause the action associated with "
@@ -3689,13 +3778,13 @@ msgstr ""
 "行われるようになる。"
 
 #. type: TP
-#: build/C/man2/reboot.2:99
+#: build/C/man2/reboot.2:102
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_HALT>"
 msgstr "B<LINUX_REBOOT_CMD_HALT>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:107
+#: build/C/man2/reboot.2:110
 msgid ""
 "(RB_HALT_SYSTEM, 0xcdef0123; since 1.1.76).  The message \"System halted.\" "
 "is printed, and the system is halted.  Control is given to the ROM monitor, "
@@ -3706,26 +3795,29 @@ msgstr ""
 "タがある場合)。 先に B<sync>(2)  を行なわないと、データが失われる。"
 
 #. type: TP
-#: build/C/man2/reboot.2:107
+#: build/C/man2/reboot.2:110
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_KEXEC> (since Linux 2.6.13)"
-msgstr ""
+msgstr "B<LINUX_REBOOT_CMD_KEXEC> (Linux 2.6.13 以降)"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:113
+#: build/C/man2/reboot.2:116
 msgid ""
 "Execute a kernel that has been loaded earlier with B<kexec_load>(2).  This "
-"option is only available if the kernel was configured with B<CONFIG_KEXEC>."
+"option is available only if the kernel was configured with B<CONFIG_KEXEC>."
 msgstr ""
+"B<kexec_load>(2) を使って事前にロードされたカーネルを実行する。\n"
+"このオプションが利用できるのは、カーネルのコンフィグで B<CONFIG_KEXEC> が\n"
+"有効になっている場合にのみである。"
 
 #. type: TP
-#: build/C/man2/reboot.2:113
+#: build/C/man2/reboot.2:116
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_POWER_OFF>"
 msgstr "B<LINUX_REBOOT_CMD_POWER_OFF>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:121
+#: build/C/man2/reboot.2:124
 msgid ""
 "(0x4321fedc; since 2.1.30).  The message \"Power down.\" is printed, the "
 "system is stopped, and all power is removed from the system, if possible.  "
@@ -3736,13 +3828,13 @@ msgstr ""
 "(2)  を行なわないと、データが失われる。"
 
 #. type: TP
-#: build/C/man2/reboot.2:121
+#: build/C/man2/reboot.2:124
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_RESTART>"
 msgstr "B<LINUX_REBOOT_CMD_RESTART>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:129
+#: build/C/man2/reboot.2:132
 msgid ""
 "(RB_AUTOBOOT, 0x1234567).  The message \"Restarting system.\" is printed, "
 "and a default restart is performed immediately.  If not preceded by a B<sync>"
@@ -3753,13 +3845,13 @@ msgstr ""
 "いと、データが失われる。"
 
 #. type: TP
-#: build/C/man2/reboot.2:129
+#: build/C/man2/reboot.2:132
 #, no-wrap
 msgid "B<LINUX_REBOOT_CMD_RESTART2>"
 msgstr "B<LINUX_REBOOT_CMD_RESTART2>"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:139
+#: build/C/man2/reboot.2:142
 msgid ""
 "(0xa1b2c3d4; since 2.1.30).  The message \"Restarting system with command "
 "\\(aq%s\\(aq\" is printed, and a restart (using the command string given in "
@@ -3772,12 +3864,12 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:142
+#: build/C/man2/reboot.2:145
 msgid "Only the superuser may call B<reboot>()."
 msgstr "スーパーユーザーだけが B<reboot>()  を呼び出すことができる。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:148
+#: build/C/man2/reboot.2:151
 msgid ""
 "The precise effect of the above actions depends on the architecture.  For "
 "the i386 architecture, the additional argument does not do anything at "
@@ -3791,7 +3883,7 @@ msgstr ""
 "は warm または cold と、 hard または BIOS 経由の再起動を 設定できる。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:161
+#: build/C/man2/reboot.2:164
 msgid ""
 "For the values of I<cmd> that stop or restart the system, a successful call "
 "to B<reboot>()  does not return.  For the other I<cmd> values, zero is "
@@ -3803,19 +3895,20 @@ msgstr ""
 "に関わらず、失敗の場合には -1 が返り、 I<errno> が適切に設定される。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:166
-msgid "Problem with getting userspace data under B<LINUX_REBOOT_CMD_RESTART2>."
+#: build/C/man2/reboot.2:169
+msgid ""
+"Problem with getting user-space data under B<LINUX_REBOOT_CMD_RESTART2>."
 msgstr ""
 "B<LINUX_REBOOT_CMD_RESTART2> の時にユーザースペースのデータの取得に問題があっ"
 "た。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:169
+#: build/C/man2/reboot.2:172
 msgid "Bad magic numbers or I<cmd>."
 msgstr "magic の数字か I<cmd> が間違っている。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:176
+#: build/C/man2/reboot.2:179
 msgid ""
 "The calling process has insufficient privilege to call B<reboot>(); the "
 "B<CAP_SYS_BOOT> capability is required."
@@ -3824,7 +3917,7 @@ msgstr ""
 "B<CAP_SYS_BOOT> ケーパビリティが必要である。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:180
+#: build/C/man2/reboot.2:183
 msgid ""
 "B<reboot>()  is Linux-specific, and should not be used in programs intended "
 "to be portable."
@@ -3833,7 +3926,7 @@ msgstr ""
 "はない。"
 
 #. type: Plain text
-#: build/C/man2/reboot.2:187
+#: build/C/man2/reboot.2:190
 msgid ""
 "B<sync>(2), B<bootparam>(7), B<capabilities>(7), B<ctrlaltdel>(8), B<halt>"
 "(8), B<reboot>(8)"
@@ -3842,24 +3935,21 @@ msgstr ""
 "B<capabilities>(7)"
 
 #. type: TH
-#: build/C/man2/sync.2:36 build/C/man8/sync.8:6
+#: build/C/man2/sync.2:36 build/C/man8/sync.8:10
 #, no-wrap
 msgid "SYNC"
 msgstr "SYNC"
 
 #. type: TH
 #: build/C/man2/sync.2:36
-#, fuzzy, no-wrap
-#| msgid "2010-09-20"
-msgid "2011-09-07"
-msgstr "2010-09-20"
+#, no-wrap
+msgid "2012-05-04"
+msgstr "2012-05-04"
 
 #. type: Plain text
 #: build/C/man2/sync.2:39
-#, fuzzy
-#| msgid "sync - commit buffer cache to disk"
 msgid "sync, syncfs - commit buffer cache to disk"
-msgstr "sync - バッファキャッシュをディスクに書き込む"
+msgstr "sync, syncfs - バッファキャッシュをディスクに書き込む"
 
 #. type: Plain text
 #: build/C/man2/sync.2:43
@@ -3868,10 +3958,8 @@ msgstr "B<void sync(void);>"
 
 #. type: Plain text
 #: build/C/man2/sync.2:45
-#, fuzzy
-#| msgid "B<void sync(void);>"
-msgid "B<void syncfs(int >I<fd>B<);>"
-msgstr "B<void sync(void);>"
+msgid "B<int syncfs(int >I<fd>B<);>"
+msgstr "B<int syncfs(int >I<fd>B<);>"
 
 #. type: Plain text
 #: build/C/man2/sync.2:49
@@ -3895,15 +3983,13 @@ msgstr ""
 
 #. type: Plain text
 #: build/C/man2/sync.2:60
-#, fuzzy
-#| msgid "B<sync>():"
 msgid "B<syncfs>():"
-msgstr "B<sync>():"
+msgstr "B<syncfs>():"
 
 #. type: Plain text
 #: build/C/man2/sync.2:63
 msgid "_GNU_SOURCE"
-msgstr ""
+msgstr "_GNU_SOURCE"
 
 #. type: Plain text
 #: build/C/man2/sync.2:69
@@ -3911,6 +3997,8 @@ msgid ""
 "B<sync>()  causes all buffered modifications to file metadata and data to be "
 "written to the underlying file systems."
 msgstr ""
+"B<sync>() を呼び出すと、バッファされたファイルのメタデータとデータ本体に\n"
+"対して行われた全ての変更が、対応するファイルシステムに書き込まれる。"
 
 #. type: Plain text
 #: build/C/man2/sync.2:76
@@ -3918,6 +4006,9 @@ msgid ""
 "B<syncfs>()  is like B<sync>(), but synchronizes just the file system "
 "containing file referred to by the open file descriptor I<fd>."
 msgstr ""
+"B<syncfs>() は B<sync>() と同様だが、オープンされたファイルディスクリプタ "
+"I<fd>\n"
+"が参照するファイルを含むファイルシステムだけを同期する点が異なる。"
 
 #. type: Plain text
 #: build/C/man2/sync.2:82
@@ -3925,84 +4016,82 @@ msgid ""
 "B<syncfs>()  returns 0 on success; on error, it returns -1 and sets I<errno> "
 "to indicate the error."
 msgstr ""
+"B<syncfs>() は成功すると 0 を返す。エラーが発生した場合は -1 を返し、\n"
+"I<errno> にエラーを示す値を設定する。"
 
 #. type: Plain text
 #: build/C/man2/sync.2:85
-#, fuzzy
-#| msgid "This function is always successful."
 msgid "B<sync>()  is always successful."
-msgstr "この関数は常に成功する。"
+msgstr "B<sync>() は常に成功する。"
 
 #. type: Plain text
 #: build/C/man2/sync.2:88
 msgid "B<syncfs>()  can fail for at least the following reason:"
-msgstr ""
+msgstr "B<syncfs>() は少なくとも以下の理由で失敗する可能性がある:"
 
 #. type: TP
 #: build/C/man2/sync.2:88
-#, fuzzy, no-wrap
-#| msgid "B<EBUSY>"
+#, no-wrap
 msgid "B<EBADF>"
-msgstr "B<EBUSY>"
+msgstr "B<EBADF>"
 
 #. type: Plain text
 #: build/C/man2/sync.2:92
 msgid "I<fd> is not a valid file descriptor."
-msgstr ""
+msgstr "I<fd> が有効なファイルディスクリプタでない。。"
 
 #. type: SH
 #: build/C/man2/sync.2:92
 #, no-wrap
 msgid "VERSIONS"
-msgstr ""
+msgstr "バージョン"
 
 #. type: Plain text
-#: build/C/man2/sync.2:95
-msgid "B<syncfs>()  first appeared in Linux 2.6.39."
+#: build/C/man2/sync.2:96
+msgid ""
+"B<syncfs>()  first appeared in Linux 2.6.39; library support was added to "
+"glibc in version 2.14."
 msgstr ""
+"B<syncfs>() は Linux 2.6.39 で初めて登場した。\n"
+"ライブラリによるサポートは glibc バージョン 2.14 で追加された。"
 
 #. type: Plain text
-#: build/C/man2/sync.2:98
-#, fuzzy
-#| msgid "SVr4, 4.3BSD, POSIX.1-2001."
+#: build/C/man2/sync.2:99
 msgid "B<sync>(): SVr4, 4.3BSD, POSIX.1-2001."
-msgstr "SVr4, 4.3BSD, POSIX.1-2001."
+msgstr "B<sync>(): SVr4, 4.3BSD, POSIX.1-2001."
 
 #. type: Plain text
-#: build/C/man2/sync.2:101
+#: build/C/man2/sync.2:102
 msgid "B<syncfs>()  is Linux-specific."
-msgstr ""
+msgstr "B<syncfs>() is Linux 固有である。"
 
 #. type: SH
-#: build/C/man2/sync.2:101 build/C/man8/sync.8:63
+#: build/C/man2/sync.2:102 build/C/man8/sync.8:72
 #, no-wrap
 msgid "NOTES"
 msgstr "注意"
 
 #. type: Plain text
-#: build/C/man2/sync.2:110
-#, fuzzy
-#| msgid ""
-#| "Since glibc 2.2.2 the Linux prototype is as listed above, following the "
-#| "various standards.  In libc4, libc5, and glibc up to 2.2.1 it was \"int "
-#| "sync(void)\", and B<sync>()  always returned 0."
+#: build/C/man2/sync.2:111
 msgid ""
 "Since glibc 2.2.2 the Linux prototype for B<sync>()  is as listed above, "
 "following the various standards.  In libc4, libc5, and glibc up to 2.2.1 it "
 "was \"int sync(void)\", and B<sync>()  always returned 0."
 msgstr ""
-"さまざまな標準規格での規定にしたがって、 glibc 2.2.2 から Linux でのプロトタ"
-"イプは上述のようになった。 libc4, libc5 と、2.2.1 までの glibc では \"int "
-"sync(void)\" で、 B<sync>()  は常に 0 を返していた。"
+"Linux での B<sync>() のプロトタイプは、さまざまな標準規格での規定に準拠し、\n"
+"glibc 2.2.2 から上述のようになった。\n"
+"libc4, libc5 と、2.2.1 までの glibc ではプロトタイプは \"int sync(void)\" "
+"で、\n"
+"B<sync>()  は常に 0 を返していた。"
 
 #. type: SH
-#: build/C/man2/sync.2:110
+#: build/C/man2/sync.2:111
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
-#: build/C/man2/sync.2:118
+#: build/C/man2/sync.2:119
 msgid ""
 "According to the standard specification (e.g., POSIX.1-2001), B<sync>()  "
 "schedules the writes, but may return before the actual writing is done.  "
@@ -4015,37 +4104,37 @@ msgstr ""
 "組み込むのみで実際に書き込みが終了する前に戻ってもよいことになっている。\n"
 "一方で Linux はバージョン 1.3.20 からは書き込みが終了するまで待つ。\n"
 "(最近のディスクは大きなキャッシュを持っているため、\n"
-" これはデータの完全性 (data integrity) までは保証していない。)\n"
+" これはデータの完全性 (data integrity) までは保証していない。)"
 
 #. type: Plain text
-#: build/C/man2/sync.2:124
+#: build/C/man2/sync.2:125
 msgid "B<bdflush>(2), B<fdatasync>(2), B<fsync>(2), B<sync>(8), B<update>(8)"
 msgstr "B<bdflush>(2), B<fdatasync>(2), B<fsync>(2), B<sync>(8), B<update>(8)"
 
 #. type: TH
-#: build/C/man8/sync.8:6
+#: build/C/man8/sync.8:10
 #, no-wrap
 msgid "1998-11-01"
 msgstr "1998-11-01"
 
 #. type: TH
-#: build/C/man8/sync.8:6
+#: build/C/man8/sync.8:10
 #, no-wrap
 msgid "GNU"
 msgstr "GNU"
 
 #. type: Plain text
-#: build/C/man8/sync.8:9
+#: build/C/man8/sync.8:13
 msgid "sync - synchronize data on disk with memory"
 msgstr "sync - ディスク上のデータをメモリと同期させる"
 
 #. type: Plain text
-#: build/C/man8/sync.8:11
+#: build/C/man8/sync.8:15
 msgid "B<sync [--help] [--version]>"
 msgstr "B<sync [--help] [--version]>"
 
 #. type: Plain text
-#: build/C/man8/sync.8:22
+#: build/C/man8/sync.8:26
 msgid ""
 "B<sync> writes any data buffered in memory out to disk.  This can include "
 "(but is not limited to) modified superblocks, modified inodes, and delayed "
@@ -4059,7 +4148,7 @@ msgstr ""
 "る。"
 
 #. type: Plain text
-#: build/C/man8/sync.8:29
+#: build/C/man8/sync.8:33
 msgid ""
 "The kernel keeps data in memory to avoid doing (relatively slow) disk reads "
 "and writes.  This improves performance, but if the computer crashes, data "
@@ -4072,7 +4161,7 @@ msgstr ""
 "メモリにある内容すべてがディスクに書き込まれることを保証する。"
 
 #. type: Plain text
-#: build/C/man8/sync.8:48
+#: build/C/man8/sync.8:52
 msgid ""
 "B<sync> should be called before the processor is halted in an unusual manner "
 "(e.g., before causing a kernel panic when debugging new kernel code).  In "
@@ -4091,52 +4180,52 @@ msgstr ""
 "システムもある。)"
 
 #. type: SH
-#: build/C/man8/sync.8:48
+#: build/C/man8/sync.8:52
 #, no-wrap
 msgid "OPTIONS"
 msgstr "オプション"
 
 #. type: TP
-#: build/C/man8/sync.8:49
+#: build/C/man8/sync.8:53
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: build/C/man8/sync.8:52
+#: build/C/man8/sync.8:56
 msgid "Print a usage message on standard output and exit successfully."
 msgstr "標準出力に使用方法のメッセージを出力して正常終了する。"
 
 #. type: TP
-#: build/C/man8/sync.8:52
+#: build/C/man8/sync.8:56
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: build/C/man8/sync.8:55
+#: build/C/man8/sync.8:59
 msgid "Print version information on standard output, then exit successfully."
 msgstr "標準出力にバージョン情報を出力して正常終了する。"
 
 #. type: TP
-#: build/C/man8/sync.8:55
+#: build/C/man8/sync.8:59
 #, no-wrap
 msgid "B<-->"
 msgstr "B<-->"
 
 #. type: Plain text
-#: build/C/man8/sync.8:58
+#: build/C/man8/sync.8:62
 msgid "Terminate option list."
 msgstr "オプションリストを終了する。"
 
 #. type: SH
-#: build/C/man8/sync.8:58
+#: build/C/man8/sync.8:62
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "環境変数"
 
 #. type: Plain text
-#: build/C/man8/sync.8:61
+#: build/C/man8/sync.8:70
 msgid ""
 "The variables B<LANG>, B<LC_ALL>, B<LC_CTYPE>, and B<LC_MESSAGES> have the "
 "usual meaning."
@@ -4144,14 +4233,14 @@ msgstr ""
 "変数 B<LANG>, B<LC_ALL>, B<LC_CTYPE>, B<LC_MESSAGES> は通常の意味を持つ。"
 
 #. type: Plain text
-#: build/C/man8/sync.8:63
+#: build/C/man8/sync.8:72
 msgid "POSIX.2."
 msgstr "POSIX.2."
 
 #. type: Plain text
-#: build/C/man8/sync.8:75
+#: build/C/man8/sync.8:84
 msgid ""
-"On Linux, B<sync> is only guaranteed to schedule the dirty blocks for "
+"On Linux, B<sync> is guaranteed only to schedule the dirty blocks for "
 "writing; it can actually take a short time before all the blocks are finally "
 "written.  The B<reboot>(8)  and B<halt>(8)  commands take this into account "
 "by sleeping for a few seconds after calling B<sync>(2)."
@@ -4162,7 +4251,7 @@ msgstr ""
 "は B<sync>(2)  を呼んだ後に数秒間スリープすることで、これを考慮に入れている。"
 
 #. type: Plain text
-#: build/C/man8/sync.8:80
+#: build/C/man8/sync.8:89
 msgid ""
 "This page describes B<sync> as found in the file\\%utils-4.0 package; other "
 "versions may differ slightly."
@@ -4171,15 +4260,6 @@ msgstr ""
 "ているので、 その他のバージョンでは少し違いがあるかもしれない。"
 
 #. type: Plain text
-#: build/C/man8/sync.8:85
+#: build/C/man8/sync.8:94
 msgid "B<sync>(2), B<halt>(8), B<reboot>(8), B<update>(8)"
 msgstr "B<sync>(2), B<halt>(8), B<reboot>(8), B<update>(8)"
-
-#~ msgid "2008-02-11"
-#~ msgstr "2008-02-11"
-
-#~ msgid ""
-#~ "B<sync>()  first commits inodes to buffers, and then buffers to disk."
-#~ msgstr ""
-#~ "B<sync>()  はまず inode をバッファへ書き込み、 それからバッファ(buffer)を"
-#~ "ディスクへ書き込む。"