Author: ru
Date: 2012-04-12 19:35:41 +0000 (Thu, 12 Apr 2012)
New Revision: 4594
URL: http://trac.nginx.org/nginx/changeset/4594/nginx

Log:
Fixed grammar in error messages.


Modified:
trunk/src/core/nginx.c
trunk/src/core/ngx_conf_file.c
trunk/src/event/ngx_event.c
trunk/src/http/modules/ngx_http_fastcgi_module.c
trunk/src/http/modules/ngx_http_geo_module.c
trunk/src/http/modules/ngx_http_proxy_module.c
trunk/src/http/modules/ngx_http_scgi_module.c
trunk/src/http/modules/ngx_http_split_clients_module.c
trunk/src/http/modules/ngx_http_ssi_filter_module.c
trunk/src/http/modules/ngx_http_uwsgi_module.c
trunk/src/http/ngx_http_request.c
trunk/src/http/ngx_http_request_body.c

Modified: trunk/src/core/nginx.c
===================================================================
--- trunk/src/core/nginx.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/core/nginx.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -649,7 +649,7 @@
if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data) != NGX_OK) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
ngx_rename_file_n " %s back to %s failed after "
- "the try to execute the new binary process \"%s\"",
+ "an attempt to execute new binary process \"%s\"",
ccf->oldpid.data, ccf->pid.data, argv[0]);
}
}

Modified: trunk/src/core/ngx_conf_file.c
===================================================================
--- trunk/src/core/ngx_conf_file.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/core/ngx_conf_file.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -1481,7 +1481,8 @@
}

ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "value must be equal or more than %i", bounds->low);
+ "value must be equal to or greater than %i",
+ bounds->low);

return NGX_CONF_ERROR;
}

Modified: trunk/src/event/ngx_event.c
===================================================================
--- trunk/src/event/ngx_event.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/event/ngx_event.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -471,7 +471,7 @@
(ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile;

ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
- "%ui worker_connections are more than "
+ "%ui worker_connections exceed "
"open file resource limit: %i",
ecf->connections, limit);
}
@@ -489,7 +489,7 @@
}


- /* cl should be equal or bigger than cache line size */
+ /* cl should be equal to or greater than cache line size */

cl = 128;


Modified: trunk/src/http/modules/ngx_http_fastcgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_fastcgi_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_fastcgi_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -1254,7 +1254,7 @@

if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "upstream closed prematurely FastCGI stdout");
+ "upstream prematurely closed FastCGI stdout");

return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}
@@ -2198,8 +2198,8 @@

if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"fastcgi_busy_buffers_size\" must be equal or bigger than "
- "maximum of the value of \"fastcgi_buffer_size\" and "
+ "\"fastcgi_busy_buffers_size\" must be equal to or greater than "
+ "the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\"");

return NGX_CONF_ERROR;
@@ -2229,8 +2229,8 @@

if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"fastcgi_temp_file_write_size\" must be equal or bigger than "
- "maximum of the value of \"fastcgi_buffer_size\" and "
+ "\"fastcgi_temp_file_write_size\" must be equal to or greater "
+ "than the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\"");

return NGX_CONF_ERROR;
@@ -2253,8 +2253,8 @@
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_max_temp_file_size\" must be equal to zero to disable "
- "the temporary files usage or must be equal or bigger than "
- "maximum of the value of \"fastcgi_buffer_size\" and "
+ "temporary files usage or must be equal to or greater than "
+ "the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\"");

return NGX_CONF_ERROR;

Modified: trunk/src/http/modules/ngx_http_geo_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_geo_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_geo_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -566,7 +566,7 @@

if (ctx->binary_include) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "binary geo range base \"%s\" may not be mixed with usual entries",
+ "binary geo range base \"%s\" cannot be mixed with usual entries",
ctx->include_name.data);
return NGX_CONF_ERROR;
}
@@ -1195,7 +1195,7 @@

if (ctx->outside_entries) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "binary geo range base \"%s\" may not be mixed with usual entries",
+ "binary geo range base \"%s\" cannot be mixed with usual entries",
name->data);
rc = NGX_ERROR;
goto done;
@@ -1203,7 +1203,7 @@

if (ctx->binary_include) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "second binary geo range base \"%s\" may not be mixed with \"%s\"",
+ "second binary geo range base \"%s\" cannot be mixed with \"%s\"",
name->data, ctx->include_name.data);
rc = NGX_ERROR;
goto done;

Modified: trunk/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_proxy_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_proxy_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -2734,8 +2734,8 @@

if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"proxy_busy_buffers_size\" must be equal or bigger than "
- "maximum of the value of \"proxy_buffer_size\" and "
+ "\"proxy_busy_buffers_size\" must be equal to or greater than "
+ "the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\"");

return NGX_CONF_ERROR;
@@ -2765,8 +2765,8 @@

if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"proxy_temp_file_write_size\" must be equal or bigger than "
- "maximum of the value of \"proxy_buffer_size\" and "
+ "\"proxy_temp_file_write_size\" must be equal to or greater "
+ "than the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\"");

return NGX_CONF_ERROR;
@@ -2788,8 +2788,8 @@
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_max_temp_file_size\" must be equal to zero to disable "
- "the temporary files usage or must be equal or bigger than "
- "maximum of the value of \"proxy_buffer_size\" and "
+ "temporary files usage or must be equal to or greater than "
+ "the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\"");

