2009-12-06 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed typo. Referred --index-out option in BitTorrent notes.
	* README

3 files changed, 181 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e25c7b3f..ed80acf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-12-06  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
+	Fixed typo. Referred --index-out option in BitTorrent notes.
+	* README
+
+2009-12-06  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
 	Store all addresses found by getifaddrs() and getaddrinfo().  In
 	bind, try all addresses until success
 	* src/SocketCore.cc
diff --git a/README b/README
index d45d71a2..78c94c15 100644
--- a/README
+++ b/README
@@ -103,7 +103,7 @@ distribution you use):
 * libgcrypt-dev    (Required for BitTorrent, Checksum support)
 * libc-ares-dev    (Required for async DNS support)
 * libxml2-dev      (Required for Metalink support)
-* libz1g-dev       (Required for gzip, deflate decoding support in HTTP)
+* zlib1g-dev       (Required for gzip, deflate decoding support in HTTP)
 * libsqlite3-dev   (Required for Firefox3 cookie support)
 
 You can use libssl-dev instead of
@@ -184,8 +184,10 @@ table is saved to $HOME/.aria2/dht.dat.
 
 Other things should be noted
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 * -o option is used to change the filename of .torrent file itself,
-  not a filename of a file in .torrent file.
+  not a filename of a file in .torrent file. For this purpose, use
+  --index-out option instead.
 * The port numbers that aria2 uses by default are 6881-6999 for TCP
   and UDP.
 * aria2 doesn't configure port-forwarding automatically. Please
diff --git a/README.html b/README.html
index 55debe7e..d0e9f7b2 100644
--- a/README.html
+++ b/README.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-<meta name="generator" content="AsciiDoc 8.4.4" />

+<meta name="generator" content="AsciiDoc 8.5.1" />

 <title>aria2 - The ultra fast download utility</title>

 <style type="text/css">

 /* Debug borders */

@@ -91,7 +91,7 @@ span#author {
 }

 span#email {

 }

-span#revision {

+span#revnumber, span#revdate, span#revremark {

   font-family: sans-serif;

 }

 

@@ -118,7 +118,7 @@ div#preamble {
 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,

 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,

 div.admonitionblock {

-  margin-top: 1.5em;

+  margin-top: 0.25em;

   margin-bottom: 1.5em;

 }

 div.admonitionblock {

@@ -209,8 +209,8 @@ div.exampleblock > div.content {
 }

 

 div.imageblock div.content { padding-left: 0; }

-div.imageblock img { border: 1px solid silver; }

 span.image img { border-style: none; }

+a.image:visited { color: white; }

 

 dl {

   margin-top: 0.8em;

@@ -310,6 +310,34 @@ div.hdlist.compact tr {
   background: yellow;

 }

 

+.footnote, .footnoteref {

+  font-size: 0.8em;

+}

+

+span.footnote, span.footnoteref {

+  vertical-align: super;

+}

+

+#footnotes {

+  margin: 20px 0 20px 0;

+  padding: 7px 0 0 0;

+}

+

+#footnotes div.footnote {

+  margin: 0 0 5px 0;

+}

+

+#footnotes hr {

+  border: none;

+  border-top: 1px solid silver;

+  height: 1px;

+  text-align: left;

+  margin-left: 0;

+  width: 20%;

+  min-width: 100px;

+}

+

+

 @media print {

   div#footer-badges { display: none; }

 }

@@ -381,6 +409,138 @@ div.exampleblock-content {
 /* IE6 sets dynamically generated links as visited. */

 div#toc a:visited { color: blue; }

 </style>

+<script type="text/javascript">

+/*<![CDATA[*/

+window.onload = function(){asciidoc.footnotes();}

+var asciidoc = {  // Namespace.

+

+/////////////////////////////////////////////////////////////////////

+// Table Of Contents generator

+/////////////////////////////////////////////////////////////////////

+

+/* Author: Mihai Bazon, September 2002

+ * http://students.infoiasi.ro/~mishoo

+ *

+ * Table Of Content generator

+ * Version: 0.4

+ *

+ * Feel free to use this script under the terms of the GNU General Public

+ * License, as long as you do not remove or alter this notice.

+ */

+

+ /* modified by Troy D. Hanson, September 2006. License: GPL */

+ /* modified by Stuart Rackham, 2006, 2009. License: GPL */

+

+// toclevels = 1..4.

+toc: function (toclevels) {

+

+  function getText(el) {

+    var text = "";

+    for (var i = el.firstChild; i != null; i = i.nextSibling) {

+      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.

+        text += i.data;

+      else if (i.firstChild != null)

+        text += getText(i);

+    }

+    return text;

+  }

+

+  function TocEntry(el, text, toclevel) {

+    this.element = el;

+    this.text = text;

+    this.toclevel = toclevel;

+  }

+

+  function tocEntries(el, toclevels) {

+    var result = new Array;

+    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');

+    // Function that scans the DOM tree for header elements (the DOM2

+    // nodeIterator API would be a better technique but not supported by all

+    // browsers).

+    var iterate = function (el) {

+      for (var i = el.firstChild; i != null; i = i.nextSibling) {

+        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {

+          var mo = re.exec(i.tagName);

+          if (mo)

+            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);

+          iterate(i);

+        }

+      }

+    }

+    iterate(el);

+    return result;

+  }

+

+  var toc = document.getElementById("toc");

+  var entries = tocEntries(document.getElementById("content"), toclevels);

+  for (var i = 0; i < entries.length; ++i) {

+    var entry = entries[i];

+    if (entry.element.id == "")

+      entry.element.id = "_toc_" + i;

+    var a = document.createElement("a");

+    a.href = "#" + entry.element.id;

+    a.appendChild(document.createTextNode(entry.text));

+    var div = document.createElement("div");

+    div.appendChild(a);

+    div.className = "toclevel" + entry.toclevel;

+    toc.appendChild(div);

+  }

+  if (entries.length == 0)

+    toc.parentNode.removeChild(toc);

+},

+

+

+/////////////////////////////////////////////////////////////////////

+// Footnotes generator

+/////////////////////////////////////////////////////////////////////

+

+/* Based on footnote generation code from:

+ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html

+ */

+

+footnotes: function () {

+  var cont = document.getElementById("content");

+  var noteholder = document.getElementById("footnotes");

+  var spans = cont.getElementsByTagName("span");

+  var refs = {};

+  var n = 0;

+  for (i=0; i<spans.length; i++) {

+    if (spans[i].className == "footnote") {

+      n++;

+      // Use [\s\S] in place of . so multi-line matches work.

+      // Because JavaScript has no s (dotall) regex flag.

+      note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];

+      noteholder.innerHTML +=

+        "<div class='footnote' id='_footnote_" + n + "'>" +

+        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +

+        n + "</a>. " + note + "</div>";

+      spans[i].innerHTML =

+        "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +

+        "' title='View footnote' class='footnote'>" + n + "</a>]";

+      var id =spans[i].getAttribute("id");

+      if (id != null) refs["#"+id] = n;

+    }

+  }

+  if (n == 0)

+    noteholder.parentNode.removeChild(noteholder);

+  else {

+    // Process footnoterefs.

+    for (i=0; i<spans.length; i++) {

+      if (spans[i].className == "footnoteref") {

+        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");

+        href = href.match(/#.*/)[0];  // Because IE return full URL.

+        n = refs[href];

+        spans[i].innerHTML =

+          "[<a href='#_footnote_" + n +

+          "' title='View footnote' class='footnote'>" + n + "</a>]";

+      }

+    }

+  }

+}

+

+}

+/*]]>*/

+</script>

 </head>

 <body>

 <div id="header">

@@ -388,6 +548,7 @@ div#toc a:visited { color: blue; }
 <span id="author">Tatsuhiro Tsujikawa</span><br />

 <span id="email"><tt>&lt;<a href="mailto:tujikawa_at_users_dot_sourceforge_dot_net">tujikawa_at_users_dot_sourceforge_dot_net</a>&gt;</tt></span><br />

 </div>

+<div id="content">

 <h2 id="_disclaimer">1. Disclaimer</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>This program comes with no warranty.

@@ -575,7 +736,7 @@ Parameterized URI support
 width="100%"

 frame="border"

 cellspacing="0" cellpadding="4">

-<caption class="title">External Library Dependency</caption>

+<caption class="title">Table 1: External Library Dependency</caption>

 <col width="50%" />

 <col width="50%" />

 <thead>

@@ -685,7 +846,7 @@ libxml2-dev      (Required for Metalink support)
 </li>

 <li>

 <p>

-libz1g-dev       (Required for gzip, deflate decoding support in HTTP)

+zlib1g-dev       (Required for gzip, deflate decoding support in HTTP)

 </p>

 </li>

 <li>

@@ -785,7 +946,8 @@ table is saved to $HOME/.aria2/dht.dat.</p></div>
 <li>

 <p>

 -o option is used to change the filename of .torrent file itself,

-  not a filename of a file in .torrent file.

+  not a filename of a file in .torrent file. For this purpose, use

+  --index-out option instead.

 </p>

 </li>

 <li>

@@ -859,9 +1021,11 @@ man aria2c
 </li>

 </ul></div>

 </div>

+</div>

+<div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-09-07 23:00:10 JST

+Last updated 2009-12-06 17:43:01 JST

 </div>

 </div>

 </body>