Skip to content

Commit

Permalink
Merge branch 'misspelling' of https://github.com/syohex/nghttp2 into …
Browse files Browse the repository at this point in the history
…syohex-misspelling
  • Loading branch information
tatsuhiro-t committed Nov 9, 2015
2 parents dbbed64 + a93e001 commit 7e8dc73
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/h2load.1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/h2load.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/h2load.h2r
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/nghttp.1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/nghttp.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions doc/nghttpx.1
Original file line number Diff line number Diff line change
Expand Up @@ -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\&.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions doc/nghttpx.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`\.
Expand Down Expand Up @@ -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
Expand All @@ -1266,7 +1266,7 @@ respectively.
MRUBY EXAMPLES
~~~~~~~~~~~~~~

Modify requet path:
Modify request path:

.. code-block:: ruby
Expand Down
4 changes: 2 additions & 2 deletions doc/nghttpx.h2r
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -372,7 +372,7 @@ respectively.
MRUBY EXAMPLES
~~~~~~~~~~~~~~

Modify requet path:
Modify request path:

.. code-block:: ruby

Expand Down

0 comments on commit 7e8dc73

Please sign in to comment.