(split) LDP: Sync minor changes in LDP 3.65

[linuxjm/LDP_man-pages.git] / po4a / memory / po / ja.po

diff --git a/po4a/memory/po/ja.po b/po4a/memory/po/ja.po
index 31740b5..f375ccd 100644 (file)
--- a/po4a/memory/po/ja.po
+++ b/po4a/memory/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-04-17 13:14+0900\n"
-"PO-Revision-Date: 2014-04-19 23:15+0900\n"
+"POT-Creation-Date: 2014-04-24 00:51+0900\n"
+"PO-Revision-Date: 2014-04-24 03:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -236,7 +236,7 @@ msgstr ""
 
 #. type: SH
 #: build/C/man2/alloc_hugepages.2:109 build/C/man3/alloca.3:60
-#: build/C/man2/cacheflush.2:53 build/C/man2/fallocate.2:127
+#: build/C/man2/cacheflush.2:53 build/C/man2/fallocate.2:183
 #: build/C/man2/madvise.2:268 build/C/man3/malloc_get_state.3:61
 #: build/C/man3/malloc_info.3:48 build/C/man3/malloc_trim.3:51
 #: build/C/man3/malloc_usable_size.3:40 build/C/man3/mallopt.3:379
@@ -266,7 +266,7 @@ msgstr ""
 
 #. type: SH
 #: build/C/man2/alloc_hugepages.2:118 build/C/man2/cacheflush.2:59
-#: build/C/man2/fallocate.2:134 build/C/man2/madvise.2:275
+#: build/C/man2/fallocate.2:190 build/C/man2/madvise.2:275
 #: build/C/man3/malloc_info.3:55 build/C/man3/malloc_trim.3:56
 #: build/C/man3/mallopt.3:384 build/C/man2/mlock.2:122 build/C/man2/mmap.2:392
 #: build/C/man2/mmap2.2:61 build/C/man2/mprotect.2:85
@@ -282,7 +282,7 @@ msgid "ERRORS"
 msgstr "エラー"
 
 #. type: TP
-#: build/C/man2/alloc_hugepages.2:119 build/C/man2/fallocate.2:173
+#: build/C/man2/alloc_hugepages.2:119 build/C/man2/fallocate.2:270
 #, no-wrap
 msgid "B<ENOSYS>"
 msgstr "B<ENOSYS>"
@@ -320,7 +320,7 @@ msgstr ""
 
 #. type: SH
 #: build/C/man2/alloc_hugepages.2:130 build/C/man3/alloca.3:70
-#: build/C/man2/cacheflush.2:75 build/C/man2/fallocate.2:214
+#: build/C/man2/cacheflush.2:75 build/C/man2/fallocate.2:321
 #: build/C/man2/madvise.2:325 build/C/man3/mallinfo.3:110
 #: build/C/man3/malloc_get_state.3:86 build/C/man3/malloc_hook.3:80
 #: build/C/man3/malloc_info.3:63 build/C/man3/malloc_stats.3:55
@@ -356,12 +356,12 @@ msgstr ""
 #: build/C/man3/malloc_usable_size.3:50 build/C/man3/mcheck.3:147
 #: build/C/man2/mlock.2:213 build/C/man2/mmap.2:513 build/C/man2/mmap2.2:79
 #: build/C/man2/mprotect.2:122 build/C/man2/mremap.2:191
-#: build/C/man3/mtrace.3:80 build/C/man2/posix_fadvise.2:121
-#: build/C/man3/posix_memalign.3:221 build/C/man2/readahead.2:93
-#: build/C/man3/shm_open.3:257 build/C/man7/shm_overview.7:103
-#: build/C/man2/shmctl.2:382 build/C/man2/shmget.2:238
-#: build/C/man2/shmop.2:250 build/C/man2/subpage_prot.2:98
-#: build/C/man2/sync_file_range.2:183
+#: build/C/man2/msync.2:120 build/C/man3/mtrace.3:80
+#: build/C/man2/posix_fadvise.2:121 build/C/man3/posix_memalign.3:221
+#: build/C/man2/readahead.2:93 build/C/man3/shm_open.3:257
+#: build/C/man7/shm_overview.7:103 build/C/man2/shmctl.2:382
+#: build/C/man2/shmget.2:238 build/C/man2/shmop.2:250
+#: build/C/man2/subpage_prot.2:98 build/C/man2/sync_file_range.2:183
 #, no-wrap
 msgid "NOTES"
 msgstr "注意"
@@ -389,20 +389,20 @@ msgstr ""
 
 #. type: SH
 #: build/C/man2/alloc_hugepages.2:150 build/C/man3/alloca.3:162
-#: build/C/man2/cacheflush.2:89 build/C/man2/fallocate.2:222
-#: build/C/man2/madvise.2:380 build/C/man3/mallinfo.3:279
+#: build/C/man2/cacheflush.2:89 build/C/man2/fallocate.2:329
+#: build/C/man2/madvise.2:381 build/C/man3/mallinfo.3:279
 #: build/C/man3/malloc_get_state.3:114 build/C/man3/malloc_hook.3:142
 #: build/C/man3/malloc_info.3:262 build/C/man3/malloc_stats.3:67
 #: build/C/man3/malloc_trim.3:82 build/C/man3/malloc_usable_size.3:64
 #: build/C/man3/mallopt.3:580 build/C/man3/mcheck.3:208
-#: build/C/man2/mlock.2:336 build/C/man2/mmap.2:735 build/C/man2/mmap2.2:101
+#: build/C/man2/mlock.2:343 build/C/man2/mmap.2:735 build/C/man2/mmap2.2:101
 #: build/C/man2/mprotect.2:229 build/C/man2/mremap.2:214
-#: build/C/man2/msync.2:124 build/C/man3/mtrace.3:172
+#: build/C/man2/msync.2:151 build/C/man3/mtrace.3:172
 #: build/C/man2/posix_fadvise.2:197 build/C/man3/posix_fallocate.3:133
 #: build/C/man3/posix_memalign.3:277 build/C/man2/readahead.2:113
 #: build/C/man2/remap_file_pages.2:164 build/C/man3/shm_open.3:282
 #: build/C/man7/shm_overview.7:127 build/C/man2/shmctl.2:435
-#: build/C/man2/shmget.2:314 build/C/man2/shmop.2:295
+#: build/C/man2/shmget.2:325 build/C/man2/shmop.2:295
 #: build/C/man2/subpage_prot.2:134 build/C/man2/sync_file_range.2:226
 #, no-wrap
 msgid "COLOPHON"
@@ -410,27 +410,27 @@ msgstr "この文書について"
 
 #. type: Plain text
 #: build/C/man2/alloc_hugepages.2:157 build/C/man3/alloca.3:169
-#: build/C/man2/cacheflush.2:96 build/C/man2/fallocate.2:229
-#: build/C/man2/madvise.2:387 build/C/man3/mallinfo.3:286
+#: build/C/man2/cacheflush.2:96 build/C/man2/fallocate.2:336
+#: build/C/man2/madvise.2:388 build/C/man3/mallinfo.3:286
 #: build/C/man3/malloc_get_state.3:121 build/C/man3/malloc_hook.3:149
 #: build/C/man3/malloc_info.3:269 build/C/man3/malloc_stats.3:74
 #: build/C/man3/malloc_trim.3:89 build/C/man3/malloc_usable_size.3:71
 #: build/C/man3/mallopt.3:587 build/C/man3/mcheck.3:215
