diff --git a/doc/h2load.1 b/doc/h2load.1 index d632e656..8de67437 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "Apr 19, 2017" "1.22.0-DEV" "nghttp2" +.TH "H2LOAD" "1" "Apr 24, 2017" "1.22.0" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 67069c62..6f1ef989 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "Apr 19, 2017" "1.22.0-DEV" "nghttp2" +.TH "NGHTTP" "1" "Apr 24, 2017" "1.22.0" "nghttp2" .SH NAME nghttp \- HTTP/2 client . diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index ebdb8897..6482409f 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "Apr 19, 2017" "1.22.0-DEV" "nghttp2" +.TH "NGHTTPD" "1" "Apr 24, 2017" "1.22.0" "nghttp2" .SH NAME nghttpd \- HTTP/2 server . diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 7d92c05c..342c17d0 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "Apr 19, 2017" "1.22.0-DEV" "nghttp2" +.TH "NGHTTPX" "1" "Apr 24, 2017" "1.22.0" "nghttp2" .SH NAME nghttpx \- HTTP/2 proxy . @@ -1505,7 +1505,9 @@ Set mruby script file .INDENT 0.0 .TP .B \-\-conf= -Load configuration from . +Load configuration from . Please note that +nghttpx always tries to read the default configuration +file if \fI\%\-\-conf\fP is not given. .sp Default: \fB/etc/nghttpx/nghttpx.conf\fP .UNINDENT diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index 8dc9e0fb..3a228463 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -1377,7 +1377,9 @@ Misc .. option:: --conf= - Load configuration from . + Load configuration from . Please note that + nghttpx always tries to read the default configuration + file if :option:`--conf` is not given. Default: ``/etc/nghttpx/nghttpx.conf``