diff --git a/doc/h2load.1 b/doc/h2load.1 index 33213c75..7dd7f630 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "Jul 18, 2021" "1.44.0" "nghttp2" +.TH "H2LOAD" "1" "Jul 18, 2021" "1.45.0-DEV" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 43d1656a..14e04fa5 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "Jul 18, 2021" "1.44.0" "nghttp2" +.TH "NGHTTP" "1" "Jul 18, 2021" "1.45.0-DEV" "nghttp2" .SH NAME nghttp \- HTTP/2 client . diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index aa04f0c7..f1e1093a 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "Jul 18, 2021" "1.44.0" "nghttp2" +.TH "NGHTTPD" "1" "Jul 18, 2021" "1.45.0-DEV" "nghttp2" .SH NAME nghttpd \- HTTP/2 server . diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 0bacf4ed..42191ec2 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "Jul 18, 2021" "1.44.0" "nghttp2" +.TH "NGHTTPX" "1" "Jul 18, 2021" "1.45.0-DEV" "nghttp2" .SH NAME nghttpx \- HTTP/2 proxy . @@ -1784,15 +1784,15 @@ Error log is written to stderr by default. It can be configured using \fI\%\-\-errorlog\-file\fP\&. The format of log message is as follows: .sp - (:) + (:) .INDENT 7.0 .TP .B It is a combination of date and time when the log is written. It is in ISO 8601 format. .TP -.B -It is a master process ID. +.B +It is a main process ID. .TP .B It is a process ID which writes this log. @@ -1828,15 +1828,15 @@ SIGUSR2 .INDENT 3.5 Fork and execute nghttpx. It will execute the binary in the same path with same command\-line arguments and environment variables. As -of nghttpx version 1.20.0, the new master process sends SIGQUIT to -the original master process when it is ready to serve requests. For -the earlier versions of nghttpx, user has to send SIGQUIT to the -original master process. +of nghttpx version 1.20.0, the new main process sends SIGQUIT to the +original main process when it is ready to serve requests. For the +earlier versions of nghttpx, user has to send SIGQUIT to the +original main process. .sp The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former -is usually used to execute new binary, and the master process is -newly spawned. On the other hand, the latter just reloads -configuration file, and the same master process continues to exist. +is usually used to execute new binary, and the main process is newly +spawned. On the other hand, the latter just reloads configuration +file, and the same main process continues to exist. .UNINDENT .UNINDENT .sp @@ -1845,16 +1845,16 @@ configuration file, and the same master process continues to exist. .INDENT 3.5 nghttpx consists of multiple processes: one process for processing these signals, and another one for processing requests. The former -spawns the latter. The former is called master process, and the +spawns the latter. The former is called main process, and the latter is called worker process. If neverbleed is enabled, the worker process spawns neverbleed daemon process which does RSA key -processing. The above signal must be sent to the master process. -If the other processes received one of them, it is ignored. This +processing. The above signal must be sent to the main process. If +the other processes received one of them, it is ignored. This behaviour of these processes may change in the future release. In -other words, in the future release, the processes other than master +other words, in the future release, the processes other than main process may terminate upon the reception of these signals. Therefore these signals should not be sent to the processes other -than master process. +than main process. .UNINDENT .UNINDENT .SH SERVER PUSH diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index 42be7e83..50df24f3 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -1625,14 +1625,14 @@ Error log using :option:`--errorlog-file`. The format of log message is as follows: - (:) + (:) It is a combination of date and time when the log is written. It is in ISO 8601 format. - - It is a master process ID. + + It is a main process ID. It is a process ID which writes this log. @@ -1665,30 +1665,30 @@ SIGUSR2 Fork and execute nghttpx. It will execute the binary in the same path with same command-line arguments and environment variables. As - of nghttpx version 1.20.0, the new master process sends SIGQUIT to - the original master process when it is ready to serve requests. For - the earlier versions of nghttpx, user has to send SIGQUIT to the - original master process. + of nghttpx version 1.20.0, the new main process sends SIGQUIT to the + original main process when it is ready to serve requests. For the + earlier versions of nghttpx, user has to send SIGQUIT to the + original main process. The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former - is usually used to execute new binary, and the master process is - newly spawned. On the other hand, the latter just reloads - configuration file, and the same master process continues to exist. + is usually used to execute new binary, and the main process is newly + spawned. On the other hand, the latter just reloads configuration + file, and the same main process continues to exist. .. note:: nghttpx consists of multiple processes: one process for processing these signals, and another one for processing requests. The former - spawns the latter. The former is called master process, and the + spawns the latter. The former is called main process, and the latter is called worker process. If neverbleed is enabled, the worker process spawns neverbleed daemon process which does RSA key - processing. The above signal must be sent to the master process. - If the other processes received one of them, it is ignored. This + processing. The above signal must be sent to the main process. If + the other processes received one of them, it is ignored. This behaviour of these processes may change in the future release. In - other words, in the future release, the processes other than master + other words, in the future release, the processes other than main process may terminate upon the reception of these signals. Therefore these signals should not be sent to the processes other - than master process. + than main process. SERVER PUSH -----------