-#: build/C/man2/mlock.2:343 build/C/man2/mmap.2:742 build/C/man2/mmap2.2:108
+#: build/C/man2/mlock.2:350 build/C/man2/mmap.2:742 build/C/man2/mmap2.2:108
 #: build/C/man2/mprotect.2:236 build/C/man2/mremap.2:221
-#: build/C/man2/msync.2:131 build/C/man3/mtrace.3:179
+#: build/C/man2/msync.2:158 build/C/man3/mtrace.3:179
 #: build/C/man2/posix_fadvise.2:204 build/C/man3/posix_fallocate.3:140
 #: build/C/man3/posix_memalign.3:284 build/C/man2/readahead.2:120
 #: build/C/man2/remap_file_pages.2:171 build/C/man3/shm_open.3:289
 #: build/C/man7/shm_overview.7:134 build/C/man2/shmctl.2:442
-#: build/C/man2/shmget.2:321 build/C/man2/shmop.2:302
+#: build/C/man2/shmget.2:332 build/C/man2/shmop.2:302
 #: build/C/man2/subpage_prot.2:141 build/C/man2/sync_file_range.2:233
 msgid ""
-"This page is part of release 3.64 of the Linux I<man-pages> project.  A "
+"This page is part of release 3.65 of the Linux I<man-pages> project.  A "
 "description of the project, and information about reporting bugs, can be "
 "found at \\%http://www.kernel.org/doc/man-pages/."
 msgstr ""
-"この man ページは Linux I<man-pages> プロジェクトのリリース 3.64 の一部\n"
+"この man ページは Linux I<man-pages> プロジェクトのリリース 3.65 の一部\n"
 "である。プロジェクトの説明とバグ報告に関する情報は\n"
 "http://www.kernel.org/doc/man-pages/ に書かれている。"
 
@@ -623,9 +623,9 @@ msgstr ""
 #. type: SH
 #: build/C/man3/alloca.3:145 build/C/man2/cacheflush.2:82
 #: build/C/man3/mallinfo.3:114 build/C/man3/mallopt.3:406
-#: build/C/man2/mlock.2:304 build/C/man2/mmap.2:585 build/C/man3/mtrace.3:102
+#: build/C/man2/mlock.2:311 build/C/man2/mmap.2:585 build/C/man3/mtrace.3:102
 #: build/C/man2/posix_fadvise.2:186 build/C/man2/readahead.2:98
-#: build/C/man2/shmget.2:300
+#: build/C/man2/shmget.2:311
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
@@ -653,20 +653,20 @@ msgstr ""
 "使われるスタック領域の中に現れてしまうためである。"
 
 #. type: SH
-#: build/C/man3/alloca.3:158 build/C/man2/fallocate.2:217
+#: build/C/man3/alloca.3:158 build/C/man2/fallocate.2:324
 #: build/C/man2/madvise.2:372 build/C/man3/mallinfo.3:270
 #: build/C/man3/malloc_get_state.3:111 build/C/man3/malloc_hook.3:137
 #: build/C/man3/malloc_info.3:256 build/C/man3/malloc_stats.3:61
 #: build/C/man3/malloc_trim.3:78 build/C/man3/malloc_usable_size.3:62
 #: build/C/man3/mallopt.3:566 build/C/man3/mcheck.3:204
-#: build/C/man2/mlock.2:329 build/C/man2/mmap.2:710 build/C/man2/mmap2.2:95
+#: build/C/man2/mlock.2:336 build/C/man2/mmap.2:710 build/C/man2/mmap2.2:95
 #: build/C/man2/mprotect.2:226 build/C/man2/mremap.2:199
-#: build/C/man2/msync.2:120 build/C/man3/mtrace.3:167
+#: build/C/man2/msync.2:147 build/C/man3/mtrace.3:167
 #: build/C/man2/posix_fadvise.2:191 build/C/man3/posix_fallocate.3:128
 #: build/C/man3/posix_memalign.3:272 build/C/man2/readahead.2:107
 #: build/C/man2/remap_file_pages.2:157 build/C/man3/shm_open.3:271
 #: build/C/man7/shm_overview.7:114 build/C/man2/shmctl.2:428
-#: build/C/man2/shmget.2:306 build/C/man2/shmop.2:287
+#: build/C/man2/shmget.2:317 build/C/man2/shmop.2:287
 #: build/C/man2/subpage_prot.2:128 build/C/man2/sync_file_range.2:221
 #, no-wrap
 msgid "SEE ALSO"
@@ -777,17 +777,19 @@ msgstr ""
 "能ではない。"
 
 #. type: TP
-#: build/C/man2/cacheflush.2:67 build/C/man2/fallocate.2:146
-#: build/C/man2/madvise.2:282 build/C/man3/malloc_info.3:56
-#: build/C/man2/mlock.2:157 build/C/man2/mlock.2:164 build/C/man2/mlock.2:176
-#: build/C/man2/mmap.2:421 build/C/man2/mmap.2:429 build/C/man2/mmap.2:434
-#: build/C/man2/mmap2.2:65 build/C/man2/mprotect.2:95
-#: build/C/man2/mremap.2:151 build/C/man2/msync.2:80
-#: build/C/man2/posix_fadvise.2:94 build/C/man3/posix_fallocate.3:81
-#: build/C/man3/posix_memalign.3:158 build/C/man2/readahead.2:77
-#: build/C/man2/remap_file_pages.2:132 build/C/man2/remap_file_pages.2:139
-#: build/C/man3/shm_open.3:213 build/C/man2/shmctl.2:328
-#: build/C/man2/shmget.2:199 build/C/man2/shmop.2:200 build/C/man2/shmop.2:223
+#: build/C/man2/cacheflush.2:67 build/C/man2/fallocate.2:202
+#: build/C/man2/fallocate.2:214 build/C/man2/fallocate.2:224
+#: build/C/man2/fallocate.2:234 build/C/man2/madvise.2:282
+#: build/C/man3/malloc_info.3:56 build/C/man2/mlock.2:157
+#: build/C/man2/mlock.2:164 build/C/man2/mlock.2:176 build/C/man2/mmap.2:421
+#: build/C/man2/mmap.2:429 build/C/man2/mmap.2:434 build/C/man2/mmap2.2:65
+#: build/C/man2/mprotect.2:95 build/C/man2/mremap.2:151
+#: build/C/man2/msync.2:80 build/C/man2/posix_fadvise.2:94
+#: build/C/man3/posix_fallocate.3:81 build/C/man3/posix_memalign.3:158
+#: build/C/man2/readahead.2:77 build/C/man2/remap_file_pages.2:132
+#: build/C/man2/remap_file_pages.2:139 build/C/man3/shm_open.3:213
+#: build/C/man2/shmctl.2:328 build/C/man2/shmget.2:199
+#: build/C/man2/shmop.2:200 build/C/man2/shmop.2:223
 #: build/C/man2/subpage_prot.2:77 build/C/man2/sync_file_range.2:152
 #, no-wrap
 msgid "B<EINVAL>"
