Mercurial > hg > nginx-site
changeset 102:c76a257f3fd4
The directive name is now automatically printed in <default> and <syntax>.
Specifying <default> is made non-optional.
Visible changes:
- "types" and "proxy_set_header" get proper defaults (not yet displayed
nicely);
- "fastcgi_hide_header", "fastcgi_ignore_headers", "fastcgi_pass_header",
"proxy_hide_header", "proxy_ignore_headers", and "proxy_pass_header"
now have their (empty) defaults documented;
- mentions of "fastcgi_redirect_errors" and "proxy_redirect_errors" which
are long unsupported were removed.
line wrap: on
line diff
--- a/dtd/module.dtd Tue Oct 18 12:19:06 2011 +0000 +++ b/dtd/module.dtd Wed Oct 19 05:15:24 2011 +0000 @@ -12,7 +12,7 @@ id ID #IMPLIED > -<!ELEMENT directive (syntax+, default?, context*, para+) > +<!ELEMENT directive (syntax+, default+, context*, para+) > <!ATTLIST directive name ID #REQUIRED appeared-in CDATA #IMPLIED
--- a/xml/en/docs/http/ngx_http_core_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/en/docs/http/ngx_http_core_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -9,12 +9,12 @@ <section id="directives" name="Directives"> <directive name="aio" appeared-in="0.8.11"> -<syntax>aio +<syntax> <value>on</value> | <value>off</value> | <value>sendfile</value> </syntax> -<default>aio off</default> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -132,7 +132,7 @@ <directive name="alias"> -<syntax>alias <argument>path</argument></syntax> +<syntax><argument>path</argument></syntax> <default/> <context>location</context> @@ -189,8 +189,8 @@ <directive name="client_body_buffer_size"> -<syntax>client_body_buffer_size <argument>size</argument></syntax> -<default>client_body_buffer_size 8k|16k</default> +<syntax><argument>size</argument></syntax> +<default>8k|16k</default> <context>http</context> <context>server</context> <context>location</context> @@ -209,12 +209,12 @@ <directive name="client_body_in_file_only"> -<syntax>client_body_in_file_only +<syntax> <value>on</value> | <value>clean</value> | <value>off</value> </syntax> -<default>client_body_in_file_only off</default> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -244,9 +244,9 @@ <directive name="client_body_in_single_buffer"> -<syntax>client_body_in_single_buffer <value>on</value> | <value>off</value> +<syntax><value>on</value> | <value>off</value> </syntax> -<default>client_body_in_single_buffer off</default> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -263,13 +263,13 @@ <directive name="client_body_temp_path"> -<syntax>client_body_temp_path +<syntax> <argument>path</argument> [<argument>level1</argument> [<argument>level2</argument> [<argument>level3</argument>]]] </syntax> -<default>client_body_temp_path client_body_temp</default> +<default>client_body_temp</default> <context>http</context> <context>server</context> <context>location</context> @@ -292,8 +292,8 @@ <directive name="client_body_timeout"> -<syntax>client_body_timeout <argument>time</argument></syntax> -<default>client_body_timeout 60s</default> +<syntax><argument>time</argument></syntax> +<default>60s</default> <context>http</context> <context>server</context> <context>location</context> @@ -312,8 +312,8 @@ <directive name="client_header_buffer_size"> -<syntax>client_header_buffer_size <argument>size</argument></syntax> -<default>client_header_buffer_size 1k</default> +<syntax><argument>size</argument></syntax> +<default>1k</default> <context>http</context> <context>server</context> @@ -332,8 +332,8 @@ <directive name="client_header_timeout"> -<syntax>client_header_timeout <argument>time</argument></syntax> -<default>client_header_timeout 60s</default> +<syntax><argument>time</argument></syntax> +<default>60s</default> <context>http</context> <context>server</context> @@ -349,8 +349,8 @@ <directive name="client_max_body_size"> -<syntax>client_max_body_size <argument>size</argument></syntax> -<default>client_max_body_size 1m</default> +<syntax><argument>size</argument></syntax> +<default>1m</default> <context>http</context> <context>server</context> <context>location</context> @@ -374,8 +374,8 @@ <directive name="default_type"> -<syntax>default_type <argument>mime-type</argument></syntax> -<default>default_type text/plain</default> +<syntax><argument>mime-type</argument></syntax> +<default>text/plain</default> <context>http</context> <context>server</context> <context>location</context> @@ -389,8 +389,8 @@ <directive name="directio" appeared-in="0.7.7"> -<syntax>directio <argument>size</argument> | <value>off</value></syntax> -<default>directio off</default> +<syntax><argument>size</argument> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -415,8 +415,8 @@ <directive name="directio_alignment" appeared-in="0.8.11"> -<syntax>directio_alignment <argument>size</argument></syntax> -<default>directio_alignment 512</default> +<syntax><argument>size</argument></syntax> +<default>512</default> <context>http</context> <context>server</context> <context>location</context> @@ -432,7 +432,7 @@ <directive name="error_page"> -<syntax>error_page +<syntax> <argument>code</argument> ... [<value>=</value>[<argument>response</argument>]] <argument>uri</argument> @@ -496,12 +496,12 @@ <directive name="if_modified_since" appeared-in="0.7.24"> -<syntax>if_modified_since +<syntax> <value>off</value> | <value>exact</value> | <value>before</value> </syntax> -<default>if_modified_since exact</default> +<default>exact</default> <context>http</context> <context>server</context> <context>location</context> @@ -539,7 +539,7 @@ <directive name="internal"> -<syntax>internal</syntax> +<syntax/> <default/> <context>location</context> @@ -588,8 +588,8 @@ <directive name="keepalive_requests" appeared-in="0.8.0"> -<syntax>keepalive_requests <argument>number</argument></syntax> -<default>keepalive_requests 100</default> +<syntax><argument>number</argument></syntax> +<default>100</default> <context>http</context> <context>server</context> <context>location</context> @@ -604,11 +604,11 @@ <directive name="keepalive_timeout"> -<syntax>keepalive_timeout +<syntax> <argument>timeout</argument> [<argument>header_timeout</argument>] </syntax> -<default>keepalive_timeout 75s</default> +<default>75s</default> <context>http</context> <context>server</context> <context>location</context> @@ -633,8 +633,8 @@ <directive name="large_client_header_buffers"> -<syntax>large_client_header_buffers <argument>number size</argument></syntax> -<default>large_client_header_buffers 4 8k</default> +<syntax><argument>number size</argument></syntax> +<default>4 8k</default> <context>http</context> <context>server</context> @@ -658,7 +658,7 @@ <directive name="limit_except"> -<syntax>limit_except <argument>method</argument> ... { ... }</syntax> +<syntax><argument>method</argument> ... { ... }</syntax> <default/> <context>location</context> @@ -701,8 +701,8 @@ <directive name="limit_rate"> -<syntax>limit_rate <argument>rate</argument></syntax> -<default>limit_rate 0</default> +<syntax><argument>rate</argument></syntax> +<default>0</default> <context>http</context> <context>server</context> <context>location</context> @@ -743,8 +743,8 @@ <directive name="limit_rate_after" appeared-in="0.8.0"> -<syntax>limit_rate_after <argument>size</argument></syntax> -<default>limit_rate_after 0</default> +<syntax><argument>size</argument></syntax> +<default>0</default> <context>http</context> <context>server</context> <context>location</context> @@ -770,7 +770,7 @@ <directive name="listen"> -<syntax>listen +<syntax> <argument>address</argument>[:<argument>port</argument>] [<parameter>default_server</parameter>] [<parameter>setfib</parameter>=<argument>number</argument>] @@ -783,7 +783,7 @@ [<parameter>ipv6only</parameter>=<value>on</value>|<value>off</value>] [<parameter>ssl</parameter>] </syntax> -<syntax>listen +<syntax> <argument>port</argument> [<parameter>default_server</parameter>] [<parameter>setfib</parameter>=<argument>number</argument>] @@ -796,7 +796,7 @@ [<parameter>ipv6only</parameter>=<value>on</value>|<value>off</value>] [<parameter>ssl</parameter>] </syntax> -<syntax>listen +<syntax> <value>unix:</value><argument>path</argument> [<parameter>default_server</parameter>] [<parameter>backlog</parameter>=<argument>number</argument>] @@ -807,7 +807,7 @@ [<parameter>bind</parameter>] [<parameter>ssl</parameter>] </syntax> -<default>listen *:80 | *:8000</default> +<default>*:80 | *:8000</default> <context>server</context> <para> @@ -986,14 +986,14 @@ <directive name="location"> -<syntax>location [ +<syntax>[ <value>=</value> | <value>~</value> | <value>~*</value> | <value>^~</value> ] <argument>uri</argument> { ... }</syntax> -<syntax>location <value>@</value><argument>name</argument> { ... }</syntax> +<syntax><value>@</value><argument>name</argument> { ... }</syntax> <default/> <context>server</context> <context>location</context> @@ -1096,8 +1096,8 @@ <directive name="log_not_found"> -<syntax>log_not_found <value>on</value> | <value>off</value></syntax> -<default>log_not_found on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> <context>location</context> @@ -1111,8 +1111,8 @@ <directive name="log_subrequest"> -<syntax>log_subrequest <value>on</value> | <value>off</value></syntax> -<default>log_subrequest off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1126,8 +1126,8 @@ <directive name="merge_slashes"> -<syntax>merge_slashes <value>on</value> | <value>off</value></syntax> -<default>merge_slashes on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> @@ -1167,8 +1167,8 @@ <directive name="msie_padding"> -<syntax>msie_padding <value>on</value> | <value>off</value></syntax> -<default>msie_padding on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> <context>location</context> @@ -1182,8 +1182,8 @@ <directive name="msie_refresh"> -<syntax>msie_refresh <value>on</value> | <value>off</value></syntax> -<default>msie_refresh off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1196,12 +1196,12 @@ <directive name="open_file_cache"> -<syntax>open_file_cache <value>off</value></syntax> -<syntax>open_file_cache +<syntax><value>off</value></syntax> +<syntax> <parameter>max</parameter>=<argument>N</argument> [<parameter>inactive</parameter>=<argument>time</argument>] </syntax> -<default>open_file_cache off</default> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1277,8 +1277,8 @@ <directive name="open_file_cache_errors"> -<syntax>open_file_cache_errors <value>on</value> | <value>off</value></syntax> -<default>open_file_cache_errors off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1294,8 +1294,8 @@ <!-- <directive name="open_file_cache_events"> -<syntax>open_file_cache_events <value>on</value> | <value>off</value></syntax> -<default>open_file_cache_events off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1319,8 +1319,8 @@ <directive name="open_file_cache_min_uses"> -<syntax>open_file_cache_min_uses <argument>number</argument></syntax> -<default>open_file_cache_min_uses 1</default> +<syntax><argument>number</argument></syntax> +<default>1</default> <context>http</context> <context>server</context> <context>location</context> @@ -1336,8 +1336,8 @@ <directive name="open_file_cache_valid"> -<syntax>open_file_cache_valid <argument>time</argument></syntax> -<default>open_file_cache_valid 60s</default> +<syntax><argument>time</argument></syntax> +<default>60s</default> <context>http</context> <context>server</context> <context>location</context> @@ -1358,8 +1358,8 @@ <directive name="optimize_server_names"> -<syntax>optimize_server_names <value>on</value> | <value>off</value></syntax> -<default>optimize_server_names off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> @@ -1386,8 +1386,8 @@ <directive name="port_in_redirect"> -<syntax>port_in_redirect <value>on</value> | <value>off</value></syntax> -<default>port_in_redirect on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> <context>location</context> @@ -1400,8 +1400,8 @@ <directive name="read_ahead"> -<syntax>read_ahead <argument>size</argument></syntax> -<default>read_ahead 0</default> +<syntax><argument>size</argument></syntax> +<default>0</default> <context>http</context> <context>server</context> <context>location</context> @@ -1428,8 +1428,8 @@ <directive name="recursive_error_pages"> -<syntax>recursive_error_pages <value>on</value> | <value>off</value></syntax> -<default>recursive_error_pages off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1444,9 +1444,9 @@ <directive name="reset_timedout_connection"> -<syntax>reset_timedout_connection +<syntax> <value>on</value> | <value>off</value></syntax> -<default>reset_timedout_connection off</default> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1471,7 +1471,7 @@ <directive name="resolver"> -<syntax>resolver <argument>address</argument></syntax> +<syntax><argument>address</argument></syntax> <default/> <context>http</context> <context>server</context> @@ -1490,8 +1490,8 @@ <directive name="resolver_timeout"> -<syntax>resolver_timeout <argument>time</argument></syntax> -<default>resolver_timeout 30s</default> +<syntax><argument>time</argument></syntax> +<default>30s</default> <context>http</context> <context>server</context> <context>location</context> @@ -1507,8 +1507,8 @@ <directive name="root"> -<syntax>root <argument>path</argument></syntax> -<default>root html</default> +<syntax><argument>path</argument></syntax> +<default>html</default> <context>http</context> <context>server</context> <context>location</context> @@ -1543,8 +1543,8 @@ <directive name="satisfy"> -<syntax>satisfy <value>all</value> | <value>any</value></syntax> -<default>satisfy all</default> +<syntax><value>all</value> | <value>any</value></syntax> +<default>all</default> <context>http</context> <context>server</context> <context>location</context> @@ -1571,8 +1571,8 @@ <directive name="satisfy_any"> -<syntax>satisfy_any <value>on</value> | <value>off</value></syntax> -<default>satisfy_any off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1586,8 +1586,8 @@ <directive name="send_timeout"> -<syntax>send_timeout <argument>time</argument></syntax> -<default>send_timeout 60s</default> +<syntax><argument>time</argument></syntax> +<default>60s</default> <context>http</context> <context>server</context> <context>location</context> @@ -1605,8 +1605,8 @@ <directive name="sendfile"> -<syntax>sendfile <value>on</value> | <value>off</value></syntax> -<default>sendfile off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1621,7 +1621,7 @@ <directive name="server"> -<syntax>server { ... }</syntax> +<syntax>{ ... }</syntax> <default/> <context>http</context> @@ -1642,8 +1642,8 @@ <directive name="server_name"> -<syntax>server_name <argument>name</argument> ...</syntax> -<default>server_name ""</default> +<syntax><argument>name</argument> ...</syntax> +<default>""</default> <context>server</context> <para> @@ -1776,8 +1776,8 @@ <directive name="server_name_in_redirect"> -<syntax>server_name_in_redirect <value>on</value> | <value>off</value></syntax> -<default>server_name_in_redirect off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1795,8 +1795,8 @@ <directive name="server_names_hash_bucket_size"> -<syntax>server_names_hash_bucket_size <argument>size</argument></syntax> -<default>server_names_hash_bucket_size 32|64|128</default> +<syntax><argument>size</argument></syntax> +<default>32|64|128</default> <context>http</context> <para> @@ -1810,8 +1810,8 @@ <directive name="server_names_hash_max_size"> -<syntax>server_names_hash_max_size <argument>size</argument></syntax> -<default>server_names_hash_max_size 512</default> +<syntax><argument>size</argument></syntax> +<default>512</default> <context>http</context> <para> @@ -1824,8 +1824,8 @@ <directive name="server_tokens"> -<syntax>server_tokens <value>on</value> | <value>off</value></syntax> -<default>server_tokens on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> <context>location</context> @@ -1839,8 +1839,8 @@ <directive name="tcp_nodelay"> -<syntax>tcp_nodelay <value>on</value> | <value>off</value></syntax> -<default>tcp_nodelay on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>http</context> <context>server</context> <context>location</context> @@ -1855,8 +1855,8 @@ <directive name="tcp_nopush"> -<syntax>tcp_nopush <value>on</value> | <value>off</value></syntax> -<default>tcp_nopush off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> <context>location</context> @@ -1885,11 +1885,11 @@ <directive name="try_files"> -<syntax>try_files +<syntax> <argument>file</argument> ... <argument>uri</argument> </syntax> -<syntax>try_files +<syntax> <argument>file</argument> ... =<argument>code</argument> </syntax> @@ -2016,8 +2016,14 @@ <directive name="types"> -<syntax>types { ... }</syntax> -<default>see below</default> +<syntax>{ ... }</syntax> +<default> +{ + text/html html; + image/gif gif; + image/jpeg jpg; +} +</default> <context>http</context> <context>server</context> <context>location</context> @@ -2025,14 +2031,6 @@ <para> Maps file name extensions to MIME types of responses. Several extensions can map to one type. -The following mappings are configured by default: -<example> -types { - text/html html; - image/gif gif; - image/jpeg jpg; -} -</example> </para> <para> @@ -2056,8 +2054,8 @@ <directive name="types_hash_bucket_size"> -<syntax>types_hash_bucket_size <argument>size</argument></syntax> -<default>types_hash_bucket_size 32|64|128</default> +<syntax><argument>size</argument></syntax> +<default>32|64|128</default> <context>http</context> <context>server</context> <context>location</context> @@ -2073,8 +2071,8 @@ <directive name="types_hash_max_size"> -<syntax>types_hash_max_size <argument>size</argument></syntax> -<default>types_hash_max_size 1024</default> +<syntax><argument>size</argument></syntax> +<default>1024</default> <context>http</context> <context>server</context> <context>location</context> @@ -2089,8 +2087,8 @@ <directive name="underscores_in_headers"> -<syntax>underscores_in_headers <value>on</value> | <value>off</value></syntax> -<default>underscores_in_headers off</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>off</default> <context>http</context> <context>server</context> @@ -2102,8 +2100,8 @@ <directive name="variables_hash_bucket_size"> -<syntax>variables_hash_bucket_size <argument>size</argument></syntax> -<default>variables_hash_bucket_size 64</default> +<syntax><argument>size</argument></syntax> +<default>64</default> <context>http</context> <para> @@ -2116,8 +2114,8 @@ <directive name="variables_hash_max_size"> -<syntax>variables_hash_max_size <argument>size</argument></syntax> -<default>variables_hash_max_size 512</default> +<syntax><argument>size</argument></syntax> +<default>512</default> <context>http</context> <para>
--- a/xml/en/docs/http/ngx_http_mp4_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/en/docs/http/ngx_http_mp4_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -110,7 +110,7 @@ <section id="directives" name="Directives"> <directive name="mp4"> -<syntax>mp4</syntax> +<syntax/> <default/> <context>location</context> @@ -122,8 +122,8 @@ <directive name="mp4_buffer_size"> -<syntax>mp4_buffer_size <argument>size</argument></syntax> -<default>mp4_buffer_size 512K</default> +<syntax><argument>size</argument></syntax> +<default>512K</default> <context>http</context> <context>server</context> <context>location</context> @@ -136,8 +136,8 @@ <directive name="mp4_max_buffer_size"> -<syntax>mp4_max_buffer_size <argument>size</argument></syntax> -<default>mp4_max_buffer_size 10M</default> +<syntax><argument>size</argument></syntax> +<default>10M</default> <context>http</context> <context>server</context> <context>location</context>
--- a/xml/en/docs/ngx_core_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/en/docs/ngx_core_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -30,8 +30,8 @@ <section id="directives" name="Directives"> <directive name="daemon"> -<syntax>daemon <value>on</value> | <value>off</value></syntax> -<default>daemon on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>main</context> <para> @@ -43,8 +43,8 @@ <directive name="env"> -<syntax>env <argument>VAR</argument>[=<argument>VALUE</argument>]</syntax> -<default>env TZ</default> +<syntax><argument>VAR</argument>[=<argument>VALUE</argument>]</syntax> +<default>TZ</default> <context>main</context> <para> @@ -95,7 +95,7 @@ </directive> <directive name="include"> -<syntax>include <argument>file</argument> | <argument>mask</argument></syntax> +<syntax><argument>file</argument> | <argument>mask</argument></syntax> <default/> <context/> @@ -118,8 +118,8 @@ <directive name="master_process"> -<syntax>master_process <value>on</value> | <value>off</value></syntax> -<default>master_process on</default> +<syntax><value>on</value> | <value>off</value></syntax> +<default>on</default> <context>main</context> <para> @@ -131,8 +131,8 @@ <directive name="pid"> -<syntax>pid <argument>file</argument></syntax> -<default>pid nginx.pid</default> +<syntax><argument>file</argument></syntax> +<default>nginx.pid</default> <context>main</context> <para> @@ -143,7 +143,7 @@ <directive name="ssl_engine"> -<syntax>ssl_engine <argument>device</argument></syntax> +<syntax><argument>device</argument></syntax> <default/> <context>main</context> @@ -155,7 +155,7 @@ <directive name="timer_resolution"> -<syntax>timer_resolution <argument>interval</argument></syntax> +<syntax><argument>interval</argument></syntax> <default/> <context>main</context> @@ -198,8 +198,8 @@ <directive name="user"> -<syntax>user <argument>user</argument> [<argument>group</argument>]</syntax> -<default>user nobody nobody</default> +<syntax><argument>user</argument> [<argument>group</argument>]</syntax> +<default>nobody nobody</default> <context>main</context> <para> @@ -213,8 +213,8 @@ <directive name="worker_priority"> -<syntax>worker_priority <argument>number</argument></syntax> -<default>worker_priority 0</default> +<syntax><argument>number</argument></syntax> +<default>0</default> <context>main</context> <para> @@ -236,8 +236,8 @@ <directive name="worker_processes"> -<syntax>worker_processes <argument>number</argument></syntax> -<default>worker_processes 1</default> +<syntax><argument>number</argument></syntax> +<default>1</default> <context>main</context> <para> @@ -248,7 +248,7 @@ <directive name="worker_rlimit_core"> -<syntax>worker_rlimit_core <argument>size</argument></syntax> +<syntax><argument>size</argument></syntax> <default/> <context>main</context> @@ -262,7 +262,7 @@ <directive name="worker_rlimit_nofile"> -<syntax>worker_rlimit_nofile <argument>number</argument></syntax> +<syntax><argument>number</argument></syntax> <default/> <context>main</context> @@ -276,7 +276,7 @@ <directive name="working_directory"> -<syntax>working_directory <argument>directory</argument></syntax> +<syntax><argument>directory</argument></syntax> <default/> <context>main</context>
--- a/xml/ru/docs/http/ngx_http_access_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_access_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -44,7 +44,7 @@ <section name="Директивы" id="directives"> <directive name="allow"> -<syntax>allow <value>[адрес|CIDR|all]</value></syntax> +<syntax><value>[адрес|CIDR|all]</value></syntax> <default/> <context>http, server, location, limit_except</context> @@ -56,7 +56,7 @@ <directive name="deny"> -<syntax>deny <value>[адрес|CIDR|all]</value></syntax> +<syntax><value>[адрес|CIDR|all]</value></syntax> <default/> <context>http, server, location, limit_except</context>
--- a/xml/ru/docs/http/ngx_http_addition_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_addition_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -35,7 +35,7 @@ <section name="Директивы" id="directives"> <directive name="add_before_body"> -<syntax>add_before_body <value>uri</value></syntax> +<syntax><value>uri</value></syntax> <default/> <context>location</context> @@ -48,7 +48,7 @@ <directive name="add_after_body"> -<syntax>add_after_body <value>uri</value></syntax> +<syntax><value>uri</value></syntax> <default/> <context>location</context> @@ -61,8 +61,8 @@ <directive name="addition_types"> -<syntax>addition_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>addition_types text/html</default> +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/html</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_auth_basic_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_auth_basic_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -33,8 +33,8 @@ <section name="Директивы" id="directives"> <directive name="auth_basic"> -<syntax>auth_basic <value>[строка|off]</value></syntax> -<default>auth_basic off</default> +<syntax><value>[строка|off]</value></syntax> +<default>off</default> <context>http, server, location, limit_except</context> <para> @@ -49,7 +49,7 @@ <directive name="auth_basic_user_file"> -<syntax>auth_basic_user_file <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server, location, limit_except</context>
--- a/xml/ru/docs/http/ngx_http_autoindex_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_autoindex_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -33,8 +33,8 @@ <section name="Директивы" id="directives"> <directive name="autoindex"> -<syntax>autoindex <value>[on|off]</value></syntax> -<default>autoindex off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -45,8 +45,8 @@ <directive name="autoindex_exact_size"> -<syntax>autoindex_exact_size <value>[on|off]</value></syntax> -<default>autoindex_exact_size on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -60,8 +60,8 @@ <directive name="autoindex_localtime"> -<syntax>autoindex_localtime <value>[on|off]</value></syntax> -<default>autoindex_localtime off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_browser_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_browser_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -75,7 +75,7 @@ <section name="Директивы" id="directives"> <directive name="ancient_browser"> -<syntax>ancient_browser <value>строка [строка ...]</value></syntax> +<syntax><value>строка [строка ...]</value></syntax> <default/> <context>http, server, location</context> @@ -90,8 +90,8 @@ <directive name="ancient_browser_value"> -<syntax>ancient_browser_value <value>строка</value></syntax> -<default>ancient_browser_value 1</default> +<syntax><value>строка</value></syntax> +<default>1</default> <context>http, server, location</context> <para> @@ -102,7 +102,7 @@ <directive name="modern_browser"> -<syntax>modern_browser <value>браузер версия|unlisted</value></syntax> +<syntax><value>браузер версия|unlisted</value></syntax> <default/> <context>http, server, location</context> @@ -129,8 +129,8 @@ <directive name="modern_browser_value"> -<syntax>modern_browser_value <value>строка</value></syntax> -<default>modern_browser_value 1</default> +<syntax><value>строка</value></syntax> +<default>1</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_charset_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_charset_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -50,8 +50,8 @@ <section name="Директивы" id="directives"> <directive name="charset"> -<syntax>charset <value>кодировка|off</value></syntax> -<default>charset off</default> +<syntax><value>кодировка|off</value></syntax> +<default>off</default> <context>http, server, location, if в location</context> <para> @@ -90,7 +90,7 @@ <directive name="charset_map"> -<syntax>charset_map <value>кодировка1 кодировка2 { ... }</value></syntax> +<syntax><value>кодировка1 кодировка2 { ... }</value></syntax> <default/> <context>http</context> @@ -142,8 +142,8 @@ <directive name="charset_types"> -<syntax>charset_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>charset_types text/html text/xml text/plain text/vnd.wap.wml +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/html text/xml text/plain text/vnd.wap.wml application/x-javascript application/rss+xml. </default> <context>http, server, location</context> @@ -165,8 +165,8 @@ <directive name="override_charset"> -<syntax>override_charset <value>on|off</value></syntax> -<default>override_charset off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location, if в location</context> <para> @@ -187,7 +187,7 @@ <directive name="source_charset"> -<syntax>source_charset <value>кодировка</value></syntax> +<syntax><value>кодировка</value></syntax> <default/> <context>http, server, location, if в location</context>
--- a/xml/ru/docs/http/ngx_http_core_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_core_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -9,8 +9,8 @@ <section name="Директивы" id="directives"> <directive name="aio"> -<syntax>aio <value>[on|off|sendfile]</value></syntax> -<default>aio off</default> +<syntax><value>[on|off|sendfile]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -108,7 +108,7 @@ <directive name="alias"> -<syntax>alias <value>путь</value></syntax> +<syntax><value>путь</value></syntax> <default/> <context>location</context> @@ -157,8 +157,8 @@ <directive name="client_body_in_file_only"> -<syntax>client_body_in_file_only <value>on|clean|off</value></syntax> -<default>client_body_in_file_only off</default> +<syntax><value>on|clean|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -183,8 +183,8 @@ <directive name="client_body_in_single_buffer"> -<syntax>client_body_in_single_buffer <value>on|off</value></syntax> -<default>client_body_in_single_buffer off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -197,8 +197,8 @@ <directive name="client_body_buffer_size"> -<syntax>client_body_buffer_size <value>размер</value></syntax> -<default>client_body_buffer_size 8k/16k</default> +<syntax><value>размер</value></syntax> +<default>8k/16k</default> <context>http, server, location</context> <para> @@ -213,9 +213,9 @@ <directive name="client_body_temp_path"> -<syntax>client_body_temp_path <value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] +<syntax><value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] </value></syntax> -<default>client_body_temp_path client_body_temp</default> +<default>client_body_temp</default> <context>http, server, location</context> <para> @@ -236,8 +236,8 @@ <directive name="client_body_timeout"> -<syntax>client_body_timeout <value>время</value></syntax> -<default>client_body_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -252,8 +252,8 @@ <directive name="client_header_buffer_size"> -<syntax>client_header_buffer_size <value>размер</value></syntax> -<default>client_header_buffer_size 1k</default> +<syntax><value>размер</value></syntax> +<default>1k</default> <context>http, server</context> <para> @@ -270,8 +270,8 @@ <directive name="client_header_timeout"> -<syntax>client_header_timeout <value>время</value></syntax> -<default>client_header_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server</context> <para> @@ -284,8 +284,8 @@ <directive name="client_max_body_size"> -<syntax>client_max_body_size <value>размер</value></syntax> -<default>client_max_body_size 1m</default> +<syntax><value>размер</value></syntax> +<default>1m</default> <context>http, server, location</context> <para> @@ -301,8 +301,8 @@ <directive name="default_type"> -<syntax>default_type <value>MIME-тип</value></syntax> -<default>default_type text/plain</default> +<syntax><value>MIME-тип</value></syntax> +<default>text/plain</default> <context>http, server, location</context> <para> @@ -313,8 +313,8 @@ <directive name="directio"> -<syntax>directio <value>[размер|off]</value></syntax> -<default>directio off</default> +<syntax><value>[размер|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -334,8 +334,8 @@ <directive name="directio_alignment"> -<syntax>directio_alignment <value>размер</value></syntax> -<default>directio_alignment 512</default> +<syntax><value>размер</value></syntax> +<default>512</default> <context>http, server, location</context> <para> @@ -349,7 +349,7 @@ <directive name="error_page"> -<syntax>error_page <value>код [код ...] [=|=ответ] uri</value> +<syntax><value>код [код ...] [=|=ответ] uri</value> </syntax> <default/> <context>http, server, location, if в location</context> @@ -404,8 +404,8 @@ <directive name="if_modified_since"> -<syntax>if_modified_since <value>[off|exact|before]</value></syntax> -<default>if_modified_since exact</default> +<syntax><value>[off|exact|before]</value></syntax> +<default>exact</default> <context>http, server, location</context> <para> @@ -434,7 +434,7 @@ <directive name="internal"> -<syntax>internal</syntax> +<syntax/> <default/> <context>location</context> @@ -475,8 +475,8 @@ <directive name="keepalive_requests"> -<syntax>keepalive_requests <value>число</value></syntax> -<default>keepalive_requests 100</default> +<syntax><value>число</value></syntax> +<default>100</default> <context>http, server, location</context> <para> @@ -488,8 +488,8 @@ <directive name="keepalive_timeout"> -<syntax>keepalive_timeout <value>время [время]</value></syntax> -<default>keepalive_timeout 75</default> +<syntax><value>время [время]</value></syntax> +<default>75</default> <context>http, server, location</context> <para> @@ -505,9 +505,9 @@ <directive name="large_client_header_buffers"> -<syntax>large_client_header_buffers <value>число размер</value> +<syntax><value>число размер</value> </syntax> -<default>large_client_header_buffers 4 4k/8k</default> +<default>4 4k/8k</default> <context>http, server</context> <para> @@ -528,7 +528,7 @@ <directive name="limit_except"> -<syntax>limit_except <value>методы</value> { ... }</syntax> +<syntax><value>методы</value> { ... }</syntax> <default/> <context>location</context> @@ -553,7 +553,7 @@ <directive name="limit_rate"> -<syntax>limit_rate <value>скорость</value></syntax> +<syntax><value>скорость</value></syntax> <default/> <context>http, server, location, if в location</context> @@ -586,7 +586,7 @@ <directive name="limit_rate_after"> -<syntax>limit_rate_after <value>размер</value></syntax> +<syntax><value>размер</value></syntax> <default/> <context>http, server, location, if в location</context> @@ -606,7 +606,7 @@ <directive name="listen"> -<syntax>listen <value>адрес:порт +<syntax><value>адрес:порт [default|default_server| [backlog=число | rcvbuf=размер | @@ -617,7 +617,7 @@ ipv6only=[on|off] | ssl]] </value></syntax> -<default>listen *:80 | *:8000</default> +<default>*:80 | *:8000</default> <context>server</context> <para> @@ -733,7 +733,7 @@ <directive name="location"> -<syntax>location [<value>=|~|~*|^~|@</value>] <value>/uri/</value> +<syntax>[<value>=|~|~*|^~|@</value>] <value>/uri/</value> { ... }</syntax> <default/> <context>server</context> @@ -822,8 +822,8 @@ <directive name="log_not_found"> -<syntax>log_not_found <value>[on|off]</value></syntax> -<default>log_not_found on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -835,8 +835,8 @@ <directive name="log_subrequest"> -<syntax>log_subrequest <value>[on|off]</value></syntax> -<default>log_subrequest off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -849,8 +849,8 @@ <directive name="merge_slashes"> -<syntax>merge_slashes <value>[on|off]</value></syntax> -<default>merge_slashes on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server</context> <para> @@ -886,8 +886,8 @@ <directive name="msie_padding"> -<syntax>msie_padding <value>[on|off]</value></syntax> -<default>msie_padding on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -900,8 +900,8 @@ <directive name="msie_refresh"> -<syntax>msie_refresh <value>[on|off]</value></syntax> -<default>msie_refresh off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -913,9 +913,9 @@ <directive name="open_file_cache"> -<syntax>open_file_cache <value>max=N [inactive=время]|off</value> +<syntax><value>max=N [inactive=время]|off</value> </syntax> -<default>open_file_cache off</default> +<default>off</default> <context>http, server, location</context> <para> @@ -975,8 +975,8 @@ <directive name="open_file_cache_errors"> -<syntax>open_file_cache_errors <value>on|off</value></syntax> -<default>open_file_cache_errors off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -988,8 +988,8 @@ <directive name="open_file_cache_min_uses"> -<syntax>open_file_cache_min_uses <value>число</value></syntax> -<default>open_file_cache_min_uses 1</default> +<syntax><value>число</value></syntax> +<default>1</default> <context>http, server, location</context> <para> @@ -1003,8 +1003,8 @@ <directive name="open_file_cache_valid"> -<syntax>open_file_cache_valid <value>время</value></syntax> -<default>open_file_cache_valid 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -1017,8 +1017,8 @@ <directive name="optimize_server_names"> -<syntax>optimize_server_names <value>[on|off]</value></syntax> -<default>optimize_server_names on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server</context> <para> @@ -1040,8 +1040,8 @@ <directive name="port_in_redirect"> -<syntax>port_in_redirect <value>[on|off]</value></syntax> -<default>port_in_redirect on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -1053,8 +1053,8 @@ <directive name="read_ahead"> -<syntax>read_ahead <value>размер</value></syntax> -<default>read_ahead 0</default> +<syntax><value>размер</value></syntax> +<default>0</default> <context>http, server, location</context> <para> @@ -1076,8 +1076,8 @@ <directive name="recursive_error_pages"> -<syntax>recursive_error_pages <value>[on|off]</value></syntax> -<default>recursive_error_pages off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -1089,8 +1089,8 @@ <directive name="reset_timedout_connection"> -<syntax>reset_timedout_connection <value>[on|off]</value></syntax> -<default>reset_timedout_connection off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -1111,7 +1111,7 @@ <directive name="resolver"> -<syntax>resolver <value>адрес</value></syntax> +<syntax><value>адрес</value></syntax> <default/> <context>http, server, location</context> @@ -1126,8 +1126,8 @@ <directive name="resolver_timeout"> -<syntax>resolver_timeout <value>время</value></syntax> -<default>resolver_timeout 30s</default> +<syntax><value>время</value></syntax> +<default>30s</default> <context>http, server, location</context> <para> @@ -1141,8 +1141,8 @@ <directive name="root"> -<syntax>root <value>путь</value></syntax> -<default>root html</default> +<syntax><value>путь</value></syntax> +<default>html</default> <context>http, server, location, if в location</context> <para> @@ -1170,8 +1170,8 @@ <directive name="satisfy"> -<syntax>satisfy <value>all|any</value></syntax> -<default>satisfy all</default> +<syntax><value>all|any</value></syntax> +<default>all</default> <context>location</context> <para> @@ -1195,8 +1195,8 @@ <directive name="satisfy_any"> -<syntax>satisfy_any <value>on|off</value></syntax> -<default>satisfy_any off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>location</context> <para> @@ -1207,8 +1207,8 @@ <directive name="send_timeout"> -<syntax>send_timeout <value>время</value></syntax> -<default>send_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -1223,8 +1223,8 @@ <directive name="sendfile"> -<syntax>sendfile <value>[on|off]</value></syntax> -<default>sendfile off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -1235,7 +1235,7 @@ <directive name="server"> -<syntax>server { ... }</syntax> +<syntax>{ ... }</syntax> <default/> <context>http</context> @@ -1255,8 +1255,8 @@ <directive name="server_name"> -<syntax>server_name <value>имя [...]</value></syntax> -<default>server_name hostname</default> +<syntax><value>имя [...]</value></syntax> +<default>hostname</default> <context>server</context> <para> @@ -1381,8 +1381,8 @@ <directive name="server_name_in_redirect"> -<syntax>server_name_in_redirect <value>[on|off]</value></syntax> -<default>server_name_in_redirect on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -1398,8 +1398,8 @@ <directive name="server_names_hash_max_size"> -<syntax>server_names_hash_max_size <value>число</value></syntax> -<default>server_names_hash_max_size 512</default> +<syntax><value>число</value></syntax> +<default>512</default> <context>http</context> <para> @@ -1412,8 +1412,8 @@ <directive name="server_names_hash_bucket_size"> -<syntax>server_names_hash_bucket_size <value>число</value></syntax> -<default>server_names_hash_bucket_size 32/64/128</default> +<syntax><value>число</value></syntax> +<default>32/64/128</default> <context>http</context> <para> @@ -1427,8 +1427,8 @@ <directive name="server_tokens"> -<syntax>server_tokens <value>[on|off]</value></syntax> -<default>server_tokens on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -1440,8 +1440,8 @@ <directive name="tcp_nodelay"> -<syntax>tcp_nodelay <value>[on|off]</value></syntax> -<default>tcp_nodelay on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -1453,8 +1453,8 @@ <directive name="tcp_nopush"> -<syntax>tcp_nopush <value>[on|off]</value></syntax> -<default>tcp_nopush off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -1480,7 +1480,7 @@ <directive name="try_files"> -<syntax>try_files <value>файл [файл ...] (uri|=код)</value></syntax> +<syntax><value>файл [файл ...] (uri|=код)</value></syntax> <default/> <context>location</context> @@ -1602,21 +1602,19 @@ <directive name="types"> -<syntax>types <value>{ ... }</value></syntax> -<default>see below</default> +<syntax><value>{ ... }</value></syntax> +<default> +{ + text/html html; + image/gif gif; + image/jpeg jpg; +} +</default> <context>http, server, location</context> <para> Директива задаёт соответствие расширения и MIME-типов ответов. Одному MIME-типу может соответствовать несколько расширений. -По умолчанию используется такие соответствия: -<example> -types { - text/html html; - image/gif gif; - image/jpeg jpg; -} -</example> </para> <para> @@ -1639,8 +1637,8 @@ <directive name="underscores_in_headers"> -<syntax>underscores_in_headers <value>[on|off]</value></syntax> -<default>underscores_in_headers off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server</context> <para>
--- a/xml/ru/docs/http/ngx_http_dav_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_dav_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -46,9 +46,9 @@ <section name="Директивы" id="directives"> <directive name="dav_access"> -<syntax>dav_access <value>пользователи:права [пользователи:права] ...</value> +<syntax><value>пользователи:права [пользователи:права] ...</value> </syntax> -<default>dav_access user:rw</default> +<default>user:rw</default> <context>http, server, location</context> <para> @@ -68,8 +68,8 @@ <directive name="dav_methods"> -<syntax>dav_methods <value>[off|put|delete|mkcol|copy|move] ...</value></syntax> -<default>dav_methods off</default> +<syntax><value>[off|put|delete|mkcol|copy|move] ...</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -100,8 +100,8 @@ <directive name="create_full_put_path"> -<syntax>create_full_put_path <value>on|off</value></syntax> -<default>create_full_put_path off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -115,8 +115,8 @@ <directive name="min_delete_depth"> -<syntax>min_delete_depth <value>число</value></syntax> -<default>min_delete_depth 0</default> +<syntax><value>число</value></syntax> +<default>0</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_empty_gif_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_empty_gif_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -31,7 +31,7 @@ <section name="Директивы" id="directives"> <directive name="empty_gif"> -<syntax>empty_gif</syntax> +<syntax/> <default/> <context>location</context>
--- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -39,8 +39,8 @@ <section name="Директивы" id="directives"> <directive name="fastcgi_buffer_size"> -<syntax>fastcgi_buffer_size <value>размер</value></syntax> -<default>fastcgi_buffer_size 4k/8k</default> +<syntax><value>размер</value></syntax> +<default>4k/8k</default> <context>http, server, location</context> <para> @@ -55,8 +55,8 @@ <directive name="fastcgi_buffers"> -<syntax>fastcgi_buffers <value>число размер</value></syntax> -<default>fastcgi_buffers 8 4k/8k</default> +<syntax><value>число размер</value></syntax> +<default>8 4k/8k</default> <context>http, server, location</context> <para> @@ -70,7 +70,7 @@ <directive name="fastcgi_cache"> -<syntax>fastcgi_cache <value>[зона|off]</value></syntax> +<syntax><value>[зона|off]</value></syntax> <default>off</default> <context>http, server, location</context> @@ -85,7 +85,7 @@ <directive name="fastcgi_cache_bypass"> -<syntax>fastcgi_cache_bypass <value>строка [...]</value></syntax> +<syntax><value>строка [...]</value></syntax> <default/> <context>http, server, location</context> @@ -104,7 +104,7 @@ <directive name="fastcgi_cache_key"> -<syntax>fastcgi_cache_key <value>строка</value></syntax> +<syntax><value>строка</value></syntax> <default/> <context>http, server, location</context> @@ -119,7 +119,7 @@ <directive name="fastcgi_cache_path"> -<syntax>fastcgi_cache_path <value>путь [levels=уровни] +<syntax><value>путь [levels=уровни] keys_zone=название:размер [inactive=время] [max_size=размер]</value></syntax> <default/> <context>http</context> @@ -167,8 +167,8 @@ <directive name="fastcgi_cache_min_uses"> -<syntax>fastcgi_cache_min_uses <value>число</value></syntax> -<default>fastcgi_cache_min_uses 1</default> +<syntax><value>число</value></syntax> +<default>1</default> <context>http, server, location</context> <para> @@ -180,7 +180,7 @@ <directive name="fastcgi_cache_valid"> -<syntax>fastcgi_cache_valid <value>ответ [ответ ...] время</value> +<syntax><value>ответ [ответ ...] время</value> </syntax> <default/> <context>http, server, location</context> @@ -217,10 +217,10 @@ <directive name="fastcgi_cache_use_stale"> -<syntax>fastcgi_cache_use_stale <value>[error | timeout | invalid_header +<syntax><value>[error | timeout | invalid_header | updating | http_500 | http_503 | http_404 | off] [...]</value></syntax> -<default>fastcgi_cache_use_stale off</default> +<default>off</default> <context>http, server, location</context> @@ -237,8 +237,8 @@ <directive name="fastcgi_connect_timeout"> -<syntax>fastcgi_connect_timeout <value>время</value></syntax> -<default>fastcgi_connect_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -250,7 +250,7 @@ <directive name="fastcgi_index"> -<syntax>fastcgi_index <value>имя</value></syntax> +<syntax><value>имя</value></syntax> <default/> <context>http, server, location</context> @@ -271,7 +271,8 @@ <directive name="fastcgi_hide_header"> -<syntax>fastcgi_hide_header <value>имя</value></syntax> +<syntax><value>имя</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -286,8 +287,8 @@ <directive name="fastcgi_ignore_client_abort"> -<syntax>fastcgi_ignore_client_abort <value>[on|off]</value></syntax> -<default>fastcgi_ignore_client_abort off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> @@ -300,7 +301,8 @@ <directive name="fastcgi_ignore_headers"> -<syntax>fastcgi_ignore_headers <value>имя [имя ...]</value></syntax> +<syntax><value>имя [имя ...]</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -315,8 +317,8 @@ <directive name="fastcgi_intercept_errors"> -<syntax>fastcgi_intercept_errors <value>on|off</value></syntax> -<default>fastcgi_intercept_errors off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -329,7 +331,7 @@ <directive name="fastcgi_no_cache"> -<syntax>fastcgi_no_cache <value>строка [...]</value></syntax> +<syntax><value>строка [...]</value></syntax> <default/> <context>http, server, location</context> @@ -349,10 +351,10 @@ <directive name="fastcgi_next_upstream"> -<syntax>fastcgi_next_upstream +<syntax> <value>[error|timeout|invalid_header|http_500|http_503|http_404|off]</value> </syntax> -<default>fastcgi_next_upstream error timeout</default> +<default>error timeout</default> <context>http, server, location</context> @@ -404,7 +406,7 @@ <directive name="fastcgi_param"> -<syntax>fastcgi_param <value>параметр значение</value></syntax> +<syntax><value>параметр значение</value></syntax> <default/> <context>http, server, location</context> @@ -450,7 +452,7 @@ <directive name="fastcgi_pass"> -<syntax>fastcgi_pass <value>fastcgi-server</value></syntax> +<syntax><value>fastcgi-server</value></syntax> <default/> <context>location, if в location</context> @@ -477,7 +479,8 @@ <directive name="fastcgi_pass_header"> -<syntax>fastcgi_pass_header <value>имя</value></syntax> +<syntax><value>имя</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -488,8 +491,8 @@ <directive name="fastcgi_read_timeout"> -<syntax>fastcgi_read_timeout <value>время</value></syntax> -<default>fastcgi_read_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -503,19 +506,9 @@ </directive> -<directive name="fastcgi_redirect_errors"> -<syntax>fastcgi_redirect_errors <value>on|off</value></syntax> - -<para> -Директива переименована в <link id="fastcgi_intercept_errors"/>. -</para> - -</directive> - - <directive name="fastcgi_send_timeout"> -<syntax>fastcgi_send_timeout <value>время</value></syntax> -<default>fastcgi_send_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -530,7 +523,7 @@ <directive name="fastcgi_split_path_info"> -<syntax>fastcgi_split_path_info <value>regex</value></syntax> +<syntax><value>regex</value></syntax> <default/> <context>location</context> @@ -555,8 +548,8 @@ <directive name="fastcgi_store"> -<syntax>fastcgi_store <value>on | off | строка </value></syntax> -<default>fastcgi_store off</default> +<syntax><value>on | off | строка </value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -613,9 +606,9 @@ <directive name="fastcgi_store_access"> -<syntax>fastcgi_store_access <value>пользователи:права [пользователи:права] +<syntax><value>пользователи:права [пользователи:права] ...</value></syntax> -<default>fastcgi_store_access user:rw</default> +<default>user:rw</default> <context>http, server, location</context> <para> @@ -637,9 +630,9 @@ <directive name="fastcgi_temp_path"> -<syntax>fastcgi_temp_path <value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] +<syntax><value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] </value></syntax> -<default>fastcgi_temp_path fastcgi_temp</default> +<default>fastcgi_temp</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_flv_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_flv_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -38,7 +38,7 @@ <section name="Директивы" id="directives"> <directive name="flv"> -<syntax>flv</syntax> +<syntax/> <default/> <context>location</context>
--- a/xml/ru/docs/http/ngx_http_geo_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_geo_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -35,7 +35,7 @@ <section name="Директивы" id="directives"> <directive name="geo"> -<syntax>geo <value>[$адрес] $переменная { ... }</value> +<syntax><value>[$адрес] $переменная { ... }</value> </syntax> <default/> <context>http</context>
--- a/xml/ru/docs/http/ngx_http_geoip_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_geoip_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -39,7 +39,7 @@ <section name="Директивы" id="directives"> <directive name="geoip_country"> -<syntax>geoip_country <value>база</value></syntax> +<syntax><value>база</value></syntax> <default/> <context>http</context> @@ -69,7 +69,7 @@ <directive name="geoip_city"> -<syntax>geoip_city <value>база</value></syntax> +<syntax><value>база</value></syntax> <default/> <context>http</context>
--- a/xml/ru/docs/http/ngx_http_gzip_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_gzip_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -37,8 +37,8 @@ <section name="Директивы" id="directives"> <directive name="gzip"> -<syntax>gzip <value>on|off</value></syntax> -<default>gzip off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location, if в location</context> <para> @@ -49,8 +49,8 @@ <directive name="gzip_buffers"> -<syntax>gzip_buffers <value>число размер</value></syntax> -<default>gzip_buffers 32 4k/16 8k</default> +<syntax><value>число размер</value></syntax> +<default>32 4k/16 8k</default> <context>http, server, location</context> <para> @@ -65,8 +65,8 @@ <directive name="gzip_comp_level"> -<syntax>gzip_comp_level <value>1..9</value></syntax> -<default>gzip_comp_level 1</default> +<syntax><value>1..9</value></syntax> +<default>1</default> <context>http, server, location</context> <para> @@ -77,7 +77,7 @@ <directive name="gzip_disable"> -<syntax>gzip_disable <value>regex [regex ...]</value></syntax> +<syntax><value>regex [regex ...]</value></syntax> <default/> <context>http, server, location</context> @@ -96,8 +96,8 @@ <directive name="gzip_min_length"> -<syntax>gzip_min_length <value>длина</value></syntax> -<default>gzip_min_length 20</default> +<syntax><value>длина</value></syntax> +<default>20</default> <context>http, server, location</context> <para> @@ -110,8 +110,8 @@ <directive name="gzip_http_version"> -<syntax>gzip_http_version <value>1.0|1.1</value></syntax> -<default>gzip_http_version 1.1</default> +<syntax><value>1.0|1.1</value></syntax> +<default>1.1</default> <context>http, server, location</context> <para> @@ -122,8 +122,8 @@ <directive name="gzip_proxied"> -<syntax>gzip_proxied <value>[off|expired|no-cache|no-store|private|no_last_modified|no_etag|auth|any] ...</value></syntax> -<default>gzip_proxied off</default> +<syntax><value>[off|expired|no-cache|no-store|private|no_last_modified|no_etag|auth|any] ...</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -183,8 +183,8 @@ <directive name="gzip_types"> -<syntax>gzip_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>gzip_types text/html</default> +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/html</default> <context>http, server, location</context> <para> @@ -196,8 +196,8 @@ <directive name="gzip_vary"> -<syntax>gzip_vary <value>on|off</value></syntax> -<default>gzip_vary off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_gzip_static_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_gzip_static_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -37,8 +37,8 @@ <section name="Директивы" id="directives"> <directive name="gzip_static"> -<syntax>gzip_static <value>on|off</value></syntax> -<default>gzip_static off</default> +<syntax><value>on|off</value></syntax> +<default>off</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_headers_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_headers_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -35,7 +35,7 @@ <section name="Директивы" id="directives"> <directive name="add_header"> -<syntax>add_header <value>название значение</value></syntax> +<syntax><value>название значение</value></syntax> <default/> <context>http, server, location</context> @@ -49,8 +49,8 @@ <directive name="expires"> -<syntax>expires <value>[modified]</value> <value>[время|epoch|max|off]</value></syntax> -<default>expires off</default> +<syntax><value>[modified]</value> <value>[время|epoch|max|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_image_filter_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_image_filter_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -45,7 +45,7 @@ <section name="Директивы" id="directives"> <directive name="image_filter"> -<syntax>image_filter <value>(test|size|resize ширина высота|crop ширина высота) +<syntax><value>(test|size|resize ширина высота|crop ширина высота) </value></syntax> <default/> <context>location</context> @@ -92,8 +92,8 @@ <directive name="image_filter_buffer"> -<syntax>image_filter_buffer <value>размер</value></syntax> -<default>image_filter_buffer 1M</default> +<syntax><value>размер</value></syntax> +<default>1M</default> <context>http, server, location</context> <para> @@ -104,8 +104,8 @@ <directive name="image_filter_jpeg_quality"> -<syntax>image_filter_jpeg_quality <value>[0..100]</value></syntax> -<default>image_filter_jpeg_quality 75</default> +<syntax><value>[0..100]</value></syntax> +<default>75</default> <context>http, server, location</context> <para> @@ -117,8 +117,8 @@ <directive name="image_filter_transparency"> -<syntax>image_filter_transparency <value>[on|off]</value></syntax> -<default>image_filter_transparency on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_index_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_index_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -31,9 +31,9 @@ <section name="Директивы" id="directives"> <directive name="index"> -<syntax>index <value>файл [файл ...]</value> +<syntax><value>файл [файл ...]</value> </syntax> -<default>index index.html</default> +<default>index.html</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_limit_req_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_limit_req_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -41,7 +41,7 @@ <section name="Директивы" id="directives"> <directive name="limit_req_zone"> -<syntax>limit_req_zone <value>$переменная zone=название:размер +<syntax><value>$переменная zone=название:размер rate=скорость</value></syntax> <default/> <context>http</context> @@ -79,7 +79,7 @@ </directive> <directive name="limit_req"> -<syntax>limit_req <value>zone=название burst=число [nodelay]</value> +<syntax><value>zone=название burst=число [nodelay]</value> </syntax> <default/> <context>http, server, location</context> @@ -119,8 +119,8 @@ <directive name="limit_req_log_level"> -<syntax>limit_req_log_level <value>[info|notice|warn|error]</value></syntax> -<default>limit_req_log_level error</default> +<syntax><value>[info|notice|warn|error]</value></syntax> +<default>error</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_limit_zone_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_limit_zone_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -41,7 +41,7 @@ <section name="Директивы" id="directives"> <directive name="limit_zone"> -<syntax>limit_zone <value>название $переменная размер</value></syntax> +<syntax><value>название $переменная размер</value></syntax> <default/> <context>http</context> @@ -70,7 +70,7 @@ <directive name="limit_conn"> -<syntax>limit_conn <value>зона число</value></syntax> +<syntax><value>зона число</value></syntax> <default/> <context>http, server, location</context> @@ -94,8 +94,8 @@ <directive name="limit_conn_log_level"> -<syntax>limit_conn_log_level <value>[info|notice|warn|error]</value></syntax> -<default>limit_conn_log_level error</default> +<syntax><value>[info|notice|warn|error]</value></syntax> +<default>error</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_log_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_log_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -33,9 +33,9 @@ <section name="Директивы" id="directives"> <directive name="access_log"> -<syntax>access_log <value>путь [формат [buffer=размер]]|off</value> +<syntax><value>путь [формат [buffer=размер]]|off</value> </syntax> -<default>access_log log/access.log combined</default> +<default>log/access.log combined</default> <context>http, server, location, if в location, limit_except</context> <para> @@ -93,9 +93,9 @@ <directive name="log_format"> -<syntax>log_format <value>название строка [строка ...]</value> +<syntax><value>название строка [строка ...]</value> </syntax> -<default>log_format combined "..." </default> +<default>combined "..." </default> <context>http</context> <para> @@ -165,9 +165,9 @@ <directive name="open_log_file_cache"> -<syntax>open_log_file_cache <value>max=N [inactive=время]|off</value> +<syntax><value>max=N [inactive=время]|off</value> </syntax> -<default>open_log_file_cache off</default> +<default>off</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_map_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_map_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -41,7 +41,7 @@ <section name="Директивы" id="directives"> <directive name="map"> -<syntax>map <value>$переменная1 $переменная2 { ... }</value></syntax> +<syntax><value>$переменная1 $переменная2 { ... }</value></syntax> <default/> <context>http</context> @@ -85,8 +85,8 @@ <directive name="map_hash_max_size"> -<syntax>map_hash_max_size <value>число</value></syntax> -<default>map_hash_max_size 2048</default> +<syntax><value>число</value></syntax> +<default>2048</default> <context>http</context> <para> @@ -99,8 +99,8 @@ <directive name="map_hash_bucket_size"> -<syntax>map_hash_bucket_size <value>число</value></syntax> -<default>map_hash_bucket_size 32/64/128</default> +<syntax><value>число</value></syntax> +<default>32/64/128</default> <context>http</context> <para>
--- a/xml/ru/docs/http/ngx_http_memcached_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_memcached_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -42,8 +42,8 @@ <section name="Директивы" id="directives"> <directive name="memcached_buffer_size"> -<syntax>memcached_buffer_size <value>размер</value></syntax> -<default>memcached_buffer_size 4k/8k</default> +<syntax><value>размер</value></syntax> +<default>4k/8k</default> <context>http, server, location</context> <para> @@ -56,8 +56,8 @@ <directive name="memcached_connect_timeout"> -<syntax>memcached_connect_timeout <value>время</value></syntax> -<default>memcached_connect_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -69,10 +69,8 @@ <directive name="memcached_next_upstream"> -<syntax>memcached_next_upstream -<value>[error|timeout|invalid_response|not_found|off]</value> -</syntax> -<default>memcached_next_upstream error timeout</default> +<syntax><value>[error|timeout|invalid_response|not_found|off]</value></syntax> +<default>error timeout</default> <context>http, server, location</context> <para> @@ -116,7 +114,7 @@ <directive name="memcached_pass"> -<syntax>memcached_pass <value>URL</value></syntax> +<syntax><value>URL</value></syntax> <default/> <context>location, if в location, limit_except</context> @@ -139,8 +137,8 @@ <directive name="memcached_read_timeout"> -<syntax>memcached_read_timeout <value>время</value></syntax> -<default>memcached_read_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -155,8 +153,8 @@ <directive name="memcached_send_timeout"> -<syntax>memcached_send_timeout <value>время</value></syntax> -<default>memcached_send_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_mp4_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_mp4_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -110,7 +110,7 @@ <section id="directives" name="Директивы"> <directive name="mp4"> -<syntax>mp4</syntax> +<syntax/> <default/> <context>location</context> @@ -122,8 +122,8 @@ <directive name="mp4_buffer_size"> -<syntax>mp4_buffer_size <argument>размер</argument></syntax> -<default>mp4_buffer_size 512K</default> +<syntax><argument>размер</argument></syntax> +<default>512K</default> <context>http</context> <context>server</context> <context>location</context> @@ -136,8 +136,8 @@ <directive name="mp4_max_buffer_size"> -<syntax>mp4_max_buffer_size <argument>размер</argument></syntax> -<default>mp4_max_buffer_size 10M</default> +<syntax><argument>размер</argument></syntax> +<default>10M</default> <context>http</context> <context>server</context> <context>location</context>
--- a/xml/ru/docs/http/ngx_http_perl_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_perl_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -191,7 +191,7 @@ <section name="Директивы" id="directives"> <directive name="perl"> -<syntax>perl <value>модуль::функция|'sub { ... }'</value></syntax> +<syntax><value>модуль::функция|'sub { ... }'</value></syntax> <default/> <context>location, limit_except</context> @@ -203,7 +203,7 @@ <directive name="perl_modules"> -<syntax>perl_modules <value>путь</value></syntax> +<syntax><value>путь</value></syntax> <default/> <context>http</context> @@ -215,7 +215,7 @@ <directive name="perl_require"> -<syntax>perl_require <value>модуль</value></syntax> +<syntax><value>модуль</value></syntax> <default/> <context>http</context> @@ -228,7 +228,7 @@ <directive name="perl_set"> -<syntax>perl_set <value>$переменная</value> +<syntax><value>$переменная</value> <value>модуль::функция|'sub { ... }'</value> </syntax> <default/>
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_proxy_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -33,8 +33,8 @@ <section name="Директивы" id="directives"> <directive name="proxy_buffer_size"> -<syntax>proxy_buffer_size <value>размер</value></syntax> -<default>proxy_buffer_size 4k/8k</default> +<syntax><value>размер</value></syntax> +<default>4k/8k</default> <context>http, server, location</context> <para> @@ -49,8 +49,8 @@ <directive name="proxy_buffering"> -<syntax>proxy_buffering <value>on|off</value></syntax> -<default>proxy_buffering on</default> +<syntax><value>on|off</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -72,8 +72,8 @@ <directive name="proxy_buffers"> -<syntax>proxy_buffers <value>число размер</value></syntax> -<default>proxy_buffers 8 4k/8k</default> +<syntax><value>число размер</value></syntax> +<default>8 4k/8k</default> <context>http, server, location</context> <para> @@ -87,7 +87,7 @@ <directive name="proxy_cache"> -<syntax>proxy_cache <value>[зона|off]</value></syntax> +<syntax><value>[зона|off]</value></syntax> <default>off</default> <context>http, server, location</context> @@ -102,7 +102,7 @@ <directive name="proxy_cache_bypass"> -<syntax>proxy_cache_bypass <value>строка [...]</value></syntax> +<syntax><value>строка [...]</value></syntax> <default/> <context>http, server, location</context> @@ -121,7 +121,7 @@ <directive name="proxy_cache_key"> -<syntax>proxy_cache_key <value>строка</value></syntax> +<syntax><value>строка</value></syntax> <default>$scheme$proxy_host$request_uri</default> <context>http, server, location</context> @@ -140,7 +140,7 @@ <directive name="proxy_cache_path"> -<syntax>proxy_cache_path <value>путь [levels=уровни] +<syntax><value>путь [levels=уровни] keys_zone=название:размер [inactive=время] [max_size=размер]</value></syntax> <default/> <context>http</context> @@ -188,8 +188,8 @@ <directive name="proxy_cache_min_uses"> -<syntax>proxy_cache_min_uses <value>число</value></syntax> -<default>proxy_cache_min_uses 1</default> +<syntax><value>число</value></syntax> +<default>1</default> <context>http, server, location</context> <para> @@ -201,7 +201,7 @@ <directive name="proxy_cache_valid"> -<syntax>proxy_cache_valid <value>ответ [ответ ...] время</value> +<syntax><value>ответ [ответ ...] время</value> </syntax> <default/> <context>http, server, location</context> @@ -238,10 +238,10 @@ <directive name="proxy_cache_use_stale"> -<syntax>proxy_cache_use_stale <value>[error | timeout | invalid_header +<syntax><value>[error | timeout | invalid_header | updating | http_500 | http_502 | http_503 | http_504 | http_404 | off] [...]</value></syntax> -<default>proxy_cache_use_stale off</default> +<default>off</default> <context>http, server, location</context> <para> @@ -257,8 +257,8 @@ <directive name="proxy_connect_timeout"> -<syntax>proxy_connect_timeout <value>время</value></syntax> -<default>proxy_connect_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -270,7 +270,8 @@ <directive name="proxy_hide_header"> -<syntax>proxy_hide_header <value>имя</value></syntax> +<syntax><value>имя</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -285,8 +286,8 @@ <directive name="proxy_ignore_client_abort"> -<syntax>proxy_ignore_client_abort <value>[on|off]</value></syntax> -<default>proxy_ignore_client_abort off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -298,7 +299,8 @@ <directive name="proxy_ignore_headers"> -<syntax>proxy_ignore_headers <value>имя [имя ...]</value></syntax> +<syntax><value>имя [имя ...]</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -313,8 +315,8 @@ <directive name="proxy_intercept_errors"> -<syntax>proxy_intercept_errors <value>[on|off]</value></syntax> -<default>proxy_intercept_errors off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -327,10 +329,10 @@ <directive name="proxy_next_upstream"> -<syntax>proxy_next_upstream <value>[error | timeout | invalid_header +<syntax><value>[error | timeout | invalid_header | http_500 | http_502 | http_503 | http_504 | http_404 | off] [...]</value></syntax> -<default>proxy_next_upstream error timeout</default> +<default>error timeout</default> <context>http, server, location</context> <para> @@ -389,7 +391,7 @@ <directive name="proxy_no_cache"> -<syntax>proxy_no_cache <value>строка [...]</value></syntax> +<syntax><value>строка [...]</value></syntax> <default/> <context>http, server, location</context> @@ -408,7 +410,7 @@ <directive name="proxy_pass"> -<syntax>proxy_pass <value>URL</value></syntax> +<syntax><value>URL</value></syntax> <default/> <context>location, if в location, limit_except</context> @@ -513,7 +515,8 @@ <directive name="proxy_pass_header"> -<syntax>proxy_pass_header <value>имя</value></syntax> +<syntax><value>имя</value></syntax> +<default/> <context>http, server, location</context> <para> @@ -525,9 +528,9 @@ <directive name="proxy_redirect"> -<syntax>proxy_redirect <value>[default|off|редирект замена]</value> +<syntax><value>[default|off|редирект замена]</value> </syntax> -<default>proxy_redirect default</default> +<default>default</default> <context>http, server, location</context> <para> @@ -603,8 +606,8 @@ <directive name="proxy_read_timeout"> -<syntax>proxy_read_timeout <value>время</value></syntax> -<default>proxy_read_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -618,19 +621,9 @@ </directive> -<directive name="proxy_redirect_errors"> -<syntax>proxy_redirect_errors <value>[on|off]</value></syntax> - -<para> -Директива переименована в <link id="proxy_intercept_errors"/>. -</para> - -</directive> - - <directive name="proxy_send_timeout"> -<syntax>proxy_send_timeout <value>время</value></syntax> -<default>proxy_send_timeout 60</default> +<syntax><value>время</value></syntax> +<default>60</default> <context>http, server, location</context> <para> @@ -645,8 +638,9 @@ <directive name="proxy_set_header"> -<syntax>proxy_set_header <value>заголовок значение</value></syntax> -<default>Host и Connection</default> +<syntax><value>заголовок значение</value></syntax> +<default>Host $proxy_host</default> +<default>Connection close</default> <context>http, server, location</context> <para> @@ -698,8 +692,8 @@ <directive name="proxy_ssl_session_reuse"> -<syntax>proxy_ssl_session_reuse <value>[on|off]</value></syntax> -<default>proxy_ssl_session_reuse on</default> +<syntax><value>[on|off]</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -713,8 +707,8 @@ <directive name="proxy_store"> -<syntax>proxy_store <value>on | off | строка </value></syntax> -<default>proxy_store off</default> +<syntax><value>on | off | строка </value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -790,9 +784,9 @@ <directive name="proxy_store_access"> -<syntax>proxy_store_access <value>пользователи:права [пользователи:права] +<syntax><value>пользователи:права [пользователи:права] ...</value></syntax> -<default>proxy_store_access user:rw</default> +<default>user:rw</default> <context>http, server, location</context> <para> @@ -814,9 +808,9 @@ <directive name="proxy_temp_path"> -<syntax>proxy_temp_path <value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] +<syntax><value>путь [ уровень1 [ уровень2 [ уровень3 ] ] ] </value></syntax> -<default>proxy_temp_path proxy_temp</default> +<default>proxy_temp</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_random_index_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_random_index_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -35,8 +35,8 @@ <section name="Директивы" id="directives"> <directive name="random_index"> -<syntax>random_index <value>[on|off]</value></syntax> -<default>random_index off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>location</context> <para>
--- a/xml/ru/docs/http/ngx_http_realip_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_realip_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -34,7 +34,7 @@ <section name="Директивы" id="directives"> <directive name="set_real_ip_from"> -<syntax>set_real_ip_from <value>[адрес|CIDR]</value></syntax> +<syntax><value>[адрес|CIDR]</value></syntax> <default/> <context>http, server, location</context> @@ -47,8 +47,8 @@ <directive name="real_ip_header"> -<syntax>real_ip_header <value>имя строки[X-Real-IP|X-Forwarded-For]</value></syntax> -<default>real_ip_header X-Real-IP</default> +<syntax><value>имя строки[X-Real-IP|X-Forwarded-For]</value></syntax> +<default>X-Real-IP</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_referer_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_referer_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -42,8 +42,7 @@ <section name="Директивы" id="directives"> <directive name="valid_referers"> -<syntax>valid_referers - [none|blocked|server_names|<value>строка</value>] ...</syntax> +<syntax>[none|blocked|server_names|<value>строка</value>] ...</syntax> <default/> <context>server, location</context>
--- a/xml/ru/docs/http/ngx_http_rewrite_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_rewrite_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -27,7 +27,7 @@ <section name="Директивы" id="directives"> <directive name="break"> -<syntax>break</syntax> +<syntax/> <default/> <context>server, location, if</context> @@ -50,7 +50,7 @@ <directive name="if"> -<syntax>if (<value>условие</value>) { ... }</syntax> +<syntax>(<value>условие</value>) { ... }</syntax> <default/> <context>server, location</context> @@ -136,7 +136,7 @@ <directive name="return"> -<syntax>return <value>код</value></syntax> +<syntax><value>код</value></syntax> <default/> <context>server, location, if</context> @@ -152,7 +152,7 @@ <directive name="rewrite"> -<syntax>rewrite <value>regex</value> <value>замена</value> +<syntax><value>regex</value> <value>замена</value> <value>флаг</value> </syntax> <default/> @@ -235,7 +235,7 @@ <directive name="set"> -<syntax>set <value>переменная</value> <value>значение</value> +<syntax><value>переменная</value> <value>значение</value> </syntax> <default/> <context>server, location, if</context> @@ -249,8 +249,8 @@ <directive name="uninitialized_variable_warn"> -<syntax>uninitialized_variable_warn <value>on|off</value></syntax> -<default>uninitialized_variable_warn on</default> +<syntax><value>on|off</value></syntax> +<default>on</default> <context>http, server, location, if</context> <para>
--- a/xml/ru/docs/http/ngx_http_secure_link_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_secure_link_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -39,7 +39,7 @@ <section name="Директивы" id="directives"> <directive name="secure_link_secret"> -<syntax>secure_link_secret <value>слово</value></syntax> +<syntax><value>слово</value></syntax> <default/> <context>location</context>
--- a/xml/ru/docs/http/ngx_http_split_clients_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_split_clients_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -38,7 +38,7 @@ <section name="Директивы" id="directives"> <directive name="split_clients"> -<syntax>split_clients <value>$переменная1 $переменная2 { ... }</value></syntax> +<syntax><value>$переменная1 $переменная2 { ... }</value></syntax> <default/> <context>http</context>
--- a/xml/ru/docs/http/ngx_http_ssi_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_ssi_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -34,8 +34,8 @@ <section name="Директивы" id="directives"> <directive name="ssi"> -<syntax>ssi <value>[on|off]</value></syntax> -<default>ssi off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location, if в location</context> <para> @@ -46,8 +46,8 @@ <directive name="ssi_silent_errors"> -<syntax>ssi_silent_errors <value>[on|off]</value></syntax> -<default>ssi_silent_errors off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -60,8 +60,8 @@ <directive name="ssi_types"> -<syntax>ssi_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>ssi_types text/html</default> +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/html</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_ssl_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_ssl_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -85,8 +85,8 @@ <section name="Директивы" id="directives"> <directive name="ssl"> -<syntax>ssl <value>[on|off]</value></syntax> -<default>ssl off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server</context> <para> @@ -97,7 +97,7 @@ <directive name="ssl_certificate"> -<syntax>ssl_certificate <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server</context> @@ -137,7 +137,7 @@ <directive name="ssl_certificate_key"> -<syntax>ssl_certificate_key <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server</context> @@ -150,7 +150,7 @@ <directive name="ssl_client_certificate"> -<syntax>ssl_client_certificate <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server</context> @@ -163,8 +163,8 @@ <directive name="ssl_ciphers"> -<syntax>ssl_ciphers <value>шифры</value></syntax> -<default>ssl_ciphers HIGH:!ADH:!MD5</default> +<syntax><value>шифры</value></syntax> +<default>HIGH:!ADH:!MD5</default> <context>http, server</context> <para> @@ -185,7 +185,7 @@ <directive name="ssl_crl"> -<syntax>ssl_crl <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server</context> @@ -198,7 +198,7 @@ <directive name="ssl_dhparam"> -<syntax>ssl_dhparam <value>файл</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http, server</context> @@ -210,8 +210,8 @@ <directive name="ssl_prefer_server_ciphers"> -<syntax>ssl_prefer_server_ciphers <value>[on|off]</value></syntax> -<default>ssl_prefer_server_ciphers off</default> +<syntax><value>[on|off]</value></syntax> +<default>off</default> <context>http, server</context> <para> @@ -223,8 +223,8 @@ <directive name="ssl_protocols"> -<syntax>ssl_protocols <value>[SSLv2] [SSLv3] [TLSv1]</value></syntax> -<default>ssl_protocols SSLv3 TLSv1</default> +<syntax><value>[SSLv2] [SSLv3] [TLSv1]</value></syntax> +<default>SSLv3 TLSv1</default> <context>http, server</context> <para> @@ -235,8 +235,8 @@ <directive name="ssl_verify_client"> -<syntax>ssl_verify_client <value>on|off|optional</value></syntax> -<default>ssl_verify_client off</default> +<syntax><value>on|off|optional</value></syntax> +<default>off</default> <context>http, server</context> <para> @@ -250,8 +250,8 @@ <directive name="ssl_verify_depth"> -<syntax>ssl_verify_depth <value>число</value></syntax> -<default>ssl_verify_depth 1</default> +<syntax><value>число</value></syntax> +<default>1</default> <context>http, server</context> <para> @@ -262,9 +262,9 @@ <directive name="ssl_session_cache"> -<syntax>ssl_session_cache <value>off|none|[builtin[:размер]] [shared:название:размер] +<syntax><value>off|none|[builtin[:размер]] [shared:название:размер] </value></syntax> -<default>ssl_session_cache none</default> +<default>none</default> <context>http, server</context> <para> @@ -315,8 +315,8 @@ <directive name="ssl_session_timeout"> -<syntax>ssl_session_timeout <value>время</value></syntax> -<default>ssl_session_timeout 5m</default> +<syntax><value>время</value></syntax> +<default>5m</default> <context>http, server</context> <para>
--- a/xml/ru/docs/http/ngx_http_sub_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_sub_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -36,7 +36,7 @@ <section name="Директивы" id="directives"> <directive name="sub_filter"> -<syntax>sub_filter <value>строка замена</value></syntax> +<syntax><value>строка замена</value></syntax> <default/> <context>http, server, location</context> @@ -50,8 +50,8 @@ <directive name="sub_filter_once"> -<syntax>sub_filter_once <value>on|off</value></syntax> -<default>sub_filter_once on</default> +<syntax><value>on|off</value></syntax> +<default>on</default> <context>http, server, location</context> <para> @@ -63,8 +63,8 @@ <directive name="sub_filter_types"> -<syntax>sub_filter_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>sub_filter_types text/html</default> +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/html</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_upstream.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_upstream.xml Wed Oct 19 05:15:24 2011 +0000 @@ -45,7 +45,7 @@ <section name="Директивы" id="directives"> <directive name="ip_hash"> -<syntax>ip_hash</syntax> +<syntax/> <default/> <context>upstream</context> @@ -84,7 +84,7 @@ <directive name="server"> -<syntax>server <value>название [параметры]</value></syntax> +<syntax><value>название [параметры]</value></syntax> <default/> <context>upstream</context> @@ -159,7 +159,7 @@ <directive name="upstream"> -<syntax>upstream <value>название</value> { ... }</syntax> +<syntax><value>название</value> { ... }</syntax> <default/> <context>http</context>
--- a/xml/ru/docs/http/ngx_http_userid_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_userid_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -38,8 +38,8 @@ <section name="Директивы" id="directives"> <directive name="userid"> -<syntax>userid <value>[on|v1|log||off]</value></syntax> -<default>userid off</default> +<syntax><value>[on|v1|log||off]</value></syntax> +<default>off</default> <context>http, server, location</context> <para> @@ -72,8 +72,8 @@ <directive name="userid_domain"> -<syntax>userid_domain <value>[имя|none]</value></syntax> -<default>userid_domain none</default> +<syntax><value>[имя|none]</value></syntax> +<default>none</default> <context>http, server, location</context> <para> @@ -85,7 +85,7 @@ <directive name="userid_expires"> -<syntax>userid_expires <value>[время|max]</value></syntax> +<syntax><value>[время|max]</value></syntax> <default/> <context>http, server, location</context> @@ -99,8 +99,8 @@ <directive name="userid_name"> -<syntax>userid_name <value>имя</value></syntax> -<default>userid_name uid</default> +<syntax><value>имя</value></syntax> +<default>uid</default> <context>http, server, location</context> <para> @@ -111,7 +111,7 @@ <directive name="userid_p3p"> -<syntax>userid_p3p <value>строка</value></syntax> +<syntax><value>строка</value></syntax> <default/> <context>http, server, location</context> @@ -124,8 +124,8 @@ <directive name="userid_path"> -<syntax>userid_path <value>путь</value></syntax> -<default>userid_path /</default> +<syntax><value>путь</value></syntax> +<default>/</default> <context>http, server, location</context> <para> @@ -136,8 +136,8 @@ <directive name="userid_service"> -<syntax>userid_service <value>число</value></syntax> -<default>userid_service IP-адрес сервера</default> +<syntax><value>число</value></syntax> +<default>IP-адрес сервера</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/http/ngx_http_xslt_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/http/ngx_http_xslt_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -38,7 +38,7 @@ <section name="Директивы" id="directives"> <directive name="xml_entities"> -<syntax>xml_entities <value>путь</value></syntax> +<syntax><value>путь</value></syntax> <default/> <context>http, server, location</context> @@ -59,7 +59,7 @@ <directive name="xslt_stylesheet"> -<syntax>xslt_stylesheet <value>шаблон [параметр ...]</value></syntax> +<syntax><value>шаблон [параметр ...]</value></syntax> <default/> <context>location</context> @@ -106,8 +106,8 @@ </directive> <directive name="xslt_types"> -<syntax>xslt_types <value>mime-тип [mime-тип ...]</value></syntax> -<default>xslt_types text/xml</default> +<syntax><value>mime-тип [mime-тип ...]</value></syntax> +<default>text/xml</default> <context>http, server, location</context> <para>
--- a/xml/ru/docs/ngx_core_module.xml Tue Oct 18 12:19:06 2011 +0000 +++ b/xml/ru/docs/ngx_core_module.xml Wed Oct 19 05:15:24 2011 +0000 @@ -32,8 +32,8 @@ <section name="Директивы" id="directives"> <directive name="daemon"> -<syntax>daemon <value>on|off</value></syntax> -<default>daemon on</default> +<syntax><value>on|off</value></syntax> +<default>on</default> <context>main</context> <para> @@ -45,8 +45,8 @@ <directive name="env"> -<syntax>env <value>VAR|VAR=VALUE</value></syntax> -<default>env TZ</default> +<syntax><value>VAR|VAR=VALUE</value></syntax> +<default>TZ</default> <context>main</context> <para> @@ -95,7 +95,7 @@ <directive name="include"> -<syntax>include <value>файл|маска</value></syntax> +<syntax><value>файл|маска</value></syntax> <default/> <context>везде</context> @@ -116,8 +116,8 @@ <directive name="master_process"> -<syntax>master_process <value>on|off</value></syntax> -<default>master_process on</default> +<syntax><value>on|off</value></syntax> +<default>on</default> <context>main</context> <para> @@ -129,8 +129,8 @@ <directive name="pid"> -<syntax>pid <value>файл</value></syntax> -<default>pid nginx.pid</default> +<syntax><value>файл</value></syntax> +<default>nginx.pid</default> <context>main</context> <para> @@ -141,7 +141,7 @@ <directive name="ssl_engine"> -<syntax>ssl_engine <value>устройство</value></syntax> +<syntax><value>устройство</value></syntax> <default/> <context>main</context> @@ -153,8 +153,8 @@ <directive name="user"> -<syntax>user <value>пользователь [группа]</value></syntax> -<default>user nobody nobody</default> +<syntax><value>пользователь [группа]</value></syntax> +<default>nobody nobody</default> <context>main</context> <para> @@ -167,7 +167,7 @@ <directive name="timer_resolution"> -<syntax>timer_resolution <value>время</value></syntax> +<syntax><value>время</value></syntax> <default/> <context>main</context> @@ -210,7 +210,7 @@ <directive name="worker_rlimit_core"> -<syntax>worker_rlimit_core <value>размер</value></syntax> +<syntax><value>размер</value></syntax> <default/> <context>main</context> @@ -224,7 +224,7 @@ <directive name="worker_rlimit_nofile"> -<syntax>worker_rlimit_nofile <value>число</value></syntax> +<syntax><value>число</value></syntax> <default/> <context>main</context> @@ -238,8 +238,8 @@ <directive name="worker_priority"> -<syntax>worker_priority <value>число</value></syntax> -<default>worker_priority 0</default> +<syntax><value>число</value></syntax> +<default>0</default> <context>main</context> <para> @@ -260,8 +260,8 @@ <directive name="worker_processes"> -<syntax>worker_processes <value>число</value></syntax> -<default>worker_processes 1</default> +<syntax><value>число</value></syntax> +<default>1</default> <context>main</context> <para> @@ -272,7 +272,7 @@ <directive name="working_directory"> -<syntax>working_directory <value>путь</value></syntax> +<syntax><value>путь</value></syntax> <default/> <context>main</context>
--- a/xsls/directive.xsls Tue Oct 18 12:19:06 2011 +0000 +++ b/xsls/directive.xsls Wed Oct 19 05:15:24 2011 +0000 @@ -20,18 +20,26 @@ } else { <code>       </code> } - <code> !!; </code> <br/> + <code> + !{../@name} + X:if "count(node()) != 0" { + X:text{ } !!; + } + </code> + <br/> } X:template = "default" { - <strong>default</strong>: - X:if "count(text()) = 0" { + X:if "position() = 1" { + <strong>default</strong>: + } + X:if "count(node()) = 0" { <strong> !{document(concat($XML, '/i18n.xml')) /i18n/text[@lang = $LANG]/item[@id='none']} </strong> } else { - <code> !!; </code> + <code> !{../@name} X:text{ } !!; </code> } <br/> }