diff --git a/doc/h2load.1 b/doc/h2load.1
index 50ad4f8c..7c2d3201 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "December 23, 2015" "1.6.0" "nghttp2"
+.TH "H2LOAD" "1" "January 11, 2016" "1.6.1-DEV" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
@@ -88,11 +88,12 @@ scheme, host or port values.
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-m, \-\-max\-concurrent\-streams=(auto|<N>)
-Max concurrent streams to  issue per session.  If "auto"
-is given, the number of given URIs is used.
+.B \-m, \-\-max\-concurrent\-streams=<N>
+Max  concurrent  streams  to issue  per  session.   When
+http/1.1  is used,  this  specifies the  number of  HTTP
+pipelining requests in\-flight.
 .sp
-Default: \fBauto\fP
+Default: \fB1\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -410,6 +411,6 @@ window size described in HTTP/2 and SPDY protocol specification.
 .SH AUTHOR
 Tatsuhiro Tsujikawa
 .SH COPYRIGHT
-2012, 2015, Tatsuhiro Tsujikawa
+2012, 2015, 2016, Tatsuhiro Tsujikawa
 .\" Generated by docutils manpage writer.
 .
diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst
index 368c6ab5..85feeb63 100644
--- a/doc/h2load.1.rst
+++ b/doc/h2load.1.rst
@@ -63,12 +63,13 @@ OPTIONS
     are used solely.  Definition of a base URI overrides all
     scheme, host or port values.
 
-.. option:: -m, --max-concurrent-streams=(auto|<N>)
+.. option:: -m, --max-concurrent-streams=<N>
 
-    Max concurrent streams to  issue per session.  If "auto"
-    is given, the number of given URIs is used.
+    Max  concurrent  streams  to issue  per  session.   When
+    http/1.1  is used,  this  specifies the  number of  HTTP
+    pipelining requests in-flight.
 
-    Default: ``auto``
+    Default: ``1``
 
 .. option:: -w, --window-bits=<N>
 
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index 6d7feb45..4239f424 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "December 23, 2015" "1.6.0" "nghttp2"
+.TH "NGHTTP" "1" "January 11, 2016" "1.6.1-DEV" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 client
 .
@@ -296,6 +296,6 @@ on stream 11 with the weight 2.
 .SH AUTHOR
 Tatsuhiro Tsujikawa
 .SH COPYRIGHT
-2012, 2015, Tatsuhiro Tsujikawa
+2012, 2015, 2016, Tatsuhiro Tsujikawa
 .\" Generated by docutils manpage writer.
 .
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index 6d841e82..5d5b0c99 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "December 23, 2015" "1.6.0" "nghttp2"
+.TH "NGHTTPD" "1" "January 11, 2016" "1.6.1-DEV" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 server
 .
@@ -180,6 +180,11 @@ Default: \fB/etc/mime.types\fP
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-no\-content\-length
+Don\(aqt send content\-length header field.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-version
 Display version information and exit.
 .UNINDENT
@@ -197,6 +202,6 @@ The <SIZE> argument is an integer and an optional unit (e.g., 10K is
 .SH AUTHOR
 Tatsuhiro Tsujikawa
 .SH COPYRIGHT
-2012, 2015, Tatsuhiro Tsujikawa
+2012, 2015, 2016, Tatsuhiro Tsujikawa
 .\" Generated by docutils manpage writer.
 .
diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst
index 6b33b0ea..cdb80c31 100644
--- a/doc/nghttpd.1.rst
+++ b/doc/nghttpd.1.rst
@@ -139,6 +139,10 @@ OPTIONS
 
     Default: ``/etc/mime.types``
 
+.. option:: --no-content-length
+
+    Don't send content-length header field.
+
 .. option:: --version
 
     Display version information and exit.
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index 093a7fb9..2bee266c 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "December 23, 2015" "1.6.0" "nghttp2"
+.TH "NGHTTPX" "1" "January 11, 2016" "1.6.1-DEV" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 proxy
 .
@@ -896,8 +896,8 @@ Example: \fI\%\-\-add\-response\-header\fP="foo: bar"
 .INDENT 0.0
 .TP
 .B \-\-header\-field\-buffer=<SIZE>
-Set maximum  buffer size for incoming  HTTP header field
-list.   This is  the sum  of  header name  and value  in
+Set maximum buffer size for incoming HTTP request header
+field list.  This is the sum of header name and value in
 bytes.
 .sp
 Default: \fB64K\fP
@@ -905,8 +905,9 @@ Default: \fB64K\fP
 .INDENT 0.0
 .TP
 .B \-\-max\-header\-fields=<N>
-Set maximum number of incoming HTTP header fields, which
-appear in one request or response header field list.
+Set  maximum  number  of incoming  HTTP  request  header
+fields, which  appear in one request  or response header
+field list.
 .sp
 Default: \fB100\fP
 .UNINDENT
@@ -1458,6 +1459,6 @@ App.new
 .SH AUTHOR
 Tatsuhiro Tsujikawa
 .SH COPYRIGHT
-2012, 2015, Tatsuhiro Tsujikawa
+2012, 2015, 2016, Tatsuhiro Tsujikawa
 .\" Generated by docutils manpage writer.
 .
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index e87377cd..39d954ae 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -797,16 +797,17 @@ HTTP
 
 .. option:: --header-field-buffer=<SIZE>
 
-    Set maximum  buffer size for incoming  HTTP header field
-    list.   This is  the sum  of  header name  and value  in
+    Set maximum buffer size for incoming HTTP request header
+    field list.  This is the sum of header name and value in
     bytes.
 
     Default: ``64K``
 
 .. option:: --max-header-fields=<N>
 
-    Set maximum number of incoming HTTP header fields, which
-    appear in one request or response header field list.
+    Set  maximum  number  of incoming  HTTP  request  header
+    fields, which  appear in one request  or response header
+    field list.
 
     Default: ``100``