@@ -827,10 +829,10 @@ msgid "FALLOCATE"
 msgstr "FALLOCATE"
 
 #. type: TH
-#: build/C/man2/fallocate.2:11
+#: build/C/man2/fallocate.2:11 build/C/man2/shmget.2:38
 #, no-wrap
-msgid "2014-01-24"
-msgstr "2014-01-24"
+msgid "2014-04-17"
+msgstr "2014-04-17"
 
 #. type: Plain text
 #: build/C/man2/fallocate.2:14
@@ -893,15 +895,6 @@ msgstr "ディスク領域の割り当て"
 
 #. type: Plain text
 #: build/C/man2/fallocate.2:65
-#, fuzzy
-#| msgid ""
-#| "The default operation (i.e., I<mode> is zero) of B<fallocate>()  "
-#| "allocates and initializes to zero the disk space within the range "
-#| "specified by I<offset> and I<len>.  The file size (as reported by B<stat>"
-#| "(2))  will be changed if I<offset>+I<len> is greater than the file size.  "
-#| "This default behavior closely resembles the behavior of the "
-#| "B<posix_fallocate>(3)  library function, and is intended as a method of "
-#| "optimally implementing that function."
 msgid ""
 "The default operation (i.e., I<mode> is zero) of B<fallocate>()  allocates "
 "the disk space within the range specified by I<offset> and I<len>.  The file "
@@ -912,15 +905,14 @@ msgid ""
 "of the B<posix_fallocate>(3)  library function, and is intended as a method "
 "of optimally implementing that function."
 msgstr ""
-"B<fallocate>() のデフォルトの動作 (つまり I<mode> が 0 の場合) は、\n"
-"I<offset> と I<len> で指定された範囲のディスク領域の割り当てと初期化を行"
-"う。\n"
-"I<offset>+I<len> がファイルサイズよりも大きかった場合、\n"
-"(B<stat>(2) で報告される) ファイルサイズが変更される。このデフォルトの動作"
-"は、\n"
-"ライブラリ関数 B<posix_fallocate>(3) の動作と非常に似ている。これは、\n"
-"このシステムコールが B<posix_fallocate>(3) を最適に実装する手段を提供する\n"
-"ことを目的としているからである。"
+"B<fallocate>() のデフォルトの動作 (つまり I<mode> が 0 の場合) は、 "
+"I<offset> と I<len> で指定された範囲のディスク領域の割り当てを行う。 "
+"I<offset>+I<len> がファイルサイズよりも大きかった場合、 (B<stat>(2) で報告さ"
+"れる) ファイルサイズが変更される。 I<offset> と I<len> で指定される範囲のサブ"
+"領域で、 呼び出し前にデータを保持していなかった場合、そのサブ領域は 0 で初期"
+"化される。 このデフォルトの動作は、 ライブラリ関数 B<posix_fallocate>(3) の動"
+"作と非常に似ている。 これは、 このシステムコールが B<posix_fallocate>(3) を最"
+"適に実装する手段を提供することを目的としているからである。"
 
 #. type: Plain text
 #: build/C/man2/fallocate.2:71
@@ -994,10 +986,6 @@ msgstr ""
 
 #. type: Plain text
 #: build/C/man2/fallocate.2:117
-#, fuzzy
-#| msgid ""
-#| "Not all filesystems support B<FALLOC_FL_PUNCH_HOLE>; if a filesystem "
-#| "doesn't support the operation, an error is returned."
 msgid ""
 "Not all filesystems support B<FALLOC_FL_PUNCH_HOLE>; if a filesystem doesn't "
 "support the operation, an error is returned.  The operation is supported on "
@@ -1005,7 +993,7 @@ msgid ""
 msgstr ""
 "すべてのファイルシステムで B<FALLOC_FL_PUNCH_HOLE> がサポートされているわけで"
 "はない。 ファイルシステムがこの操作をサポートしていない場合は、 エラーが返"
-"る。"
+"る。 この操作は少なくとも以下のファイルシステムでサポートされている。"
 
 #. type: IP
 #: build/C/man2/fallocate.2:117 build/C/man2/fallocate.2:119
@@ -1040,8 +1028,76 @@ msgstr "Btrfs (Linux 3.7 以降)"
 msgid "tmpfs (since Linux 3.5)"
 msgstr "tmpfs (Linux 3.5 以降)"
 
+#. type: SS
+#: build/C/man2/fallocate.2:127
+#, fuzzy, no-wrap
+#| msgid "Deallocating file space"
+msgid "Collapsing file space"
+msgstr "ファイル空間の割り当て解除"
+
+#.  commit 00f5e61998dd17f5375d9dfc01331f104b83f841
 #. type: Plain text
-#: build/C/man2/fallocate.2:134
+#: build/C/man2/fallocate.2:147
+#, fuzzy
+#| msgid ""
+#| "Specifying the B<FALLOC_FL_PUNCH_HOLE> flag (available since Linux "
+#| "2.6.38) in I<mode> deallocates space (i.e., creates a hole)  in the byte "
+#| "range starting at I<offset> and continuing for I<len> bytes.  Within the "
+#| "specified range, partial filesystem blocks are zeroed, and whole "
+#| "filesystem blocks are removed from the file.  After a successful call, "
+#| "subsequent reads from this range will return zeroes."
+msgid ""
+"Specifying the B<FALLOC_FL_COLLAPSE_RANGE> flag (available since Linux 3.15) "
+"in I<mode> removes a byte range from a file, without leaving a hole.  The "
+"byte range to be collapsed starts at I<offset> and continues for I<len> "
+"bytes.  At the completion of the operation, the contents of the file "
+"starting at the location I<offset+len> will be appended at the location "
+"I<offset>, and the file will be I<len> bytes smaller."
+msgstr ""
+"B<FALLOC_FL_PUNCH_HOLE> フラグ (Linux 2.6.38 以降で利用可能) を I<mode> に指"
+"定すると、 I<offset> で始まる I<len> バイトの領域の空間を解放する (ホールを作"
+"成する)。 指定された範囲のうち、 部分的に使用しているファイルシステムブロック"
+"は 0 で埋められ、 全体を使用しているファイルシステムブロックはそのファイルか"
+"ら削除される。 呼び出しが成功すると、 これ以降のこの範囲からの読み出しでは 0 "
+"を返す。"
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:161
+msgid ""
+"A filesystem may place limitations on the granularity of the operation, in "
+"order to ensure efficient implementation.  Typically, I<offset> and I<len> "
+"must be a multiple of the filesystem logical block size, which varies "
+"according to the filesystem type and configuration.  If a filesystem has "
+"such a requirement, B<fallocate>()  will fail with the error B<EINVAL> if "
+"this requirement is violated."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:170
+msgid ""
+"If the region specified by I<offset> plus I<len> reaches or passes the end "
+"of file, an error is returned; instead, use B<ftruncate>(2)  to truncate a "
+"file."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:175
+msgid ""
+"No other flags may be specified in I<mode> in conjunction with "
+"B<FALLOC_FL_COLLAPSE_RANGE>."
+msgstr ""
+
+#.  commit 9eb79482a97152930b113b51dff530aba9e28c8e
+#.  commit e1d8fb88a64c1f8094b9f6c3b6d2d9e6719c970d
+#. type: Plain text
+#: build/C/man2/fallocate.2:183
+msgid ""
+"As at Linux 3.15, B<FALLOC_FL_COLLAPSE_RANGE> is supported by ext4 (only for "
+"extent-based files)  and XFS."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:190
 msgid ""
 "On success, B<fallocate>()  returns zero.  On error, -1 is returned and "
 "I<errno> is set to indicate the error."
