diff --git a/doc/h2load.1 b/doc/h2load.1
index 42642748..e0bbf4f7 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "September 16, 2015" "1.3.2" "nghttp2"
+.TH "H2LOAD" "1" "September 24, 2015" "1.3.3" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
@@ -124,7 +124,8 @@ described in OpenSSL ciphers(1).
 .B \-p, \-\-no\-tls\-proto=<PROTOID>
 Specify ALPN identifier of the  protocol to be used when
 accessing http URI without SSL/TLS.
-Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c
+Available protocols: spdy/2, spdy/3, spdy/3.1, h2c and
+http/1.1
 .sp
 Default: \fBh2c\fP
 .UNINDENT
@@ -209,6 +210,18 @@ input files.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-npn\-list=<LIST>
+Comma delimited list of  ALPN protocol identifier sorted
+in the  order of preference.  That  means most desirable
+protocol comes  first.  This  is used  in both  ALPN and
+NPN.  The parameter must be  delimited by a single comma
+only  and any  white spaces  are  treated as  a part  of
+protocol string.
+.sp
+Default: \fBh2,h2\-16,h2\-14,spdy/3.1,spdy/3,spdy/2,http/1.1\fP
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-v, \-\-verbose
 Output debug information.
 .UNINDENT
diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst
index f7e7b42b..ae999c7f 100644
--- a/doc/h2load.1.rst
+++ b/doc/h2load.1.rst
@@ -95,7 +95,8 @@ OPTIONS
 
     Specify ALPN identifier of the  protocol to be used when
     accessing http URI without SSL/TLS.
-    Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c
+    Available protocols: spdy/2, spdy/3, spdy/3.1, h2c and
+    http/1.1
 
     Default: ``h2c``
 
@@ -171,6 +172,17 @@ OPTIONS
     values  defined either  at  the command  line or  inside
     input files.
 
+.. option:: --npn-list=<LIST>
+
+    Comma delimited list of  ALPN protocol identifier sorted
+    in the  order of preference.  That  means most desirable
+    protocol comes  first.  This  is used  in both  ALPN and
+    NPN.  The parameter must be  delimited by a single comma
+    only  and any  white spaces  are  treated as  a part  of
+    protocol string.
+
+    Default: ``h2,h2-16,h2-14,spdy/3.1,spdy/3,spdy/2,http/1.1``
+
 .. option:: -v, --verbose
 
     Output debug information.
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index f03903e6..73834182 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "September 16, 2015" "1.3.2" "nghttp2"
+.TH "NGHTTP" "1" "September 24, 2015" "1.3.3" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 experimental client
 .
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index cfc0f7f3..6ddca0c8 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "September 16, 2015" "1.3.2" "nghttp2"
+.TH "NGHTTPD" "1" "September 24, 2015" "1.3.3" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 experimental server
 .
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index 518c6ca2..8bb934ef 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "September 16, 2015" "1.3.2" "nghttp2"
+.TH "NGHTTPX" "1" "September 24, 2015" "1.3.3" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 experimental proxy
 .
@@ -1003,6 +1003,17 @@ path with same command\-line arguments and environment variables.
 After new process comes up, sending SIGQUIT to the original process
 to perform hot swapping.
 .UNINDENT
+.sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
+nghttpx consists of 2 processes: one process for processing these
+signals, and another one for processing requests.  The former spawns
+the latter.  The former is called master process, and the latter is
+called worker process.  The above signal must be sent to the master
+process.  If the worker process receives one of them, it is ignored.
+.UNINDENT
+.UNINDENT
 .SH SERVER PUSH
 .sp
 nghttpx supports HTTP/2 server push in default mode.  nghttpx looks
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index 20fe6b57..aeece426 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -909,6 +909,14 @@ SIGUSR2
   After new process comes up, sending SIGQUIT to the original process
   to perform hot swapping.
 
+.. note::
+
+  nghttpx consists of 2 processes: one process for processing these
+  signals, and another one for processing requests.  The former spawns
+  the latter.  The former is called master process, and the latter is
+  called worker process.  The above signal must be sent to the master
+  process.  If the worker process receives one of them, it is ignored.
+
 SERVER PUSH
 -----------