diff options
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_errno.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_file_aio_read.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c index 02994b808..faae47829 100644 --- a/src/os/unix/ngx_errno.c +++ b/src/os/unix/ngx_errno.c @@ -12,7 +12,7 @@ * The strerror() messages are copied because: * * 1) strerror() and strerror_r() functions are not Async-Signal-Safe, - * therefore, they can not be used in signal handlers; + * therefore, they cannot be used in signal handlers; * * 2) a direct sys_errlist[] array may be used instead of these functions, * but Linux linker warns about its usage: diff --git a/src/os/unix/ngx_file_aio_read.c b/src/os/unix/ngx_file_aio_read.c index 557f9de6a..49662365f 100644 --- a/src/os/unix/ngx_file_aio_read.c +++ b/src/os/unix/ngx_file_aio_read.c @@ -23,7 +23,7 @@ * kqueue EVFILT_AIO filter is level triggered only: an event repeats * until aio_return() will be called; * - * aio_cancel() can not cancel file AIO: it returns AIO_NOTCANCELED always. + * aio_cancel() cannot cancel file AIO: it returns AIO_NOTCANCELED always. */ diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 70cdb7495..039243e96 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -11,7 +11,7 @@ /* * Although FreeBSD sendfile() allows to pass a header and a trailer, - * it can not send a header with a part of the file in one packet until + * it cannot send a header with a part of the file in one packet until * FreeBSD 5.3. Besides, over the fast ethernet connection sendfile() * may send the partially filled packets, i.e. the 8 file pages may be sent * as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet, diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index ad2fc19de..08069c4b6 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -541,7 +541,7 @@ ngx_process_get_status(void) if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) { ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "%s %P exited with fatal code %d " - "and can not be respawn", + "and cannot be respawned", process, pid, WEXITSTATUS(status)); ngx_processes[i].respawn = 0; } diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 3ff0f75c6..863176fac 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -620,7 +620,8 @@ ngx_reap_children(ngx_cycle_t *cycle) == NGX_INVALID_PID) { ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, - "can not respawn %s", ngx_processes[i].name); + "could not respawn %s", + ngx_processes[i].name); continue; } |