@@ -1050,7 +1106,7 @@ msgstr ""
 "にエラーを示す値を設定する。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:135 build/C/man2/madvise.2:279
+#: build/C/man2/fallocate.2:191 build/C/man2/madvise.2:279
 #: build/C/man2/mmap.2:415 build/C/man2/posix_fadvise.2:91
 #: build/C/man3/posix_fallocate.3:73 build/C/man2/readahead.2:73
 #: build/C/man2/sync_file_range.2:148
@@ -1059,60 +1115,101 @@ msgid "B<EBADF>"
 msgstr "B<EBADF>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:139 build/C/man3/posix_fallocate.3:77
+#: build/C/man2/fallocate.2:195 build/C/man3/posix_fallocate.3:77
 msgid "I<fd> is not a valid file descriptor, or is not opened for writing."
 msgstr ""
 "I<fd> が有効なファイルディスクリプタでないか、 書き込み用としてオープンされて"
 "いない。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:139 build/C/man3/posix_fallocate.3:77
+#: build/C/man2/fallocate.2:195 build/C/man3/posix_fallocate.3:77
 #, no-wrap
 msgid "B<EFBIG>"
 msgstr "B<EFBIG>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:143
+#: build/C/man2/fallocate.2:199
 msgid "I<offset>+I<len> exceeds the maximum file size."
 msgstr "I<offset + len> がファイルサイズの最大値よりも大きい。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:143
+#: build/C/man2/fallocate.2:199
 #, no-wrap
 msgid "B<EINTR>"
 msgstr "B<EINTR>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:146
+#: build/C/man2/fallocate.2:202
 msgid "A signal was caught during execution."
 msgstr "実行中にシグナルが捕捉された。"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:158 build/C/man3/posix_fallocate.3:87
+#: build/C/man2/fallocate.2:214 build/C/man3/posix_fallocate.3:87
 msgid "I<offset> was less than 0, or I<len> was less than or equal to 0."
 msgstr "I<offset> が 0 未満だったか、 I<len> が 0 以下だった。"
 
+#. type: Plain text
+#: build/C/man2/fallocate.2:224
+msgid ""
+"I<mode> is B<FALLOC_FL_COLLAPSE_RANGE> and the range specified by I<offset> "
+"plus I<len> reaches or passes the end of the file."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:234
+msgid ""
+"I<mode> is B<FALLOC_FL_COLLAPSE_RANGE>, but either I<offset> or I<len> is "
+"not a multiple of the filesystem block size."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:241
+msgid ""
+"mode contains both B<FALLOC_FL_COLLAPSE_RANGE> and other flags; no other "
+"flags are permitted with B<FALLOC_FL_COLLAPSE_RANGE>."
+msgstr ""
+
+#. type: TP
+#: build/C/man2/fallocate.2:241
+#, no-wrap
+msgid "I<mode>"
+msgstr "I<mode>"
+
+#.  There was a inconsistency in 3.15-rc1, that should be resolved so that all
+#.  filesystems use this error for this case. (Tytso says ex4 will change.)
+#.  http://thread.gmane.org/gmane.comp.file-systems.xfs.general/60485/focus=5521
+#.  From: Michael Kerrisk (man-pages <mtk.manpages@...>
+#.  Subject: Re: [PATCH v5 10/10] manpage: update FALLOC_FL_COLLAPSE_RANGE flag in fallocate
+#.  Newsgroups: gmane.linux.man, gmane.linux.file-systems
+#.  Date: 2014-04-17 13:40:05 GMT
+#. type: Plain text
+#: build/C/man2/fallocate.2:255
+msgid ""
+"is B<FALLOC_FL_COLLAPSE_RANGE>, but the file referred to by I<fd> is not a "
+"regular file."
+msgstr ""
+
 #. type: TP
-#: build/C/man2/fallocate.2:158 build/C/man2/madvise.2:310
+#: build/C/man2/fallocate.2:255 build/C/man2/madvise.2:310
 #: build/C/man2/sync_file_range.2:160
 #, no-wrap
 msgid "B<EIO>"
 msgstr "B<EIO>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:161
+#: build/C/man2/fallocate.2:258
 msgid "An I/O error occurred while reading from or writing to a filesystem."
 msgstr "ファイルシステムとの読み書き中に入出力エラーが発生した。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:161 build/C/man2/mmap.2:450
+#: build/C/man2/fallocate.2:258 build/C/man2/mmap.2:450
 #: build/C/man3/posix_fallocate.3:87
 #, no-wrap
 msgid "B<ENODEV>"
 msgstr "B<ENODEV>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:168
+#: build/C/man2/fallocate.2:265
 msgid ""
 "I<fd> does not refer to a regular file or a directory.  (If I<fd> is a pipe "
 "or FIFO, a different error results.)"
@@ -1121,32 +1218,32 @@ msgstr ""
 "を参照している場合、別のエラーが発生する)。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:168 build/C/man3/posix_fallocate.3:91
+#: build/C/man2/fallocate.2:265 build/C/man3/posix_fallocate.3:91
 #: build/C/man2/shmget.2:217 build/C/man2/sync_file_range.2:166
 #, no-wrap
 msgid "B<ENOSPC>"
 msgstr "B<ENOSPC>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:173 build/C/man3/posix_fallocate.3:96
+#: build/C/man2/fallocate.2:270 build/C/man3/posix_fallocate.3:96
 msgid ""
 "There is not enough space left on the device containing the file referred to "
 "by I<fd>."
 msgstr "I<fd> が参照するファイルを含むデバイスに十分な空き領域がない。"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:177
+#: build/C/man2/fallocate.2:274
 msgid "This kernel does not implement B<fallocate>()."
 msgstr "このカーネルでは B<fallocate>() は実装されていない。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:177
+#: build/C/man2/fallocate.2:274
 #, no-wrap
 msgid "B<EOPNOTSUPP>"
 msgstr "B<EOPNOTSUPP>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:186
+#: build/C/man2/fallocate.2:283
 msgid ""
 "The filesystem containing the file referred to by I<fd> does not support "
 "this operation; or the I<mode> is not supported by the filesystem containing "
@@ -1157,7 +1254,7 @@ msgstr ""
 "I<mode> をサポートしていない。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:186 build/C/man2/mlock.2:143