return NGX_CONF_ERROR;
@@ -3425,11 +3425,11 @@
{
if (plcf->vars.uri.len) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"proxy_pass\" may not have URI part in "
+ "\"proxy_pass\" cannot have URI part in "
"location given by regular expression, "
"or inside named location, "
- "or inside the \"if\" statement, "
- "or inside the \"limit_except\" block");
+ "or inside \"if\" statement, "
+ "or inside \"limit_except\" block");
return NGX_CONF_ERROR;
}

@@ -3498,14 +3498,14 @@
if (ngx_strcmp(value[1].data, "default") == 0) {
if (plcf->proxy_lengths) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"proxy_redirect default\" may not be used "
+ "\"proxy_redirect default\" cannot be used "
"with \"proxy_pass\" directive with variables");
return NGX_CONF_ERROR;
}

if (plcf->url.data == NULL) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"proxy_redirect default\" must go "
+ "\"proxy_redirect default\" should be placed "
"after the \"proxy_pass\" directive");
return NGX_CONF_ERROR;
}

Modified: trunk/src/http/modules/ngx_http_scgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_scgi_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_scgi_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -1173,8 +1173,8 @@

if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"scgi_busy_buffers_size\" must be equal or bigger "
- "than maximum of the value of \"scgi_buffer_size\" and "
+ "\"scgi_busy_buffers_size\" must be equal to or greater "
+ "than the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\"");

return NGX_CONF_ERROR;
@@ -1204,8 +1204,8 @@

if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"scgi_temp_file_write_size\" must be equal or bigger than "
- "maximum of the value of \"scgi_buffer_size\" and "
+ "\"scgi_temp_file_write_size\" must be equal to or greater than "
+ "the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\"");

return NGX_CONF_ERROR;
@@ -1227,8 +1227,8 @@
&& conf->upstream.max_temp_file_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"scgi_max_temp_file_size\" must be equal to zero to disable "
- "the temporary files usage or must be equal or bigger than "
- "maximum of the value of \"scgi_buffer_size\" and "
+ "temporary files usage or must be equal to or greater than "
+ "the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\"");

return NGX_CONF_ERROR;

Modified: trunk/src/http/modules/ngx_http_split_clients_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_split_clients_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_split_clients_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -177,7 +177,7 @@
sum = part[i].percent ? sum + part[i].percent : 10000;
if (sum > 10000) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "percent sum is more than 100%%");
+ "percent total is greater than 100%%");
return NGX_CONF_ERROR;
}


Modified: trunk/src/http/modules/ngx_http_ssi_filter_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_ssi_filter_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_ssi_filter_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -2003,7 +2003,7 @@

if (set && stub) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "\"set\" and \"stub\" may not be used together "
+ "\"set\" and \"stub\" cannot be used together "
"in \"include\" SSI command");
return NGX_HTTP_SSI_ERROR;
}
@@ -2011,7 +2011,7 @@
if (wait) {
if (uri == NULL) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "\"wait\" may not be used with file=\"%V\"", file);
+ "\"wait\" cannot be used with file=\"%V\"", file);
return NGX_HTTP_SSI_ERROR;
}

@@ -2188,7 +2188,7 @@

} else {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "only one subrequest may be waited at the same time");
+ "can only wait for one subrequest at a time");
}

return NGX_OK;

Modified: trunk/src/http/modules/ngx_http_uwsgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_uwsgi_module.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/modules/ngx_http_uwsgi_module.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -1216,8 +1216,8 @@

if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"uwsgi_busy_buffers_size\" must be equal or bigger "
- "than maximum of the value of \"uwsgi_buffer_size\" and "
+ "\"uwsgi_busy_buffers_size\" must be equal to or greater "
+ "than the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\"");

return NGX_CONF_ERROR;
@@ -1247,8 +1247,8 @@

if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"uwsgi_temp_file_write_size\" must be equal or bigger than "
- "maximum of the value of \"uwsgi_buffer_size\" and "
+ "\"uwsgi_temp_file_write_size\" must be equal to or greater than "
+ "the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\"");

return NGX_CONF_ERROR;
@@ -1270,8 +1270,8 @@
&& conf->upstream.max_temp_file_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"uwsgi_max_temp_file_size\" must be equal to zero to disable "
- "the temporary files usage or must be equal or bigger than "
- "maximum of the value of \"uwsgi_buffer_size\" and "
+ "temporary files usage or must be equal to or greater than "
+ "the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\"");

return NGX_CONF_ERROR;

Modified: trunk/src/http/ngx_http_request.c
===================================================================
--- trunk/src/http/ngx_http_request.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/ngx_http_request.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -1175,7 +1175,7 @@

if (n == 0) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
- "client closed prematurely connection");
+ "client prematurely closed connection");
}

if (n == 0 || n == NGX_ERROR) {
@@ -2426,7 +2426,7 @@
}

ngx_log_error(NGX_LOG_INFO, c->log, err,
- "client closed prematurely connection");
+ "client prematurely closed connection");

ngx_http_finalize_request(r, 0);
}

Modified: trunk/src/http/ngx_http_request_body.c
===================================================================
--- trunk/src/http/ngx_http_request_body.c 2012-04-12 16:34:59 UTC (rev 4593)
+++ trunk/src/http/ngx_http_request_body.c 2012-04-12 19:35:41 UTC (rev 4594)
@@ -303,7 +303,7 @@

if (n == 0) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
- "client closed prematurely connection");
+ "client prematurely closed connection");
}

if (n == 0 || n == NGX_ERROR) {

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel