diff --git a/doc/README.rst b/doc/README.rst index 35bfe7ed..549e5506 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -22,7 +22,7 @@ starts with ``/**``. In other words, it only processes the comment block starting ``/**``. The comment block must end with ``*/``. The ``mkapiref.py`` requires that which type of the object this comment block refers to. To specify the type of the object, the next line -must contain the so-caled action keyword. Currently, the following +must contain the so-called action keyword. Currently, the following action keywords are supported: ``@function``, ``@functypedef``, ``@enum``, ``@struct`` and ``@union``. The following sections describes each action keyword. diff --git a/doc/h2load.1 b/doc/h2load.1 index 9c5633cc..04234013 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -288,7 +288,7 @@ The number of status code h2load received. .TP .B total The number of bytes received from the server "on the wire". If -requests were made via TLS, this value is the number of decrpyted +requests were made via TLS, this value is the number of decrypted bytes. .TP .B headers diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst index 0be0dff9..6087c141 100644 --- a/doc/h2load.1.rst +++ b/doc/h2load.1.rst @@ -239,7 +239,7 @@ status codes traffic total The number of bytes received from the server "on the wire". If - requests were made via TLS, this value is the number of decrpyted + requests were made via TLS, this value is the number of decrypted bytes. headers The number of response header bytes from the server without diff --git a/doc/h2load.h2r b/doc/h2load.h2r index 86e57e08..60826931 100644 --- a/doc/h2load.h2r +++ b/doc/h2load.h2r @@ -30,7 +30,7 @@ status codes traffic total The number of bytes received from the server "on the wire". If - requests were made via TLS, this value is the number of decrpyted + requests were made via TLS, this value is the number of decrypted bytes. headers The number of response header bytes from the server without diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 74c28cd3..023257a3 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -58,7 +58,7 @@ Discard downloaded data. .TP .B \-O, \-\-remote\-name Save download data in the current directory. The -filename is dereived from URI. If URI ends with \(aq\fI/\fP\(aq, +filename is derived from URI. If URI ends with \(aq\fI/\fP\(aq, \(aqindex.html\(aq is used as a filename. Not implemented yet. .UNINDENT diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index dcd3a537..c2ece836 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -36,7 +36,7 @@ OPTIONS .. option:: -O, --remote-name Save download data in the current directory. The - filename is dereived from URI. If URI ends with '*/*', + filename is derived from URI. If URI ends with '*/*', 'index.html' is used as a filename. Not implemented yet. diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index f9bad533..c5d8ab94 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -267,7 +267,7 @@ is done for each pattern group. Set maximum number of backend concurrent HTTP/1 connections per origin host. This option is meaningful when \fI\%\-s\fP option is used. The origin host is determined -by authority portion of requset URI (or :authority +by authority portion of request URI (or :authority header field for HTTP/2). To limit the number of connections per frontend for default mode, use \fI\%\-\-backend\-http1\-connections\-per\-frontend\fP\&. @@ -1377,7 +1377,7 @@ Clear all existing response header fields. Return custom response \fIbody\fP to a client. When this method is called in request phase hook, the request is not forwarded to the backend, and response phase hook for this request will -not be invoked. When this method is called in resonse phase +not be invoked. When this method is called in response phase hook, response from backend server is canceled and discarded. The status code and response header fields should be set before using this method. To set status code, use :rb:meth To @@ -1395,7 +1395,7 @@ It is an error to call this method twice for a given request. .UNINDENT .SS MRUBY EXAMPLES .sp -Modify requet path: +Modify request path: .INDENT 0.0 .INDENT 3.5 .sp diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index c932ace1..33b7b4f2 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -236,7 +236,7 @@ Performance Set maximum number of backend concurrent HTTP/1 connections per origin host. This option is meaningful when :option:`-s` option is used. The origin host is determined - by authority portion of requset URI (or :authority + by authority portion of request URI (or :authority header field for HTTP/2). To limit the number of connections per frontend for default mode, use :option:`--backend-http1-connections-per-frontend`\. @@ -1248,7 +1248,7 @@ respectively. Return custom response *body* to a client. When this method is called in request phase hook, the request is not forwarded to the backend, and response phase hook for this request will - not be invoked. When this method is called in resonse phase + not be invoked. When this method is called in response phase hook, response from backend server is canceled and discarded. The status code and response header fields should be set before using this method. To set status code, use :rb:meth To @@ -1266,7 +1266,7 @@ respectively. MRUBY EXAMPLES ~~~~~~~~~~~~~~ -Modify requet path: +Modify request path: .. code-block:: ruby diff --git a/doc/nghttpx.h2r b/doc/nghttpx.h2r index 4cacbad8..656baddb 100644 --- a/doc/nghttpx.h2r +++ b/doc/nghttpx.h2r @@ -354,7 +354,7 @@ respectively. Return custom response *body* to a client. When this method is called in request phase hook, the request is not forwarded to the backend, and response phase hook for this request will - not be invoked. When this method is called in resonse phase + not be invoked. When this method is called in response phase hook, response from backend server is canceled and discarded. The status code and response header fields should be set before using this method. To set status code, use :rb:meth To @@ -372,7 +372,7 @@ respectively. MRUBY EXAMPLES ~~~~~~~~~~~~~~ -Modify requet path: +Modify request path: .. code-block:: ruby diff --git a/src/nghttp.cc b/src/nghttp.cc index b58c5d04..625f0905 100644 --- a/src/nghttp.cc +++ b/src/nghttp.cc @@ -2398,7 +2398,7 @@ Options: Discard downloaded data. -O, --remote-name Save download data in the current directory. The - filename is dereived from URI. If URI ends with '/', + filename is derived from URI. If URI ends with '/', 'index.html' is used as a filename. Not implemented yet. -t, --timeout= diff --git a/src/shrpx.cc b/src/shrpx.cc index f95f6417..855df5f3 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -1213,7 +1213,7 @@ Performance: Set maximum number of backend concurrent HTTP/1 connections per origin host. This option is meaningful when -s option is used. The origin host is determined - by authority portion of requset URI (or :authority + by authority portion of request URI (or :authority header field for HTTP/2). To limit the number of connections per frontend for default mode, use --backend-http1-connections-per-frontend.