+#: build/C/man2/fallocate.2:283 build/C/man2/mlock.2:143
 #: build/C/man2/mlock.2:182 build/C/man2/mmap.2:458 build/C/man2/shmctl.2:353
 #: build/C/man2/shmget.2:225
 #, no-wrap
@@ -1165,30 +1262,40 @@ msgid "B<EPERM>"
 msgstr "B<EPERM>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:202
+#: build/C/man2/fallocate.2:301
 msgid ""
 "The file referred to by I<fd> is marked immutable (see B<chattr>(1)).  Or: "
-"I<mode> specifies B<FALLOC_FL_PUNCH_HOLE> and the file referred to by I<fd> "
-"is marked append-only (see B<chattr>(1))."
-msgstr ""
-"I<fd> が参照するファイルに変更不可 (immutable) の属性が付いている (B<chattr>"
-"(1) 参照)。 I<mode> に B<FALLOC_FL_PUNCH_HOLE> が指定されたが、 I<fd> が参照"
-"するファイルに追加のみ (append-only) の属性が付いている (B<chattr>(1) 参照)。"
+"I<mode> specifies B<FALLOC_FL_PUNCH_HOLE> or B<FALLOC_FL_COLLAPSE_RANGE> and "
+"the file referred to by I<fd> is marked append-only (see B<chattr>(1))."
+msgstr "I<fd> が参照するファイルに変更不可 (immutable) の属性が付いている (B<chattr>(1) 参照)。 I<mode> に B<FALLOC_FL_PUNCH_HOLE> か B<FALLOC_FL_COLLAPSE_RANGE> が指定されたが、 I<fd> が参照するファイルに追加のみ (append-only) の属性が付いている (B<chattr>(1) 参照)。"
 
 #. type: TP
-#: build/C/man2/fallocate.2:202 build/C/man2/posix_fadvise.2:97
+#: build/C/man2/fallocate.2:301 build/C/man2/posix_fadvise.2:97
 #: build/C/man3/posix_fallocate.3:96 build/C/man2/sync_file_range.2:169
 #, no-wrap
 msgid "B<ESPIPE>"
 msgstr "B<ESPIPE>"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:206
+#: build/C/man2/fallocate.2:305
 msgid "I<fd> refers to a pipe or FIFO."
 msgstr "I<fd> がパイプか FIFO を参照している。"
 
+#. type: TP
+#: build/C/man2/fallocate.2:305 build/C/man2/mmap.2:467
+#, no-wrap
+msgid "B<ETXTBSY>"
+msgstr "B<ETXTBSY>"
+
+#. type: Plain text
+#: build/C/man2/fallocate.2:313
+msgid ""
+"I<mode> specifies B<FALLOC_FL_COLLAPSE_RANGE>, but the file referred to by "
+"I<fd> is currently being executed."
+msgstr ""
+
 #. type: SH
-#: build/C/man2/fallocate.2:206 build/C/man3/malloc_info.3:60
+#: build/C/man2/fallocate.2:313 build/C/man3/malloc_info.3:60
 #: build/C/man3/mcheck.3:134 build/C/man2/mmap2.2:74
 #: build/C/man2/posix_fadvise.2:104 build/C/man3/posix_fallocate.3:100
 #: build/C/man3/posix_memalign.3:167 build/C/man2/readahead.2:83
@@ -1200,7 +1307,7 @@ msgstr "バージョン"
 
 #.  See http://sourceware.org/bugzilla/show_bug.cgi?id=14964
 #. type: Plain text
-#: build/C/man2/fallocate.2:214
+#: build/C/man2/fallocate.2:321
 msgid ""
 "B<fallocate>()  is available on Linux since kernel 2.6.23.  Support is "
 "provided by glibc since version 2.10.  The B<FALLOC_FL_*> flags are defined "
@@ -1211,12 +1318,12 @@ msgstr ""
 "ファイルで定義されているのは、バージョン 2.18 以降のみである。"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:217
+#: build/C/man2/fallocate.2:324
 msgid "B<fallocate>()  is Linux-specific."
 msgstr "B<fallocate>()  は Linux 固有である。"
 
 #. type: Plain text
-#: build/C/man2/fallocate.2:222
+#: build/C/man2/fallocate.2:329
 msgid ""
 "B<fallocate>(1), B<ftruncate>(2), B<posix_fadvise>(3), B<posix_fallocate>(3)"
 msgstr ""
@@ -1229,10 +1336,10 @@ msgid "MADVISE"
 msgstr "MADVISE"
 
 #. type: TH
-#: build/C/man2/madvise.2:35
+#: build/C/man2/madvise.2:35 build/C/man2/msync.2:25
 #, no-wrap
-msgid "2012-04-28"
-msgstr "2012-04-28"
+msgid "2014-04-20"
+msgstr "2014-04-20"
 
 #. type: Plain text
 #: build/C/man2/madvise.2:38
@@ -1715,8 +1822,8 @@ msgstr ""
 "B<MADV_MERGEABLE>, B<MADV_UNMERGEABLE> は Linux 固有である。"
 
 #. type: SS
-#: build/C/man2/madvise.2:348 build/C/man2/mlock.2:267
-#: build/C/man2/shmget.2:294
+#: build/C/man2/madvise.2:348 build/C/man2/mlock.2:274
+#: build/C/man2/shmget.2:305
 #, no-wrap
 msgid "Linux notes"
 msgstr "Linux での注意"
@@ -1754,13 +1861,11 @@ msgstr ""
 "返す)。"
 
 #. type: Plain text
-#: build/C/man2/madvise.2:380
+#: build/C/man2/madvise.2:381
 msgid ""
 "B<getrlimit>(2), B<mincore>(2), B<mmap>(2), B<mprotect>(2), B<msync>(2), "
-"B<munmap>(2), B<core>(5)"
-msgstr ""
-"B<getrlimit>(2), B<mincore>(2), B<mmap>(2), B<mprotect>(2), B<msync>(2), "
-"B<munmap>(2), B<core>(5)"
+"B<munmap>(2), B<prctl>(2), B<core>(5)"
+msgstr "B<getrlimit>(2), B<mincore>(2), B<mmap>(2), B<mprotect>(2), B<msync>(2), B<munmap>(2), B<prctl>(2), B<core>(5)"
 
 #. type: TH
 #: build/C/man3/mallinfo.3:26
@@ -2732,7 +2837,7 @@ msgid "MALLOC_INFO"
 msgstr "MALLOC_INFO"
 
 #. type: TH
-#: build/C/man3/malloc_info.3:25 build/C/man2/shmget.2:38
+#: build/C/man3/malloc_info.3:25
 #, no-wrap
 msgid "2013-04-19"
 msgstr "2013-04-19"
@@ -4503,8 +4608,8 @@ msgstr "MLOCK"
 #. type: TH
 #: build/C/man2/mlock.2:26
 #, no-wrap
-msgid "2011-09-14"
-msgstr "2011-09-14"
+msgid "2014-04-14"
+msgstr "2014-04-14"
 
 #. type: Plain text
 #: build/C/man2/mlock.2:29
