2010-03-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Documented about Metalink4 and LPD in README
	* RADME

3 files changed, 45 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 209b8e8f..3d5ebdd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
+	Documented about Metalink4 and LPD in README
+	* RADME
+
+2010-03-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
 	Few adjustment for timeouts in DHT. DHT message timeout is changed
 	from 15 to 10. The interval of PeerLookup is first 5 seconds and
 	it adds another 5 seconds in each retry.
diff --git a/README b/README
index 6c6f0bc5..6bb5f0ab 100644
--- a/README
+++ b/README
@@ -24,6 +24,7 @@ Here is a list of features.
 * Command-line interface
 * Download files through HTTP(S)/FTP/BitTorrent
 * Segmented downloading
+* Metalink version 4 http://www.ietf.org/id/draft-bryan-metalink-28.txt
 * Metalink version 3.0 support(HTTP/FTP/BitTorrent)
 * HTTP/1.1 implementation
 * HTTP Proxy support
@@ -46,6 +47,7 @@ Here is a list of features.
 * BitTorrent http://getright.com/seedtorrent.html[WEB-Seeding]. aria2
   requests chunks more than piece size to reduce the request
   overhead. It also supports pipelined requests with piece size.
+* BitTorrent Local Peer Discovery
 * Rename/change the directory structure of BitTorrent downloads
   completely
 * XML-RPC interface
@@ -202,13 +204,15 @@ Other things should be noted
 
 Metalink
 --------
+
 The current implementation supports HTTP(S)/FTP/BitTorrent.  The other
-P2P protocols are ignored.
+P2P protocols are ignored. Both Metalink4 and Metalink version 3.0
+documents are supported.
 
-For checksum verification, MD5, SHA1, and SHA256 are supported. If 
-multiple hash algorithms are provided, aria2 uses SHA1. If whole file
-checksum verification fails, aria2 doesn't retry the download and just 
-exits with non-zero return code.
+For checksum verification, MD5, SHA1, and SHA256 are supported. If
+multiple hash algorithms are provided, aria2 uses stronger one. If
+whole file checksum verification fails, aria2 doesn't retry the
+download and just exits with non-zero return code.
 
 The supported user preferences are version, language, location,
 protocol and os.
@@ -222,6 +226,14 @@ after the completion of the download.  The filename is download
 filename + ".sig". If same file already exists, the signature file is
 not saved.
 
+In Metalink4, multi-file torrent could appear in metalink:metaurl
+element.  Since aria2 cannot download 2 same torrents at the same
+time, aria2 groups files in metalink:file element which has same
+BitTorrent metaurl and downloads them from a single BitTorrent swarm.
+This is basically multi-file torrent download with file selection, so
+the adjacent files which is not in Metalink document but shares same
+piece with selected file are also created.
+
 netrc
 -----
 netrc support is enabled by default for HTTP(S)/FTP.  To disable netrc
diff --git a/README.html b/README.html
index 30dc476b..5b636c5a 100644
--- a/README.html
+++ b/README.html
@@ -583,6 +583,11 @@ Segmented downloading
 </li>

 <li>

 <p>

+Metalink version 4 <a href="http://www.ietf.org/id/draft-bryan-metalink-28.txt">http://www.ietf.org/id/draft-bryan-metalink-28.txt</a>

+</p>

+</li>

+<li>

+<p>

 Metalink version 3.0 support(HTTP/FTP/BitTorrent)

 </p>

 </li>

@@ -677,6 +682,11 @@ BitTorrent <a href="http://getright.com/seedtorrent.html">WEB-Seeding</a>. aria2
 </li>

 <li>

 <p>

+BitTorrent Local Peer Discovery

+</p>

+</li>

+<li>

+<p>

 Rename/change the directory structure of BitTorrent downloads

   completely

 </p>

@@ -981,11 +991,12 @@ As of release 0.10.0, aria2 stops sending request message after
 <h2 id="_metalink">6. Metalink</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>The current implementation supports HTTP(S)/FTP/BitTorrent.  The other

-P2P protocols are ignored.</p></div>

+P2P protocols are ignored. Both Metalink4 and Metalink version 3.0

+documents are supported.</p></div>

 <div class="paragraph"><p>For checksum verification, MD5, SHA1, and SHA256 are supported. If

-multiple hash algorithms are provided, aria2 uses SHA1. If whole file

-checksum verification fails, aria2 doesn&#8217;t retry the download and just

-exits with non-zero return code.</p></div>

+multiple hash algorithms are provided, aria2 uses stronger one. If

+whole file checksum verification fails, aria2 doesn&#8217;t retry the

+download and just exits with non-zero return code.</p></div>

 <div class="paragraph"><p>The supported user preferences are version, language, location,

 protocol and os.</p></div>

 <div class="paragraph"><p>If chunk checksums are provided in Metalink file, aria2 automatically

@@ -995,6 +1006,13 @@ off by a command-line option.</p></div>
 after the completion of the download.  The filename is download

 filename + ".sig". If same file already exists, the signature file is

 not saved.</p></div>

+<div class="paragraph"><p>In Metalink4, multi-file torrent could appear in metalink:metaurl

+element.  Since aria2 cannot download 2 same torrents at the same

+time, aria2 groups files in metalink:file element which has same

+BitTorrent metaurl and downloads them from a single BitTorrent swarm.

+This is basically multi-file torrent download with file selection, so

+the adjacent files which is not in Metalink document but shares same

+piece with selected file are also created.</p></div>

 </div>

 <h2 id="_netrc">7. netrc</h2>

 <div class="sectionbody">

@@ -1026,7 +1044,7 @@ man aria2c
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-06 17:57:59 JST

+Last updated 2010-03-13 00:29:44 JST

 </div>

 </div>

 </body>