Mercurial > hg > nginx-site
changeset 952:417dc982362e
Updated default for the "charset_types" directive.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Wed, 31 Jul 2013 23:46:04 +0400 |
parents | 3992b30c22f2 |
children | aded7086e84f |
files | xml/en/docs/http/ngx_http_charset_module.xml xml/ru/docs/http/ngx_http_charset_module.xml |
diffstat | 2 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_charset_module.xml +++ b/xml/en/docs/http/ngx_http_charset_module.xml @@ -10,7 +10,7 @@ <module name="Module ngx_http_charset_module" link="/en/docs/http/ngx_http_charset_module.html" lang="en" - rev="1"> + rev="2"> <section id="summary"> @@ -163,7 +163,7 @@ are provided in the distribution files < <directive name="charset_types"> <syntax><value>mime-type</value> ...</syntax> <default>text/html text/xml text/plain text/vnd.wap.wml -application/x-javascript application/rss+xml</default> +application/javascript application/rss+xml</default> <context>http</context> <context>server</context> <context>location</context> @@ -175,6 +175,13 @@ in addition to “<literal>text/html</literal>”. The special value “<literal>*</literal>” matches any MIME type (0.8.29). </para> +<para> +<note> +Until version 1.5.4, “<literal>application/x-javascript</literal>” was used +as the default MIME type instead of “<literal>application/javascript</literal>”. +</note> +</para> + </directive>
--- a/xml/ru/docs/http/ngx_http_charset_module.xml +++ b/xml/ru/docs/http/ngx_http_charset_module.xml @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_charset_module" link="/ru/docs/http/ngx_http_charset_module.html" lang="ru" - rev="1"> + rev="2"> <section id="summary"> @@ -162,7 +162,7 @@ charset_map koi8-r utf-8 { <directive name="charset_types"> <syntax><value>mime-тип</value> ...</syntax> <default>text/html text/xml text/plain text/vnd.wap.wml -application/x-javascript application/rss+xml</default> +application/javascript application/rss+xml</default> <context>http</context> <context>server</context> <context>location</context> @@ -175,6 +175,14 @@ application/x-javascript application/rss (0.8.29). </para> +<para> +<note> +До версии 1.5.4 по умолчанию вместо MIME-типа +“<literal>application/javascript</literal>” использовался +“<literal>application/x-javascript</literal>”. +</note> +</para> + </directive>