@@ -4870,18 +4975,24 @@ msgstr ""
 "書き込み時コピーによる ページフォールトさえも発生しないことが保証される。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:250
+#: build/C/man2/mlock.2:257
+#, fuzzy
+#| msgid ""
+#| "Memory locks are not inherited by a child created via B<fork>(2)  and are "
+#| "automatically removed (unlocked) during an B<execve>(2)  or when the "
+#| "process terminates."
 msgid ""
 "Memory locks are not inherited by a child created via B<fork>(2)  and are "
 "automatically removed (unlocked) during an B<execve>(2)  or when the process "
-"terminates."
+"terminates.  The B<mlockall>()  B<MCL_FUTURE> setting is not inherited by a "
+"child created via B<fork>(2)  and is cleared during an B<execve>(2)."
 msgstr ""
 "メモリロックは B<fork>(2)  で作成された子プロセスには継承されず、 B<execve>"
 "(2)  が呼ばれたり、プロセスが終了した場合は 自動的に削除される (ロック解除さ"
 "れる)。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:254
+#: build/C/man2/mlock.2:261
 msgid ""
 "The memory lock on an address range is automatically removed if the address "
 "range is unmapped via B<munmap>(2)."
@@ -4890,7 +5001,7 @@ msgstr ""
 "よってアンマップされた場合は削除される。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:267
+#: build/C/man2/mlock.2:274
 msgid ""
 "Memory locks do not stack, that is, pages which have been locked several "
 "times by calls to B<mlock>()  or B<mlockall>()  will be unlocked by a single "
@@ -4906,7 +5017,7 @@ msgstr ""
 "のプロセスでロックされている限りは RAM に残り続ける。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:278
+#: build/C/man2/mlock.2:285
 msgid ""
 "Under Linux, B<mlock>()  and B<munlock>()  automatically round I<addr> down "
 "to the nearest page boundary.  However, POSIX.1-2001 allows an "
@@ -4919,7 +5030,7 @@ msgstr ""
 "ケーションではきちんと境界に合わせた方が良い。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:291
+#: build/C/man2/mlock.2:298
 msgid ""
 "The I<VmLck> field of the Linux-specific I</proc/PID/status> file shows how "
 "many kilobytes of memory the process with ID I<PID> has locked using B<mlock>"
@@ -4931,13 +5042,13 @@ msgstr ""
 "表示される。"
 
 #. type: SS
-#: build/C/man2/mlock.2:291
+#: build/C/man2/mlock.2:298
 #, no-wrap
 msgid "Limits and permissions"
 msgstr "制限と権限"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:298
+#: build/C/man2/mlock.2:305
 msgid ""
 "In Linux 2.6.8 and earlier, a process must be privileged (B<CAP_IPC_LOCK>)  "
 "in order to lock memory and the B<RLIMIT_MEMLOCK> soft resource limit "
@@ -4948,7 +5059,7 @@ msgstr ""
 "できるかの制限を定義する。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:304
+#: build/C/man2/mlock.2:311
 msgid ""
 "Since Linux 2.6.9, no limits are placed on the amount of memory that a "
 "privileged process can lock and the B<RLIMIT_MEMLOCK> soft resource limit "
@@ -4959,7 +5070,7 @@ msgstr ""
 "クできるメモリ量の制限を定義する。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:312
+#: build/C/man2/mlock.2:319
 msgid ""
 "In the 2.4 series Linux kernels up to and including 2.4.17, a bug caused the "
 "B<mlockall>()  B<MCL_FUTURE> flag to be inherited across a B<fork>(2).  This "
@@ -4974,7 +5085,7 @@ msgstr ""
 #.  "Rationale for RLIMIT_MEMLOCK"
 #.  23 Jan 2006
 #. type: Plain text
-#: build/C/man2/mlock.2:329
+#: build/C/man2/mlock.2:336
 msgid ""
 "Since kernel 2.6.9, if a privileged process calls I<mlockall(MCL_FUTURE)> "
 "and later drops privileges (loses the B<CAP_IPC_LOCK> capability by, for "
@@ -4989,7 +5100,7 @@ msgstr ""
 "B<brk>(2))  は失敗する。"
 
 #. type: Plain text
-#: build/C/man2/mlock.2:336
+#: build/C/man2/mlock.2:343
 msgid ""
 "B<mmap>(2), B<setrlimit>(2), B<shmctl>(2), B<sysconf>(3), B<proc>(5), "
 "B<capabilities>(7)"
@@ -5624,7 +5735,12 @@ msgid ""
 "requested, but I<fd> is not open for reading.  Or B<MAP_SHARED> was "
 "requested and B<PROT_WRITE> is set, but I<fd> is not open in read/write "
 "(B<O_RDWR>)  mode.  Or B<PROT_WRITE> is set, but the file is append-only."
-msgstr "以下のいずれかの場合。 ファイル記述子の参照先が通常のファイルではない (non-regular file) 。 ファイルマッピングを要求したが I<fd> は読み込み用にオープンされていない。 B<MAP_SHARED> を要求して B<PROT_WRITE> をセットしたが I<fd> は読み書きモード (B<O_RDWR>)  でオープンされていない、 B<PROT_WRITE> をセットしたが、ファイルは追加 (append) 専用である。"
+msgstr ""
+"以下のいずれかの場合。 ファイル記述子の参照先が通常のファイルではない (non-"
+"regular file) 。 ファイルマッピングを要求したが I<fd> は読み込み用にオープン"
+"されていない。 B<MAP_SHARED> を要求して B<PROT_WRITE> をセットしたが I<fd> は"
+"読み書きモード (B<O_RDWR>)  でオープンされていない、 B<PROT_WRITE> をセットし"
+"たが、ファイルは追加 (append) 専用である。"
 
 #. type: Plain text
 #: build/C/man2/mmap.2:415
@@ -5706,12 +5822,6 @@ msgstr ""
 "I<prot> 引き数は B<PROT_EXEC> を行うように指定されているが、 no-exec でマウン"
 "トされたファイルシステム上のファイルに マップ領域が対応している。"
 
-#. type: TP
-#: build/C/man2/mmap.2:467
-#, no-wrap
-msgid "B<ETXTBSY>"
-msgstr "B<ETXTBSY>"
-
 #. type: Plain text
 #: build/C/man2/mmap.2:473
 msgid ""
@@ -6135,7 +6245,7 @@ msgstr ""
 "smaps> の説明。"
 
 #. type: Plain text
-#: build/C/man2/mmap.2:735 build/C/man2/msync.2:124
+#: build/C/man2/mmap.2:735 build/C/man2/msync.2:151
 msgid "B.O. Gallmeister, POSIX.4, O'Reilly, pp. 128-129 and 389-391."
 msgstr "B.O. Gallmeister, POSIX.4, O'Reilly, pp. 128-129 and 389-391."
 
@@ -6894,12 +7004,6 @@ msgstr ""
 msgid "MSYNC"
 msgstr "MSYNC"
 
-#. type: TH
-#: build/C/man2/msync.2:25 build/C/man2/remap_file_pages.2:28
-#, no-wrap
-msgid "2008-04-22"
-msgstr "2008-04-22"
-
 #. type: Plain text
 #: build/C/man2/msync.2:28
 msgid "msync - synchronize a file with a memory map"
