From 340e48b29f49b89bf7dc562533dae1d8d2ec2cc7 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 1 Nov 2011 13:24:50 +0000 Subject: Merging r4132, r4134, r4143, r4183, r4191, r4199: Various fixes related to error messages: *) Removed old warning that suggested to use "server_name_in_redirect off" (now the default) in place of no longer supported "server_name *". *) Fixing directive name in error message if types hash size is not enough. *) Replaced "can not" with "cannot" and "could not" in a bunch of places. Fixed nearby grammar errors. *) Overhauled error messages. --- src/os/unix/ngx_file_aio_read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/os/unix/ngx_file_aio_read.c') 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. */ -- cgit v1.2.3