Mercurial > hg > nginx-site

diff xml/en/docs/http/ngx_http_core_module.xml @ 1826:da6a3e401b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Slightly reformatted the error_page description. Information about directives inheritance was moved to the end. Blocks describing various syntaxes of the "uri" argument were put in the following order: - internal redirect to the specified /uri; - internal redirect to a named location; - URL redirection.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 24 Oct 2016 11:57:46 +0300
parents ae46e57cecba
children 64e2b8c5200d
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Mon Oct 24 11:49:51 2016 +0300
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Mon Oct 24 11:57:46 2016 +0300
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="61">
+        rev="62">
 
 <section id="directives" name="Directives">
 
@@ -611,10 +611,7 @@
 
 <para>
 Defines the URI that will be shown for the specified errors.
-<literal>error_page</literal> directives are inherited from the previous
-level only if there are no <literal>error_page</literal>
-directives defined on the current level.
-A <literal>uri</literal> value can contain variables.
+A <value>uri</value> value can contain variables.
 </para>
 
 <para>
@@ -644,17 +641,6 @@
 </para>
 
 <para>
-It is also possible to use redirects for error processing:
-<example>
-error_page 403      http://example.com/forbidden.html;
-error_page 404 =301 http://example.com/notfound.html;
-</example>
-In this case, by default, the response code 302 is returned to the client.
-It can only be changed to one of the redirect status
-codes (301, 302, 303, and 307).
-</para>
-
-<para>
 If there is no need to change URI during internal redirection it is
 possible to pass error processing into a named location:
 <example>
@@ -670,11 +656,29 @@
 
 <para>
 <note>
-If <literal>uri</literal> processing leads to an error,
+If <value>uri</value> processing leads to an error,
 the status code of the last occurred error is returned to the client.
 </note>
 </para>
 
+<para>
+It is also possible to use URL redirects for error processing:
+<example>
+error_page 403      http://example.com/forbidden.html;
+error_page 404 =301 http://example.com/notfound.html;
+</example>
+In this case, by default, the response code 302 is returned to the client.
+It can only be changed to one of the redirect status
+codes (301, 302, 303, and 307).
+</para>
+
+<para>
+These directives are inherited from the previous level if and
+only if there are no
+<literal>error_page</literal>
+directives defined on the current level.
+</para>
+
 </directive>