@@ -7011,8 +7115,23 @@ msgstr ""
 "B<_POSIX_SYNCHRONIZED_IO> の両方が I<E<lt>unistd.hE<gt>> で 0 より大きい値に"
 "定義される。 (B<sysconf>(3)  を参照すること。 )"
 
+#.  commit 204ec841fbea3e5138168edbc3a76d46747cc987
+#. type: Plain text
+#: build/C/man2/msync.2:147
+msgid ""
+"According to POSIX, either B<MS_SYNC> or B<MS_ASYNC> must be specified in "
+"I<flags>, and indeed failure to include one of these flags will cause "
+"B<msync>()  to fail on some systems.  However, Linux permits a call to "
+"B<msync>()  that specifies neither of these flags, with semantics that are "
+"(currently) equivalent to specifying B<MS_ASYNC>.  (Since Linux 2.6.19, "
+"B<MS_ASYNC> is in fact a no-op, since the kernel properly tracks dirty pages "
+"and flushes them to storage as necessary.)  Notwithstanding the Linux "
+"behavior, portable, future-proof applications should ensure that they "
+"specify either B<MS_SYNC> or B<MS_ASYNC> in I<flags>."
+msgstr ""
+
 #. type: TP
-#: build/C/man2/msync.2:122 build/C/man7/shm_overview.7:46
+#: build/C/man2/msync.2:149 build/C/man7/shm_overview.7:46
 #, no-wrap
 msgid "B<mmap>(2)"
 msgstr "B<mmap>(2)"
@@ -8146,6 +8265,12 @@ msgstr ""
 msgid "REMAP_FILE_PAGES"
 msgstr "REMAP_FILE_PAGES"
 
+#. type: TH
+#: build/C/man2/remap_file_pages.2:28
+#, no-wrap
+msgid "2008-04-22"
+msgstr "2008-04-22"
+
 #. type: Plain text
 #: build/C/man2/remap_file_pages.2:31
 msgid "remap_file_pages - create a nonlinear file mapping"
@@ -9134,15 +9259,6 @@ msgstr "B<IPC_RMID>"
 
 #. type: Plain text
 #: build/C/man2/shmctl.2:149
-#, fuzzy
-#| msgid ""
-#| "Mark the segment to be destroyed.  The segment will only actually be "
-#| "destroyed after the last process detaches it (i.e., when the "
-#| "I<shm_nattch> member of the associated structure I<shmid_ds> is zero).  "
-#| "The caller must be the owner or creator, or be privileged.  If a segment "
-#| "has been marked for destruction, then the (nonstandard)  B<SHM_DEST> flag "
-#| "of the I<shm_perm.mode> field in the associated data structure retrieved "
-#| "by B<IPC_STAT> will be set."
 msgid ""
 "Mark the segment to be destroyed.  The segment will only actually be "
 "destroyed after the last process detaches it (i.e., when the I<shm_nattch> "
@@ -9152,30 +9268,19 @@ msgid ""
 msgstr ""
 "セグメントに破棄済みのマークを付ける。 セグメントは、実際には最後プロセスがセ"
 "グメントを分離した (関連する I<shmid_ds> 構造体の I<shm_nattch> メンバーが 0 "
-"になった) 後でのみ破棄される。 呼び出し元は所有者か作成者であるか、特権を持た"
-"なければならない。 セグメントに破棄のマークが付けられると、 関連するデータ構"
-"造体において I<shm_perm.mode> フィールドの (標準ではない)  B<SHM_DEST> フラグ"
-"が設定される。 このデータ構造体は B<IPC_STAT> で取得される。"
+"になった) 後でのみ破棄される。 呼び出し元はそのセグメントの所有者か作成者であ"
+"るか、特権を持たなければならない。 I<buf> 引き数は無視される。"
 
 #. type: Plain text
 #: build/C/man2/shmctl.2:157
-#, fuzzy
-#| msgid ""
-#| "Prevent swapping of the shared memory segment.  The caller must fault in "
-#| "any pages that are required to be present after locking is enabled.  If a "
-#| "segment has been locked, then the (nonstandard)  B<SHM_LOCKED> flag of "
-#| "the I<shm_perm.mode> field in the associated data structure retrieved by "
-#| "B<IPC_STAT> will be set."
 msgid ""
 "If a segment has been marked for destruction, then the (nonstandard)  "
 "B<SHM_DEST> flag of the I<shm_perm.mode> field in the associated data "
 "structure retrieved by B<IPC_STAT> will be set."
 msgstr ""
-"共有メモリ・セグメントをスワップすることを防止する。 ロックが有効になった後、"
-"呼び出し元は、 存在することが要求された全てのページをフォールトさせなければな"
-"らない。 セグメントがロックされると、 関連するデータ構造体において "
-"I<shm_perm.mode> フィールドの (標準的ではない)  B<SHM_LOCKED> フラグが設定さ"
-"れる。 このデータ構造体は B<IPC_STAT> で取得される。"
+"セグメントに破棄のマークが付けられると、 関連するデータ構造体において "
+"I<shm_perm.mode> フィールドの (標準ではない)  B<SHM_DEST> フラグが設定され"
+"る。 このデータ構造体は B<IPC_STAT> で取得される。"
 
 #. type: Plain text
 #: build/C/man2/shmctl.2:160
@@ -9872,37 +9977,76 @@ msgid "B<SHMALL>"
 msgstr "B<SHMALL>"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:270
+#: build/C/man2/shmget.2:269
+#, fuzzy
+#| msgid ""
+#| "System wide maximum of shared memory pages (on Linux, this limit can be "
+#| "read and modified via I</proc/sys/kernel/shmall>)."
 msgid ""
-"System wide maximum of shared memory pages (on Linux, this limit can be read "
-"and modified via I</proc/sys/kernel/shmall>)."
+"System wide maximum of shared memory pages.  Since Linux 2.2, the default "
+"value for this limit is"
+msgstr ""
+"システム全体の共有メモリ・ページの最大数 (Linux では、この上限値は I</proc/"
+"sys/kernel/shmall> 経由で参照したり、変更したりできる)。"
+
+#. type: Plain text
+#: build/C/man2/shmget.2:271
+#, no-wrap
+msgid "    SHMMAX / PAGE_SIZE * (SHMMNI / 16)\n"
+msgstr "    SHMMAX / PAGE_SIZE * (SHMMNI / 16)\n"
+
+#. type: Plain text
+#: build/C/man2/shmget.2:274
+msgid ""
+"Assuming a 4kB page size, this formula yields (since Linux 2.4) the value "
+"2^20 (2,097,152)."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/shmget.2:277
+#, fuzzy
+#| msgid ""
+#| "System wide maximum of shared memory pages (on Linux, this limit can be "
+#| "read and modified via I</proc/sys/kernel/shmall>)."
+msgid ""
+"On Linux, this limit can be read and modified via I</proc/sys/kernel/shmall>."
 msgstr ""
 "システム全体の共有メモリ・ページの最大数 (Linux では、この上限値は I</proc/"
 "sys/kernel/shmall> 経由で参照したり、変更したりできる)。"
 
 #. type: TP
