Mercurial > hg > nginx-site
changeset 351:a4fa80755eab
Consistently strip initial offset in examples.
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_access_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_access_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,12 +20,12 @@ <para> <example> - location / { - deny 192.168.1.1; - allow 192.168.1.0/24; - allow 10.1.1.0/16; - deny all; - } +location / { + deny 192.168.1.1; + allow 192.168.1.0/24; + allow 10.1.1.0/16; + deny all; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_addition_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_addition_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -23,10 +23,10 @@ <para> <example> - location / { - add_before_body /before_action; - add_after_body /after_action; - } +location / { + add_before_body /before_action; + add_after_body /after_action; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_auth_basic_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_auth_basic_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -21,10 +21,10 @@ <para> <example> - location / { - auth_basic "closed site"; - auth_basic_user_file conf/htpasswd; - } +location / { + auth_basic "closed site"; + auth_basic_user_file conf/htpasswd; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_autoindex_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_autoindex_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -23,9 +23,9 @@ <para> <example> - location / { - autoindex on; - } +location / { + autoindex on; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_browser_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_browser_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -42,34 +42,34 @@ <para> Choosing an index file: <example> - modern_browser_value "modern."; +modern_browser_value "modern."; - modern_browser msie 5.5; - modern_browser gecko 1.0.0; - modern_browser opera 9.0; - modern_browser safari 413; - modern_browser konqueror 3.0; +modern_browser msie 5.5; +modern_browser gecko 1.0.0; +modern_browser opera 9.0; +modern_browser safari 413; +modern_browser konqueror 3.0; - index index.${modern_browser}html index.html; +index index.${modern_browser}html index.html; </example> </para> <para> Redirection for old browsers: <example> - modern_browser msie 5.0; - modern_browser gecko 0.9.1; - modern_browser opera 8.0; - modern_browser safari 413; - modern_browser konqueror 3.0; +modern_browser msie 5.0; +modern_browser gecko 0.9.1; +modern_browser opera 8.0; +modern_browser safari 413; +modern_browser konqueror 3.0; - modern_browser unlisted; +modern_browser unlisted; - ancient_browser Links Lynx netscape4; +ancient_browser Links Lynx netscape4; - if ($ancient_browser) { - rewrite ^ /ancient.html; - } +if ($ancient_browser) { + rewrite ^ /ancient.html; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_charset_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_charset_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -37,10 +37,10 @@ <para> <example> - include conf/koi-win; +include conf/koi-win; - charset windows-1251; - source_charset koi8-r; +charset windows-1251; +source_charset koi8-r; </example> </para>
--- a/xml/en/docs/http/ngx_http_empty_gif_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_empty_gif_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,9 +20,9 @@ <para> <example> - location = /_.gif { - empty_gif; - } +location = /_.gif { + empty_gif; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_fastcgi_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -586,11 +586,11 @@ An address can be specified as a domain name or an address, and a port, for example, <example> - fastcgi_pass localhost:9000; +fastcgi_pass localhost:9000; </example> or as a UNIX-domain socket path: <example> - fastcgi_pass unix:/tmp/fastcgi.socket; +fastcgi_pass unix:/tmp/fastcgi.socket; </example> </para>
--- a/xml/en/docs/http/ngx_http_flv_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_flv_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -33,9 +33,9 @@ <para> <example> - location ~ \.flv$ { - flv; - } +location ~ \.flv$ { + flv; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_gzip_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_gzip_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -21,10 +21,10 @@ <para> <example> - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain application/xml; +gzip on; +gzip_min_length 1000; +gzip_proxied expired no-cache no-store private auth; +gzip_types text/plain application/xml; </example> </para>
--- a/xml/en/docs/http/ngx_http_gzip_static_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_gzip_static_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -27,8 +27,8 @@ <para> <example> - gzip_static on; - gzip_proxied expired no-cache no-store private auth; +gzip_static on; +gzip_proxied expired no-cache no-store private auth; </example> </para>
--- a/xml/en/docs/http/ngx_http_index_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_index_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,9 +20,9 @@ <para> <example> - location / { - index index.$geo.html index.html; - } +location / { + index index.$geo.html index.html; +} </example> </para> @@ -45,7 +45,7 @@ The last element of the list can be a file with an absolute path. Example: <example> - index index.$geo.html index.0.html /index.html; +index index.$geo.html index.0.html /index.html; </example> </para> @@ -54,13 +54,13 @@ is made, and request can be processed in a different location. For example, with the following configuration: <example> - location = / { - index index.html; - } +location = / { + index index.html; +} - location / { - ... - } +location / { + ... +} </example> a request of “<literal>/</literal>” will actually be processed in the second location as “<literal>/index.html</literal>”.
--- a/xml/en/docs/http/ngx_http_limit_conn_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_limit_conn_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -61,12 +61,12 @@ in reply to a request. For example, the directives <example> - limit_conn_zone $binary_remote_addr zone=addr:10m; +limit_conn_zone $binary_remote_addr zone=addr:10m; - server { - location /download/ { - limit_conn addr 1; - } +server { + location /download/ { + limit_conn addr 1; + } </example> allow for only a single connection at a time, per unique IP address. </para> @@ -78,14 +78,14 @@ of connections to the server per client IP and at the same time will limit the total number of connections to the virtual host: <example> - limit_conn_zone $binary_remote_addr zone=perip:10m; - limit_conn_zone $server_name zone=perserver:10m; +limit_conn_zone $binary_remote_addr zone=perip:10m; +limit_conn_zone $server_name zone=perserver:10m; - server { - ... - limit_conn perip 10; - limit_conn perserver 100; - } +server { + ... + limit_conn perip 10; + limit_conn perserver 100; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_limit_req_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_limit_req_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -67,11 +67,10 @@ <example> limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s; - server { - location /search/ { - limit_req zone=one burst=5; - } - +server { + location /search/ { + limit_req zone=one burst=5; + } </example> allow not more than 1 request per second at an average, with bursts not exceeding 5 requests. @@ -81,7 +80,7 @@ If delaying of excessive requests while requests are being limited is not desired, the parameter <literal>nodelay</literal> should be used: <example> - limit_req zone=one burst=5 nodelay; +limit_req zone=one burst=5 nodelay; </example> </para>
--- a/xml/en/docs/http/ngx_http_log_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_log_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,11 +20,11 @@ <para> <example> - log_format gzip '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $bytes_sent ' - '"$http_referer" "$http_user_agent" "$gzip_ratio"'; +log_format gzip '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $bytes_sent ' + '"$http_referer" "$http_user_agent" "$gzip_ratio"'; - access_log /spool/logs/nginx-access.log gzip buffer=32k; +access_log /spool/logs/nginx-access.log gzip buffer=32k; </example> </para> @@ -192,9 +192,9 @@ The configuration always includes the predefined format “<literal>combined</literal>”: <example> - log_format combined '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent"'; +log_format combined '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; </example> </para>
--- a/xml/en/docs/http/ngx_http_proxy_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_proxy_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -538,11 +538,11 @@ An address can be specified as a domain name or an address, and a port, for example, <example> - proxy_pass http://localhost:8000/uri/; +proxy_pass http://localhost:8000/uri/; </example> or as a UNIX-domain socket path: <example> - proxy_pass http://unix:/tmp/backend.socket:/uri/; +proxy_pass http://unix:/tmp/backend.socket:/uri/; </example> here a path is specified after the word “<literal>unix</literal>” and enclosed in two colons. @@ -617,11 +617,11 @@ <para> Server name, its port, and passed URI can be specified using variables: <example> - proxy_pass http://$host$uri; +proxy_pass http://$host$uri; </example> or like this: <example> - proxy_pass $request; +proxy_pass $request; </example> </para> @@ -685,7 +685,7 @@ “<literal>Location: http://localhost:8000/two/some/uri/</literal>”. The directive <example> - proxy_redirect http://localhost:8000/two/ http://frontend/one/; +proxy_redirect http://localhost:8000/two/ http://frontend/one/; </example> will rewrite this string to “<literal>Location: http://frontend/one/some/uri/</literal>”. @@ -694,7 +694,7 @@ <para> A server name may be omitted from the <value>replacement</value> string: <example> - proxy_redirect http://localhost:8000/two/ /; +proxy_redirect http://localhost:8000/two/ /; </example> then the primary server’s name and a port, if different from 80, will be substituted. @@ -724,14 +724,14 @@ <para> A <value>replacement</value> string can contain variables: <example> - proxy_redirect http://localhost:8000/ http://$host:$server_port/; +proxy_redirect http://localhost:8000/ http://$host:$server_port/; </example> </para> <para> A <value>redirect</value> can also contain (1.1.11) variables: <example> - proxy_redirect http://$proxy_host:8000/ /; +proxy_redirect http://$proxy_host:8000/ /; </example> </para> @@ -744,17 +744,17 @@ A regular expression can contain named and positional captures, and <value>replacement</value> can reference them: <example> - proxy_redirect ~^(http://[^:]+):\d+(/.+)$ $1$2; - proxy_redirect ~*/user/([^/]+)/(.+)$ http://$1.example.com/$2; +proxy_redirect ~^(http://[^:]+):\d+(/.+)$ $1$2; +proxy_redirect ~*/user/([^/]+)/(.+)$ http://$1.example.com/$2; </example> </para> <para> There could be several <literal>proxy_redirect</literal> directives: <example> - proxy_redirect default; - proxy_redirect http://localhost:8000/ /; - proxy_redirect http://www.example.com/ /; +proxy_redirect default; +proxy_redirect http://localhost:8000/ /; +proxy_redirect http://www.example.com/ /; </example> </para> @@ -762,10 +762,10 @@ The <literal>off</literal> parameter cancels all <literal>proxy_redirect</literal> directives on the current level: <example> - proxy_redirect off; - proxy_redirect default; - proxy_redirect http://localhost:8000/ /; - proxy_redirect http://www.example.com/ /; +proxy_redirect off; +proxy_redirect default; +proxy_redirect http://localhost:8000/ /; +proxy_redirect http://www.example.com/ /; </example> </para> @@ -773,7 +773,7 @@ Using this directive it is also possible to add host names to relative redirects issued by a proxied server: <example> - proxy_redirect / /; +proxy_redirect / /; </example> </para>
--- a/xml/en/docs/http/ngx_http_random_index_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_random_index_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -29,9 +29,9 @@ <para> <example> - location / { - random_index on; - } +location / { + random_index on; +} </example> </para>
--- a/xml/en/docs/http/ngx_http_realip_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/en/docs/http/ngx_http_realip_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -26,9 +26,9 @@ <para> <example> - set_real_ip_from 192.168.1.0/24; - set_real_ip_from 192.168.2.1; - real_ip_header X-Real-IP; +set_real_ip_from 192.168.1.0/24; +set_real_ip_from 192.168.2.1; +real_ip_header X-Real-IP; </example> </para>
--- a/xml/ru/docs/http/ngx_http_access_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_access_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -21,12 +21,12 @@ <para> <example> - location / { - deny 192.168.1.1; - allow 192.168.1.0/24; - allow 10.1.1.0/16; - deny all; - } +location / { + deny 192.168.1.1; + allow 192.168.1.0/24; + allow 10.1.1.0/16; + deny all; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_addition_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_addition_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -23,10 +23,10 @@ <para> <example> - location / { - add_before_body /before_action; - add_after_body /after_action; - } +location / { + add_before_body /before_action; + add_after_body /after_action; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_auth_basic_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_auth_basic_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -21,10 +21,10 @@ <para> <example> - location / { - auth_basic "closed site"; - auth_basic_user_file conf/htpasswd; - } +location / { + auth_basic "closed site"; + auth_basic_user_file conf/htpasswd; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_autoindex_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_autoindex_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -23,9 +23,9 @@ <para> <example> - location / { - autoindex on; - } +location / { + autoindex on; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_browser_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_browser_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -42,34 +42,34 @@ <para> Выбор индексного файла: <example> - modern_browser_value "modern."; +modern_browser_value "modern."; - modern_browser msie 5.5; - modern_browser gecko 1.0.0; - modern_browser opera 9.0; - modern_browser safari 413; - modern_browser konqueror 3.0; +modern_browser msie 5.5; +modern_browser gecko 1.0.0; +modern_browser opera 9.0; +modern_browser safari 413; +modern_browser konqueror 3.0; - index index.${modern_browser}html index.html; +index index.${modern_browser}html index.html; </example> </para> <para> Перенаправление для старых браузеров: <example> - modern_browser msie 5.0; - modern_browser gecko 0.9.1; - modern_browser opera 8.0; - modern_browser safari 413; - modern_browser konqueror 3.0; +modern_browser msie 5.0; +modern_browser gecko 0.9.1; +modern_browser opera 8.0; +modern_browser safari 413; +modern_browser konqueror 3.0; - modern_browser unlisted; +modern_browser unlisted; - ancient_browser Links Lynx netscape4; +ancient_browser Links Lynx netscape4; - if ($ancient_browser) { - rewrite ^ /ancient.html; - } +if ($ancient_browser) { + rewrite ^ /ancient.html; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_charset_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_charset_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -37,10 +37,10 @@ <para> <example> - include conf/koi-win; +include conf/koi-win; - charset windows-1251; - source_charset koi8-r; +charset windows-1251; +source_charset koi8-r; </example> </para>
--- a/xml/ru/docs/http/ngx_http_empty_gif_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_empty_gif_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,9 +20,9 @@ <para> <example> - location = /_.gif { - empty_gif; - } +location = /_.gif { + empty_gif; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -578,11 +578,11 @@ Задаёт адрес FastCGI-сервера. Адрес может быть указан в виде доменного имени или адреса, и порта, например, <example> - fastcgi_pass localhost:9000; +fastcgi_pass localhost:9000; </example> или в виде пути UNIX-сокета: <example> - fastcgi_pass unix:/tmp/fastcgi.socket; +fastcgi_pass unix:/tmp/fastcgi.socket; </example> </para>
--- a/xml/ru/docs/http/ngx_http_flv_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_flv_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -32,9 +32,9 @@ <para> <example> - location ~ \.flv$ { - flv; - } +location ~ \.flv$ { + flv; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_gzip_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_gzip_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -21,10 +21,10 @@ <para> <example> - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain application/xml; +gzip on; +gzip_min_length 1000; +gzip_proxied expired no-cache no-store private auth; +gzip_types text/plain application/xml; </example> </para>
--- a/xml/ru/docs/http/ngx_http_gzip_static_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_gzip_static_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -27,8 +27,8 @@ <para> <example> - gzip_static on; - gzip_proxied expired no-cache no-store private auth; +gzip_static on; +gzip_proxied expired no-cache no-store private auth; </example> </para>
--- a/xml/ru/docs/http/ngx_http_index_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_index_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,9 +20,9 @@ <para> <example> - location / { - index index.$geo.html index.html; - } +location / { + index index.$geo.html index.html; +} </example> </para> @@ -45,7 +45,7 @@ В конце списка может стоять файл с абсолютным путём. Пример: <example> - index index.$geo.html index.0.html /index.html; +index index.$geo.html index.0.html /index.html; </example> </para> @@ -55,13 +55,13 @@ location’е. Например, в такой конфигурации: <example> - location = / { - index index.html; - } +location = / { + index index.html; +} - location / { - ... - } +location / { + ... +} </example> запрос “<literal>/</literal>” будет фактически обработан во втором location’е как “<literal>/index.html</literal>”.
--- a/xml/ru/docs/http/ngx_http_limit_conn_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_limit_conn_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -60,12 +60,12 @@ <http-status code="503" text="Service Temporarily Unavailable"/>. Например, директивы <example> - limit_conn_zone $binary_remote_addr zone=addr:10m; +limit_conn_zone $binary_remote_addr zone=addr:10m; - server { - location /download/ { - limit_conn addr 1; - } +server { + location /download/ { + limit_conn addr 1; + } </example> разрешают одновременно обрабатывать не более одного соединения с одного IP-адреса. @@ -79,14 +79,14 @@ с одного клиентского IP-адреса и в то же время ограничивает общее число соединений с виртуальным хостом: <example> - limit_conn_zone $binary_remote_addr zone=perip:10m; - limit_conn_zone $server_name zone=perserver:10m; +limit_conn_zone $binary_remote_addr zone=perip:10m; +limit_conn_zone $server_name zone=perserver:10m; - server { - ... - limit_conn perip 10; - limit_conn perserver 100; - } +server { + ... + limit_conn perip 10; + limit_conn perserver 100; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_limit_req_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_limit_req_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -65,11 +65,10 @@ <example> limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s; - server { - location /search/ { - limit_req zone=one burst=5; - } - +server { + location /search/ { + limit_req zone=one burst=5; + } </example> позволяют в среднем не более 1 запроса в секунду со всплесками не более 5 запросов. @@ -79,7 +78,7 @@ Если же избыточные запросы в пределах лимита всплесков задерживать не требуется, то следует использовать параметр <literal>nodelay</literal>: <example> - limit_req zone=one burst=5 nodelay; +limit_req zone=one burst=5 nodelay; </example> </para>
--- a/xml/ru/docs/http/ngx_http_log_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_log_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -20,11 +20,11 @@ <para> <example> - log_format gzip '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $bytes_sent ' - '"$http_referer" "$http_user_agent" "$gzip_ratio"'; +log_format gzip '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $bytes_sent ' + '"$http_referer" "$http_user_agent" "$gzip_ratio"'; - access_log /spool/logs/nginx-access.log gzip buffer=32k; +access_log /spool/logs/nginx-access.log gzip buffer=32k; </example> </para> @@ -187,9 +187,9 @@ В конфигурации всегда существует предопределённый формат “<literal>combined</literal>”: <example> - log_format combined '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent"'; +log_format combined '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; </example> </para>
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_proxy_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -533,11 +533,11 @@ будет отображаться location. Адрес может быть указан в виде доменного имени или адреса, и порта, например, <example> - proxy_pass http://localhost:8000/uri/; +proxy_pass http://localhost:8000/uri/; </example> или в виде пути UNIX-сокета: <example> - proxy_pass http://unix:/tmp/backend.socket:/uri/; +proxy_pass http://unix:/tmp/backend.socket:/uri/; </example> путь указан после слова “<literal>unix</literal>” и заключён между двумя двоеточиями. @@ -613,11 +613,11 @@ Имя сервера, его порт и передаваемый URI можно также полностью задать с помощью переменных: <example> - proxy_pass http://$host$uri; +proxy_pass http://$host$uri; </example> или так: <example> - proxy_pass $request; +proxy_pass $request; </example> </para> @@ -681,7 +681,7 @@ “<literal>Location: http://localhost:8000/two/some/uri/</literal>”. Директива <example> - proxy_redirect http://localhost:8000/two/ http://frontend/one/; +proxy_redirect http://localhost:8000/two/ http://frontend/one/; </example> перепишет эту строку в виде “<literal>Location: http://frontend/one/some/uri/</literal>”. @@ -690,7 +690,7 @@ <para> В заменяемой строке можно не указывать имя сервера: <example> - proxy_redirect http://localhost:8000/two/ /; +proxy_redirect http://localhost:8000/two/ /; </example> тогда будет подставлено основное имя сервера и порт, если он отличен от 80. </para> @@ -719,7 +719,7 @@ <para> В строке <value>замена</value> можно использовать переменные: <example> - proxy_redirect http://localhost:8000/ http://$host:$server_port/; +proxy_redirect http://localhost:8000/ http://$host:$server_port/; </example> </para> @@ -727,7 +727,7 @@ В строке <value>перенаправление</value> тоже можно использовать (1.1.11) переменные: <example> - proxy_redirect http://$proxy_host:8000/ /; +proxy_redirect http://$proxy_host:8000/ /; </example> </para> @@ -740,17 +740,17 @@ Регулярное выражение может содержать именованные и позиционные выделения, а <value>замена</value> ссылаться на них: <example> - proxy_redirect ~^(http://[^:]+):\d+(/.+)$ $1$2; - proxy_redirect ~*/user/([^/]+)/(.+)$ http://$1.example.com/$2; +proxy_redirect ~^(http://[^:]+):\d+(/.+)$ $1$2; +proxy_redirect ~*/user/([^/]+)/(.+)$ http://$1.example.com/$2; </example> </para> <para> Директив <literal>proxy_redirect</literal> может быть несколько: <example> - proxy_redirect default; - proxy_redirect http://localhost:8000/ /; - proxy_redirect http://www.example.com/ /; +proxy_redirect default; +proxy_redirect http://localhost:8000/ /; +proxy_redirect http://www.example.com/ /; </example> </para> @@ -759,10 +759,10 @@ <literal>proxy_redirect</literal> на данном уровне: <example> - proxy_redirect off; - proxy_redirect default; - proxy_redirect http://localhost:8000/ /; - proxy_redirect http://www.example.com/ /; +proxy_redirect off; +proxy_redirect default; +proxy_redirect http://localhost:8000/ /; +proxy_redirect http://www.example.com/ /; </example> </para> @@ -770,7 +770,7 @@ С помощью этой директивы можно также добавлять имя хоста к относительным перенаправлениям, выдаваемым проксируемым сервером: <example> - proxy_redirect / /; +proxy_redirect / /; </example> </para>
--- a/xml/ru/docs/http/ngx_http_random_index_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_random_index_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -28,9 +28,9 @@ <para> <example> - location / { - random_index on; - } +location / { + random_index on; +} </example> </para>
--- a/xml/ru/docs/http/ngx_http_realip_module.xml Tue Jan 24 10:15:25 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_realip_module.xml Tue Jan 24 11:01:22 2012 +0000 @@ -26,9 +26,9 @@ <para> <example> - set_real_ip_from 192.168.1.0/24; - set_real_ip_from 192.168.2.1; - real_ip_header X-Real-IP; +set_real_ip_from 192.168.1.0/24; +set_real_ip_from 192.168.2.1; +real_ip_header X-Real-IP; </example> </para>