diff --git a/doc/h2load.1 b/doc/h2load.1 index 78ad9443..15e86d0a 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "Oct 09, 2016" "1.16.0-DEV" "nghttp2" +.TH "H2LOAD" "1" "Oct 11, 2016" "1.16.0-DEV" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . diff --git a/doc/nghttp.1 b/doc/nghttp.1 index b8622d5e..048fd81c 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "Oct 09, 2016" "1.16.0-DEV" "nghttp2" +.TH "NGHTTP" "1" "Oct 11, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttp \- HTTP/2 client . diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index 9ded4038..5f0aa226 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "Oct 09, 2016" "1.16.0-DEV" "nghttp2" +.TH "NGHTTPD" "1" "Oct 11, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttpd \- HTTP/2 server . diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index cc9dcd6d..4ec78498 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "Oct 09, 2016" "1.16.0-DEV" "nghttp2" +.TH "NGHTTPX" "1" "Oct 11, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttpx \- HTTP/2 proxy . @@ -456,6 +456,14 @@ Default: \fB30s\fP .UNINDENT .INDENT 0.0 .TP +.B \-\-backend\-connect\-timeout= +Specify timeout before establishing TCP connection to +backend. +.sp +Default: \fB30s\fP +.UNINDENT +.INDENT 0.0 +.TP .B \-\-backend\-keep\-alive\-timeout= Specify keep\-alive timeout for backend connection. .sp diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index aeffb0cb..e80fffa4 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -417,6 +417,13 @@ Timeout Default: ``30s`` +.. option:: --backend-connect-timeout= + + Specify timeout before establishing TCP connection to + backend. + + Default: ``30s`` + .. option:: --backend-keep-alive-timeout= Specify keep-alive timeout for backend connection.