-#: build/C/man2/shmget.2:270
+#: build/C/man2/shmget.2:277
 #, no-wrap
 msgid "B<SHMMAX>"
 msgstr "B<SHMMAX>"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:275
+#: build/C/man2/shmget.2:281
+msgid ""
+"Maximum size in bytes for a shared memory segment.  Since Linux 2.2, the "
+"default value of this limit is 0x2000000 (32MB)."
+msgstr ""
+
+#. type: Plain text
+#: build/C/man2/shmget.2:284
+#, fuzzy
+#| msgid ""
+#| "System wide maximum of shared memory pages (on Linux, this limit can be "
+#| "read and modified via I</proc/sys/kernel/shmall>)."
 msgid ""
-"Maximum size in bytes for a shared memory segment: policy dependent (on "
-"Linux, this limit can be read and modified via I</proc/sys/kernel/shmmax>)."
+"On Linux, this limit can be read and modified via I</proc/sys/kernel/shmmax>."
 msgstr ""
-"共有メモリ・セグメントのバイト単位の大きさの上限: 方針依存 (Linux では、この"
-"上限値は I</proc/sys/kernel/shmmax> 経由で参照したり、変更したりできる)。"
+"システム全体の共有メモリ・ページの最大数 (Linux では、この上限値は I</proc/"
+"sys/kernel/shmall> 経由で参照したり、変更したりできる)。"
 
 #. type: TP
-#: build/C/man2/shmget.2:275
+#: build/C/man2/shmget.2:284
 #, no-wrap
 msgid "B<SHMMIN>"
 msgstr "B<SHMMIN>"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:281
+#: build/C/man2/shmget.2:290
 msgid ""
 "Minimum size in bytes for a shared memory segment: implementation dependent "
 "(currently 1 byte, though B<PAGE_SIZE> is the effective minimum size)."
@@ -9911,27 +10055,36 @@ msgstr ""
 "が、実質的な最小サイズは B<PAGE_SIZE> である)。"
 
 #. type: TP
-#: build/C/man2/shmget.2:281
+#: build/C/man2/shmget.2:290
 #, no-wrap
 msgid "B<SHMMNI>"
 msgstr "B<SHMMNI>"
 
+#. type: Plain text
+#: build/C/man2/shmget.2:295
+msgid ""
+"System wide maximum number of shared memory segments.  In Linux 2.2, the "
+"default value for this limit was 128; since Linux 2.4, the default value is "
+"4096."
+msgstr ""
+
 #.  Kernels between 2.4.x and 2.6.8 had an off-by-one error that meant
 #.  that we could create one more segment than SHMMNI -- MTK
 #.  This /proc file is not available in Linux 2.2 and earlier -- MTK
 #. type: Plain text
-#: build/C/man2/shmget.2:290
+#: build/C/man2/shmget.2:301
+#, fuzzy
+#| msgid ""
+#| "System wide maximum of shared memory pages (on Linux, this limit can be "
+#| "read and modified via I</proc/sys/kernel/shmall>)."
 msgid ""
-"System wide maximum number of shared memory segments: implementation "
-"dependent (currently 4096, was 128 before Linux 2.3.99; on Linux, this limit "
-"can be read and modified via I</proc/sys/kernel/shmmni>)."
+"On Linux, this limit can be read and modified via I</proc/sys/kernel/shmmni>."
 msgstr ""
-"システム全体の共有メモリーの数の上限: 実装依存 (現在は 4096。Linux 2.3.99 よ"
-"り前では 128。 Linux では、この上限値は I</proc/sys/kernel/shmmni> 経由で参照"
-"したり、変更したりできる)。"
+"システム全体の共有メモリ・ページの最大数 (Linux では、この上限値は I</proc/"
+"sys/kernel/shmall> 経由で参照したり、変更したりできる)。"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:294
+#: build/C/man2/shmget.2:305
 msgid ""
 "The implementation has no specific limits for the per-process maximum number "
 "of shared memory segments (B<SHMSEG>)."
@@ -9940,7 +10093,7 @@ msgstr ""
 "上の制限はない。"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:300
+#: build/C/man2/shmget.2:311
 msgid ""
 "Until version 2.3.30 Linux would return B<EIDRM> for a B<shmget>()  on a "
 "shared memory segment scheduled for deletion."
@@ -9949,7 +10102,7 @@ msgstr ""
 "に対して B<shmget>()  が行われると B<EIDRM> を返していた。"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:306
+#: build/C/man2/shmget.2:317
 msgid ""
 "The name choice B<IPC_PRIVATE> was perhaps unfortunate, B<IPC_NEW> would "
 "more clearly show its function."
@@ -9958,7 +10111,7 @@ msgstr ""
 "より明確にその機能を表しているだろう。"
 
 #. type: Plain text
-#: build/C/man2/shmget.2:314
+#: build/C/man2/shmget.2:325
 msgid ""
 "B<shmat>(2), B<shmctl>(2), B<shmdt>(2), B<ftok>(3), B<capabilities>(7), "
 "B<shm_overview>(7), B<svipc>(7)"
@@ -10816,12 +10969,36 @@ msgstr ""
 msgid "B<fdatasync>(2), B<fsync>(2), B<msync>(2), B<sync>(2)"
 msgstr "B<fdatasync>(2), B<fsync>(2), B<msync>(2), B<sync>(2)"
 
+#~ msgid "2014-01-24"
+#~ msgstr "2014-01-24"
+
+#~ msgid "2012-04-28"
+#~ msgstr "2012-04-28"
+
+#~ msgid "2011-09-14"
+#~ msgstr "2011-09-14"
+
+#~ msgid ""
+#~ "Maximum size in bytes for a shared memory segment: policy dependent (on "
+#~ "Linux, this limit can be read and modified via I</proc/sys/kernel/"
+#~ "shmmax>)."
+#~ msgstr ""
+#~ "共有メモリ・セグメントのバイト単位の大きさの上限: 方針依存 (Linux では、こ"
+#~ "の上限値は I</proc/sys/kernel/shmmax> 経由で参照したり、変更したりでき"
+#~ "る)。"
+
+#~ msgid ""
+#~ "System wide maximum number of shared memory segments: implementation "
+#~ "dependent (currently 4096, was 128 before Linux 2.3.99; on Linux, this "
+#~ "limit can be read and modified via I</proc/sys/kernel/shmmni>)."
+#~ msgstr ""
+#~ "システム全体の共有メモリーの数の上限: 実装依存 (現在は 4096。Linux 2.3.99 "
+#~ "より前では 128。 Linux では、この上限値は I</proc/sys/kernel/shmmni> 経由"
+#~ "で参照したり、変更したりできる)。"
+
 #~ msgid "2013-05-12"
 #~ msgstr "2013-05-12"
 
-#~ msgid "2013-04-17"
-#~ msgstr "2013-04-17"
-
 #~ msgid "2012-04-16"
 #~ msgstr "2012-04-16"