diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml
index f88fdb5e4..9a9ea9639 100644
--- a/doc/man/mkvmerge.xml
+++ b/doc/man/mkvmerge.xml
@@ -98,8 +98,9 @@
,
- Create a WebMedia compliant file. This enforces several restrictions. The only allowed codecs are VP8 video and Vorbis audio
- tracks. Neither chapters nor tags are allowed. The DocType header item is changed to "webm".
+ Create a WebMedia compliant file. This is also turned on if the output file name's extension is "webm". This mode
+ enforces several restrictions. The only allowed codecs are VP8 video and Vorbis audio tracks. Neither chapters nor tags are
+ allowed. The DocType header item is changed to "webm".
diff --git a/doc/man/po4a/po/ja.po b/doc/man/po4a/po/ja.po
index ef973805e..a5f9ada37 100644
--- a/doc/man/po4a/po/ja.po
+++ b/doc/man/po4a/po/ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.9.9\n"
-"POT-Creation-Date: 2010-05-18 19:42+0300\n"
+"POT-Creation-Date: 2010-05-18 20:36+0300\n"
"PO-Revision-Date: 2010-04-29 23:31+0900\n"
"Last-Translator: Hiroki Taniura \n"
"Language-Team: none\n"
@@ -269,7 +269,7 @@ msgstr ""
"ますが、'fast'スキャンには数秒しかかかりません。"
#. type: Content of:
-#: doc/man/mkvextract.xml:91 doc/man/mkvinfo.xml:93 doc/man/mkvmerge.xml:1184
+#: doc/man/mkvextract.xml:91 doc/man/mkvinfo.xml:93 doc/man/mkvmerge.xml:1185
#: doc/man/mkvpropedit.xml:152
msgid ""
" character-set"
@@ -288,13 +288,13 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:101 doc/man/mkvinfo.xml:103
-#: doc/man/mkvmerge.xml:1197 doc/man/mkvpropedit.xml:162
+#: doc/man/mkvmerge.xml:1198 doc/man/mkvpropedit.xml:162
msgid " character-set"
msgstr " character-set"
#. type: Content of:
#: doc/man/mkvextract.xml:104 doc/man/mkvinfo.xml:106
-#: doc/man/mkvmerge.xml:1200 doc/man/mkvpropedit.xml:165
+#: doc/man/mkvmerge.xml:1201 doc/man/mkvpropedit.xml:165
msgid ""
"Sets the character set to which strings are converted that are to be "
"output. It defaults to the character set given by system's current locale."
@@ -304,7 +304,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:111 doc/man/mkvinfo.xml:113
-#: doc/man/mkvmerge.xml:1207 doc/man/mkvpropedit.xml:172
+#: doc/man/mkvmerge.xml:1208 doc/man/mkvpropedit.xml:172
msgid ""
", file-"
"name"
@@ -331,7 +331,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:123 doc/man/mkvinfo.xml:125
-#: doc/man/mkvmerge.xml:1218 doc/man/mkvpropedit.xml:184
+#: doc/man/mkvmerge.xml:1219 doc/man/mkvpropedit.xml:184
msgid " code"
msgstr " code"
@@ -367,37 +367,37 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:144 doc/man/mkvinfo.xml:147
-#: doc/man/mkvmerge.xml:1290 doc/man/mkvpropedit.xml:205
+#: doc/man/mkvmerge.xml:1291 doc/man/mkvpropedit.xml:205
msgid ", "
msgstr ", "
#. type: Content of:
#: doc/man/mkvextract.xml:147 doc/man/mkvinfo.xml:150
-#: doc/man/mkvmerge.xml:1293 doc/man/mkvpropedit.xml:208
+#: doc/man/mkvmerge.xml:1294 doc/man/mkvpropedit.xml:208
msgid "Show usage information and exit."
msgstr "コマンド書式情報を出力して終了します。"
#. type: Content of:
#: doc/man/mkvextract.xml:153 doc/man/mkvinfo.xml:156
-#: doc/man/mkvmerge.xml:1299 doc/man/mkvpropedit.xml:214
+#: doc/man/mkvmerge.xml:1300 doc/man/mkvpropedit.xml:214
msgid ", "
msgstr ", "
#. type: Content of:
#: doc/man/mkvextract.xml:156 doc/man/mkvinfo.xml:159
-#: doc/man/mkvmerge.xml:1302 doc/man/mkvpropedit.xml:217
+#: doc/man/mkvmerge.xml:1303 doc/man/mkvpropedit.xml:217
msgid "Show version information and exit."
msgstr "バージョン情報を出力して終了します。"
#. type: Content of:
#: doc/man/mkvextract.xml:162 doc/man/mkvinfo.xml:165
-#: doc/man/mkvmerge.xml:1230 doc/man/mkvpropedit.xml:223
+#: doc/man/mkvmerge.xml:1231 doc/man/mkvpropedit.xml:223
msgid "options-file"
msgstr "options-file"
#. type: Content of:
#: doc/man/mkvextract.xml:165 doc/man/mkvinfo.xml:168
-#: doc/man/mkvmerge.xml:1233 doc/man/mkvpropedit.xml:226
+#: doc/man/mkvmerge.xml:1234 doc/man/mkvpropedit.xml:226
msgid ""
"Reads additional command line arguments from the file options-"
"file. Lines whose first non-whitespace character is a hash mark "
@@ -1036,7 +1036,7 @@ msgstr ""
"テナに格納されます。"
#. type: Content of:
-#: doc/man/mkvextract.xml:535 doc/man/mkvmerge.xml:1825
+#: doc/man/mkvextract.xml:535 doc/man/mkvmerge.xml:1826
msgid "Tags"
msgstr "タグ"
@@ -1050,7 +1050,7 @@ msgstr ""
"読み込む際のフォーマットと同じです。"
#. type: Content of:
-#: doc/man/mkvextract.xml:544 doc/man/mkvmerge.xml:1693
+#: doc/man/mkvextract.xml:544 doc/man/mkvmerge.xml:1694
msgid "Attachments"
msgstr "添付ファイル"
@@ -1064,7 +1064,7 @@ msgstr ""
"く行われません。"
#. type: Content of:
-#: doc/man/mkvextract.xml:553 doc/man/mkvmerge.xml:1718
+#: doc/man/mkvextract.xml:553 doc/man/mkvmerge.xml:1719
msgid "Chapters"
msgstr "チャプタ"
@@ -1097,7 +1097,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:575 doc/man/mkvinfo.xml:225
-#: doc/man/mkvmerge.xml:2057 doc/man/mkvpropedit.xml:356
+#: doc/man/mkvmerge.xml:2058 doc/man/mkvpropedit.xml:356
msgid "Exit codes"
msgstr "返り値"
@@ -1141,7 +1141,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:606 doc/man/mkvinfo.xml:255
-#: doc/man/mkvmerge.xml:2088 doc/man/mkvpropedit.xml:387 doc/man/mmg.xml:90
+#: doc/man/mkvmerge.xml:2089 doc/man/mkvpropedit.xml:387 doc/man/mmg.xml:90
msgid "See also"
msgstr "関連項目"
@@ -1152,13 +1152,13 @@ msgstr "&mkvmerge;, &mkvinfo;, &mkvpropedit;, &mmg;"
#. type: Content of:
#: doc/man/mkvextract.xml:613 doc/man/mkvinfo.xml:262
-#: doc/man/mkvmerge.xml:2095 doc/man/mkvpropedit.xml:394 doc/man/mmg.xml:97
+#: doc/man/mkvmerge.xml:2096 doc/man/mkvpropedit.xml:394 doc/man/mmg.xml:97
msgid "WWW"
msgstr "ウェブ"
#. type: Content of:
#: doc/man/mkvextract.xml:615 doc/man/mkvinfo.xml:264
-#: doc/man/mkvmerge.xml:2097 doc/man/mkvpropedit.xml:396 doc/man/mmg.xml:99
+#: doc/man/mkvmerge.xml:2098 doc/man/mkvpropedit.xml:396 doc/man/mmg.xml:99
msgid ""
"The latest version can always be found at the MKVToolNix homepage."
@@ -1505,28 +1505,30 @@ msgstr ", "
#. type: Content of:
#: doc/man/mkvmerge.xml:101
msgid ""
-"Create a WebMedia compliant file. This enforces several restrictions. The "
-"only allowed codecs are VP8 video and Vorbis audio tracks. Neither chapters "
-"nor tags are allowed. The DocType header item is changed to "webm"."
+"Create a WebMedia compliant file. This is also turned on if the output file "
+"name's extension is "webm". This mode enforces several "
+"restrictions. The only allowed codecs are VP8 video and Vorbis audio tracks. "
+"Neither chapters nor tags are allowed. The DocType header item is changed to "
+""webm"."
msgstr ""
#. type: Content of:
-#: doc/man/mkvmerge.xml:108
+#: doc/man/mkvmerge.xml:109
msgid " title"
msgstr " title"
#. type: Content of:
-#: doc/man/mkvmerge.xml:110
+#: doc/man/mkvmerge.xml:111
msgid "Sets the general title for the output file, e.g. the movie name."
msgstr "出力ファイル全体のタイトルを指定します(例:映画のタイトルなど)。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:115
+#: doc/man/mkvmerge.xml:116
msgid " file-name"
msgstr " file-name"
#. type: Content of:
-#: doc/man/mkvmerge.xml:117
+#: doc/man/mkvmerge.xml:118
msgid ""
"Read global tags from the &xml; file file-name. See "
"the section about tags below for details."
@@ -1535,14 +1537,14 @@ msgstr ""
"み込みます。詳細はタグについてのセクションを参照してください。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:123
+#: doc/man/mkvmerge.xml:124
msgid ""
" language-code"
msgstr ""
" language-code"
#. type: Content of:
-#: doc/man/mkvmerge.xml:125
+#: doc/man/mkvmerge.xml:126
msgid ""
"Sets the default language code that will be used for all tracks unless "
"overwritten with the '、つまり'未定義'です。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:133
+#: doc/man/mkvmerge.xml:134
msgid "Segment info handling: (global options)"
msgstr "セグメント情報の扱い: (グローバルオプション)"
#. type: Content of:
-#: doc/man/mkvmerge.xml:138
+#: doc/man/mkvmerge.xml:139
msgid " filename.xml"
msgstr " filename.xml"
#. type: Content of:
-#: doc/man/mkvmerge.xml:141
+#: doc/man/mkvmerge.xml:142
#, fuzzy
msgid ""
"Read segment information from a XML file. This file can "
@@ -1580,12 +1582,12 @@ msgstr ""
"す。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:149
+#: doc/man/mkvmerge.xml:150
msgid " SID1,SID2,..."
msgstr " SID1,SID2,..."
#. type: Content of:
-#: doc/man/mkvmerge.xml:152
+#: doc/man/mkvmerge.xml:153
#, fuzzy
msgid ""
"Sets the segment UIDs to use. This is a comma-separated list of 128bit "
@@ -1597,7 +1599,7 @@ msgstr ""
"32桁の16進数)128ビットセグメントUIDのリストです。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:157
+#: doc/man/mkvmerge.xml:158
msgid ""
"Each file created contains one segment, and each segment has one segment "
"UID. If more segment UIDs are specified than segments are created then the "
@@ -1611,19 +1613,19 @@ msgstr ""
"されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:166
+#: doc/man/mkvmerge.xml:167
msgid "Chapter and tag handling: (global options)"
msgstr "チャプタ及びタグの扱い: (グローバルオプション)"
#. type: Content of:
-#: doc/man/mkvmerge.xml:171 doc/man/mkvmerge.xml:790
+#: doc/man/mkvmerge.xml:172 doc/man/mkvmerge.xml:791
msgid ""
" language-code"
msgstr ""
" language-code"
#. type: Content of:
-#: doc/man/mkvmerge.xml:174
+#: doc/man/mkvmerge.xml:175
msgid ""
"Sets the ISO639-2 language code that is written for each chapter entry. "
"Defaults to 'eng'. See the section about のセクションを参照してください。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:179
+#: doc/man/mkvmerge.xml:180
msgid ""
"This option can be used both for simple chapter files and for source files "
"that contain chapters but no information about the chapters' language, e.g. "
@@ -1645,13 +1647,13 @@ msgstr ""
"に適用されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:186 doc/man/mkvmerge.xml:779
+#: doc/man/mkvmerge.xml:187 doc/man/mkvmerge.xml:780
msgid " character-set"
msgstr ""
" character-set"
#. type: Content of:
-#: doc/man/mkvmerge.xml:189
+#: doc/man/mkvmerge.xml:190
msgid ""
"Sets the character set that is used for the conversion to UTF-8 for simple "
"chapter files. See the section about
-#: doc/man/mkvmerge.xml:195
+#: doc/man/mkvmerge.xml:196
msgid ""
"This switch does also apply to chapters that are copied from certain "
"container types, e.g. Ogg/OGM and MP4 files. See the section about chapters "
@@ -1675,14 +1677,14 @@ msgstr ""
"い。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:202
+#: doc/man/mkvmerge.xml:203
msgid ""
" format"
msgstr ""
" format"
#. type: Content of:
-#: doc/man/mkvmerge.xml:205
+#: doc/man/mkvmerge.xml:206
msgid ""
"&mkvmerge; supports reading CUE sheets for audio files as "
"the input for chapters. CUE sheets usually contain the "
@@ -1697,7 +1699,7 @@ msgstr ""
"用します。このフォーマットをこのオプションで指定することができます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:211
+#: doc/man/mkvmerge.xml:212
msgid ""
"If this option is not given then &mkvmerge; defaults to the format '%p "
"- %t
' (the performer, followed by a space, a dash, another space and "
@@ -1707,7 +1709,7 @@ msgstr ""
"うフォーマットが使用されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:216
+#: doc/man/mkvmerge.xml:217
msgid ""
"If the format is given then everything except the following meta characters "
"is copied as-is, and the meta characters are replaced like this:"
@@ -1716,7 +1718,7 @@ msgstr ""
"は以下のように置換されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:222
+#: doc/man/mkvmerge.xml:223
msgid ""
"%p is replaced by the current entry's "
"PERFORMER string,"
@@ -1725,7 +1727,7 @@ msgstr ""
"置換されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:225
+#: doc/man/mkvmerge.xml:226
msgid ""
"%t is replaced by the current entry's TITLE"
"varname> string,"
@@ -1734,12 +1736,12 @@ msgstr ""
"されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:228
+#: doc/man/mkvmerge.xml:229
msgid "%n is replaced by the current track number and"
msgstr "%nはそのエントリのトラック番号で置換されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:231
+#: doc/man/mkvmerge.xml:232
msgid ""
"%N is replaced by the current track number padded "
"with a leading zero if it is < 10."
@@ -1748,12 +1750,12 @@ msgstr ""
"して二桁にした数字で置換されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:239
+#: doc/man/mkvmerge.xml:240
msgid " file-name"
msgstr " file-name"
#. type: Content of:
-#: doc/man/mkvmerge.xml:242
+#: doc/man/mkvmerge.xml:243
msgid ""
"Read chapter information from the file