diff --git a/doc/h2load.1 b/doc/h2load.1 index 2a86f58a..beeb8631 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "May 15, 2015" "0.7.15" "nghttp2" +.TH "H2LOAD" "1" "May 16, 2015" "1.0.0" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . @@ -116,9 +116,9 @@ Add/Override a header to the requests. .B \-p, \-\-no\-tls\-proto= 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\-14 +Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c .sp -Default: \fBh2c\-14\fP +Default: \fBh2c\fP .UNINDENT .INDENT 0.0 .TP diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst index 2bc0f6a8..21e5a425 100644 --- a/doc/h2load.1.rst +++ b/doc/h2load.1.rst @@ -88,9 +88,9 @@ 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-14 + Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c - Default: ``h2c-14`` + Default: ``h2c`` .. option:: -d, --data= diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 4be668e6..c29360f6 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "May 15, 2015" "0.7.15" "nghttp2" +.TH "NGHTTP" "1" "May 16, 2015" "1.0.0" "nghttp2" .SH NAME nghttp \- HTTP/2 experimental client . diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index cb057ad4..24e7bb91 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "May 15, 2015" "0.7.15" "nghttp2" +.TH "NGHTTPD" "1" "May 16, 2015" "1.0.0" "nghttp2" .SH NAME nghttpd \- HTTP/2 experimental server . diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 0fac2a86..e42ec766 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "May 15, 2015" "0.7.15" "nghttp2" +.TH "NGHTTPX" "1" "May 16, 2015" "1.0.0" "nghttp2" .SH NAME nghttpx \- HTTP/2 experimental proxy . @@ -690,10 +690,10 @@ will not be altered regardless of this option. .B \-\-altsvc= Specify protocol ID, port, host and origin of alternative service. and are optional. -They are advertised in alt\-svc header field or HTTP/2 -ALTSVC frame. This option can be used multiple times to -specify multiple alternative services. Example: -\fI\%\-\-altsvc\fP=h2,443 +They are advertised in alt\-svc header field only in +HTTP/1.1 frontend. This option can be used multiple +times to specify multiple alternative services. +Example: \fI\%\-\-altsvc\fP=h2,443 .UNINDENT .INDENT 0.0 .TP diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index efacbb44..ad3f915a 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -608,10 +608,10 @@ HTTP Specify protocol ID, port, host and origin of alternative service. and are optional. - They are advertised in alt-svc header field or HTTP/2 - ALTSVC frame. This option can be used multiple times to - specify multiple alternative services. Example: - :option:`--altsvc`\=h2,443 + They are advertised in alt-svc header field only in + HTTP/1.1 frontend. This option can be used multiple + times to specify multiple alternative services. + Example: :option:`--altsvc`\=h2,443 .. option:: --add-response-header=