diff --git a/docs/dtd/module.dtd b/docs/dtd/module.dtd index 40a807e1b..0e448fa75 100644 --- a/docs/dtd/module.dtd +++ b/docs/dtd/module.dtd @@ -24,7 +24,7 @@ @@ -41,12 +41,12 @@ - + - - + diff --git a/docs/xml/http/ngx_http_core_module.xml b/docs/xml/http/ngx_http_core_module.xml index 3412e49f7..05f50da3e 100644 --- a/docs/xml/http/ngx_http_core_module.xml +++ b/docs/xml/http/ngx_http_core_module.xml @@ -202,8 +202,8 @@ This directive can be used during debugging, or when using the $request_body_file variable, or the $r->request_body_file -method of the -http_perl module. +method of the module +ngx_http_perl_module. @@ -300,8 +300,8 @@ Defines a timeout for reading client request body. A timeout is only set between two successive read operations, not for the transmission of the whole request body. If a client does not transmit anything within this time, -the error - +the client error + is returned. @@ -337,8 +337,8 @@ directive. Defines a timeout for reading client request header. If a client does not transmit the entire header within this time, -the error - +the client error + is returned. @@ -357,9 +357,9 @@ Sets the maximum allowed size of the client request body, specified in the
Content-Length
request header field. -If size is greater than the configured value, the - -error is returned to a client. +If it exceeds the configured value, the client error + +is returned. Please be aware that browsers cannot correctly display this error. @@ -539,8 +539,9 @@ request header. Specifies that a given location can only be used for internal requests. -For external requests, the -error is returned. +For external requests, the client error + +is returned. Internal requests are the following: @@ -552,15 +553,15 @@ requests redirected by the error_page directive; subrequests formed by the include virtual -command of the -http_ssi module; +command of the module +ngx_http_ssi_module; requests changed by the rewrite -directive of the -http_rewrite module. +directive of the module +ngx_http_rewrite_module. @@ -633,12 +634,13 @@ MSIE will close keep-alive connection in about 60 seconds. Sets the maximum number and size of buffers used when reading large client request headers. -A request line cannot exceed the size of one buffer, or the - -error is returned. +A request line cannot exceed the size of one buffer, or the client error + +is returned. A request header field cannot exceed the size of one buffer as well, or the - -error is returned. +client error + +is returned. Buffers are allocated only on demand. By default, the buffer size is equal to one memory page size. It is either 4K or 8K, platform dependent. @@ -658,9 +660,9 @@ into the keep-alive state, these buffers are freed. Limits allowed HTTP methods inside a location. The GET method also implies the HEAD method. Access to other methods can be limited using the -http_access +ngx_http_access_module and -http_auth_basic +ngx_http_auth_basic_module modules directives: limit_except GET { @@ -1477,8 +1479,8 @@ If a URI need to be modified, the Allows access if any of the -http_access -or http_auth_basic +ngx_http_access_module +or ngx_http_auth_basic_module modules grant access. location / { @@ -1985,8 +1987,8 @@ Enables or disables the use of underscores in client request header fields.
-The http_core module supports embedded variables with names matching -those of the Apache Server. +The module ngx_http_core_module supports embedded variables with +names matching those of the Apache Server. First of all, these are variables representing client request header fields, such as, $http_user_agent, $http_cookie, and so on. diff --git a/docs/xml/ngx_core_module.xml b/docs/xml/ngx_core_module.xml index 2afc3172d..6cd6a1ef9 100644 --- a/docs/xml/ngx_core_module.xml +++ b/docs/xml/ngx_core_module.xml @@ -4,7 +4,7 @@ -
+
@@ -25,7 +25,7 @@ events {
-
+
daemon on | off @@ -57,9 +57,8 @@ of an executable file; -use of variables by the -http_perl -module; +use of variables by the module +ngx_http_perl_module; @@ -77,9 +76,9 @@ of an executable file. -The TZ variable is always inherited and made available to the -http_perl -module, unless configured explicitly. +The TZ variable is always inherited and made available to the module +ngx_http_perl_module, +unless configured explicitly. diff --git a/docs/xsls/content.xsls b/docs/xsls/content.xsls index ddeeb8ef8..ef83c5843 100644 --- a/docs/xsls/content.xsls +++ b/docs/xsls/content.xsls @@ -34,7 +34,7 @@ X:stylesheet { X:template = "header" { !!; } - X:template = "http-error" { + X:template = "http-status" { !{@code} X:text{ (} !{@text} X:text{)} } diff --git a/docs/xsls/module.xsls b/docs/xsls/module.xsls index 79173825c..4743700bd 100644 --- a/docs/xsls/module.xsls +++ b/docs/xsls/module.xsls @@ -24,6 +24,7 @@ X:template = "/module" { +

!{@name}

!!;