diff --git a/ChangeLog b/ChangeLog
index 793ab299..d00684bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed --retry-wait option from man page.
+	* doc/aria2c.1.txt
+
 2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed --retry-wait option since the current architecture doesn't
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 9012ed5a..5a01792a 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -2,12 +2,12 @@
 .\"     Title: aria2c
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
-.\"      Date: 09/18/2009
+.\"      Date: 09/20/2009
 .\"    Manual: Aria2 Manual
 .\"    Source: Aria2
 .\"  Language: English
 .\"
-.TH "ARIA2C" "1" "09/18/2009" "Aria2" "Aria2 Manual"
+.TH "ARIA2C" "1" "09/20/2009" "Aria2" "Aria2 Manual"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -201,15 +201,6 @@ Retrieve timestamp of the remote file from the remote HTTP/FTP server and if it
 \fIfalse\fR
 .RE
 .PP
-\fB\-\-retry\-wait\fR=SEC
-.RS 4
-Set the seconds to wait to retry after an error has occured\&. Specify a value between
-\fI0\fR
-and
-\fI60\fR\&. Default:
-\fI5\fR
-.RE
-.PP
 \fB\-\-server\-stat\-of\fR=FILE
 .RS 4
 Specify the filename to which performance profile of the servers is saved\&. You can load saved data using
@@ -877,7 +868,11 @@ Change the configuration file path to PATH\&. Default:
 .PP
 \fB\-D\fR, \fB\-\-daemon\fR
 .RS 4
-Run as daemon\&.
+Run as daemon\&. The current working directory will be changed to
+\fI/\fR
+and standard input, standard output and standard error will be redirected to
+\fI/dev/null\fR\&. Default:
+\fIfalse\fR
 .RE
 .PP
 \fB\-\-enable\-direct\-io\fR[=\fItrue\fR|\fIfalse\fR]
@@ -1392,17 +1387,6 @@ remote\-time
 .sp -1
 .IP \(bu 2.3
 .\}
-retry\-wait
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 split
 .RE
 .sp
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 98ba454c..8ba2c22e 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -640,16 +640,6 @@ aria2c -o myfile.zip "http://mirror1/file.zip" "http://mirror2/file.zip"</td>
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>--retry-wait</strong>=SEC
-</dt>
-<dd>
-<p>
-  Set the seconds to wait to retry after an error has occured.
-  Specify a value between <em>0</em> and <em>60</em>.
-  Default: <em>5</em>
-</p>
-</dd>
-<dt class="hdlist1">
 <strong>--server-stat-of</strong>=FILE
 </dt>
 <dd>
@@ -1517,7 +1507,9 @@ writes the piece to the appropriate files.</td>
 </dt>
 <dd>
 <p>
-  Run as daemon.
+  Run as daemon. The current working directory will be changed to <em>/</em>
+  and standard input, standard output and standard error will be
+  redirected to <em>/dev/null</em>. Default: <em>false</em>
 </p>
 </dd>
 <dt class="hdlist1">
@@ -2038,11 +2030,6 @@ remote-time
 </li>
 <li>
 <p>
-retry-wait
-</p>
-</li>
-<li>
-<p>
 split
 </p>
 </li>
@@ -3235,7 +3222,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-09-18 21:52:44 JST
+Last updated 2009-09-20 17:55:08 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index 5411839e..60251182 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -140,11 +140,6 @@ aria2c -o myfile.zip "http://mirror1/file.zip" "http://mirror2/file.zip"
   server and if it is available, apply it to the local file.
   Default: 'false'
 
-*--retry-wait*=SEC::
-  Set the seconds to wait to retry after an error has occured.
-  Specify a value between '0' and '60'.
-  Default: '5'
-
 *--server-stat-of*=FILE::
   Specify the filename to which performance profile of the servers is
   saved. You can load saved data using *--server-stat-if* option. See
@@ -596,7 +591,9 @@ Advanced Options
   Default: '$HOME/.aria2/aria2.conf'
 
 *-D*, *--daemon*::
-  Run as daemon.
+  Run as daemon. The current working directory will be changed to '/'
+  and standard input, standard output and standard error will be
+  redirected to '/dev/null'. Default: 'false'
 
 *--enable-direct-io*[='true'|'false']::
   Enable directI/O, which lowers cpu usage while allocating/checking files.
@@ -911,7 +908,6 @@ of URIs. These optional lines must start with white space(s).
 * out
 * proxy-method
 * remote-time
-* retry-wait
 * split
 * timeout
 * http-auth-challenge