Updated doc.

doc/aria2c.1.asciidoc

@@ -450,7 +450,7 @@ A single piece may include several files or part of files, and aria2
 writes the piece to the appropriate files.
 
 [[aria2_optref_show_files]]*-S*, *--show-files*[='true'|'false']::
-  Print file listing of .torrent or .metalink file and exit.
+  Print file listing of .torrent, .meta4 and .metalink file and exit.
   In case of .torrent file, additional information
   (infohash, piece length, etc) is also printed.
 
@@ -705,8 +705,8 @@ Specifying *<<aria2_optref_seed_time, --seed-time>>*='0' disables seeding after
 Metalink Specific Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 [[aria2_optref_follow_metalink]]*--follow-metalink*='true'|'false'|'mem'::
-  If 'true' or 'mem' is specified, when a file whose suffix is ".metalink" or content
-  type of "application/metalink+xml" is downloaded, aria2 parses it as a metalink
+  If 'true' or 'mem' is specified, when a file whose suffix is ".meta4" or ".metalink" or content
+  type of "application/metalink4+xml" or "application/metalink+xml" is downloaded, aria2 parses it as a metalink
   file and downloads files mentioned in it.
   If 'mem' is specified, a metalink file is not written to the disk, but is just
   kept in memory.
@@ -715,7 +715,7 @@ Metalink Specific Options
 
 [[aria2_optref_metalink_file]]*-M*, *--metalink-file*=METALINK_FILE::
 
-  The file path to .metalink file. Reads input from stdin when '-' is
+  The file path to .meta4 and .metalink file. Reads input from stdin when '-' is
   specified.  You are not required to use this option because you can
   specify .metalink files without *<<aria2_optref_metalink_file, -M>>*.
 
@@ -2996,14 +2996,14 @@ In the option struct, name element is option name(without preceding
 "--") and value element is argument as string.
 
 JSON-RPC Example
-++++++++++++++++
+^^^^^^^^^^^^^^^^
 
 ----------------------------------------------
 {'split':'1', 'http-proxy':'http://proxy/'}
 ----------------------------------------------
 
 XML-RPC Example
-+++++++++++++++
+^^^^^^^^^^^^^^^
 
 -------------------------------------------------
 <struct>
@@ -3026,14 +3026,14 @@ not enough. To overcome this situation, they can take array as value
 as well as string.
 
 JSON-RPC Example
-++++++++++++++++
+^^^^^^^^^^^^^^^^
 
 -------------------------------------------------------------
 {'header':['Accept-Language: ja', 'Accept-Charset: utf-8']}
 -------------------------------------------------------------
 
 XML-RPC Example
-+++++++++++++++
+^^^^^^^^^^^^^^^
 
 ---------------------------------------------------------------
 <struct>

src/usage_text.h

@@ -233,9 +233,10 @@
     "                              overwritten. Session Cookies are also saved and\n" \
     "                              their expiry values are treated as 0.")
 #define TEXT_SHOW_FILES                                                 \
-  _(" -S, --show-files[=true|false] Print file listing of .torrent or .metalink file\n" \
-    "                              and exit. More detailed information will be listed\n" \
-    "                              in case of torrent file.")
+  _(" -S, --show-files[=true|false] Print file listing of .torrent, .meta4 and\n" \
+    "                              .metalink file and exit. More detailed\n" \
+    "                              information will be listed in case of torrent\n" \
+    "                              file.")
 #define TEXT_SELECT_FILE                                                \
   _(" --select-file=INDEX...       Set file to download by specifying its index.\n" \
     "                              You can find the file index using the\n" \
@@ -337,8 +338,9 @@
     "                              0 means unlimited.\n"                \
     "                              See also --bt-request-peer-speed-limit option.")
 #define TEXT_METALINK_FILE                                              \
-  _(" -M, --metalink-file=METALINK_FILE The file path to the .metalink file. Reads\n" \
-    "                              input from stdin when '-' is specified.")
+  _(" -M, --metalink-file=METALINK_FILE The file path to the .meta4 and .metalink\n" \
+    "                              file. Reads input from stdin when '-' is\n" \
+    "                              specified.")
 #define TEXT_METALINK_SERVERS                                           \
   _(" -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" \
     "                              simultaneously. Some Metalinks regulate the\n" \
@@ -363,7 +365,8 @@
     "                              if you don't have any preferred protocol.")
 #define TEXT_FOLLOW_METALINK                                            \
   _(" --follow-metalink=true|false|mem If true or mem is specified, when a file\n" \
-    "                              whose suffix is .metalink or content type of\n" \
+    "                              whose suffix is .meta4 or .metalink, or content\n" \
+    "                              type of application/metalink4+xml or\n" \
     "                              application/metalink+xml is downloaded, aria2\n" \
     "                              parses it as a metalink file and downloads files\n" \
     "                              mentioned in it.\n"                  \