Mercurial > hg > nginx-site
changeset 1128:1594ed379f1f
De-i18n'ed <commercial_version/>.
Now the text of a link has to be written verbatim.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Fri, 21 Mar 2014 13:15:42 +0400 |
| parents | 948c853f5d22 |
| children | 9abeeeb61d0e |
| files | dtd/content.dtd dtd/module.dtd xml/en/docs/http/ngx_http_f4f_module.xml xml/en/docs/http/ngx_http_fastcgi_module.xml xml/en/docs/http/ngx_http_hls_module.xml xml/en/docs/http/ngx_http_log_module.xml xml/en/docs/http/ngx_http_mp4_module.xml xml/en/docs/http/ngx_http_proxy_module.xml xml/en/docs/http/ngx_http_session_log_module.xml xml/en/docs/http/ngx_http_status_module.xml xml/en/docs/http/ngx_http_upstream_module.xml xml/en/docs/ngx_core_module.xml xml/i18n.xml xml/ru/docs/http/ngx_http_fastcgi_module.xml xml/ru/docs/http/ngx_http_hls_module.xml xml/ru/docs/http/ngx_http_mp4_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml xsls/versions.xsls |
| diffstat | 19 files changed, 55 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/dtd/content.dtd +++ b/dtd/content.dtd @@ -88,7 +88,7 @@ <!ELEMENT mainline_version EMPTY > <!ELEMENT stable_version EMPTY > -<!ELEMENT commercial_version EMPTY > +<!ELEMENT commercial_version (#PCDATA) > <!ELEMENT book EMPTY > <!ATTLIST book
--- a/dtd/module.dtd +++ b/dtd/module.dtd @@ -99,4 +99,4 @@ <!ELEMENT mainline_version EMPTY > <!ELEMENT stable_version EMPTY > -<!ELEMENT commercial_version EMPTY > +<!ELEMENT commercial_version (#PCDATA) >
--- a/xml/en/docs/http/ngx_http_f4f_module.xml +++ b/xml/en/docs/http/ngx_http_f4f_module.xml @@ -34,7 +34,8 @@ documentation for details. <para> <note> -This module is available as part of our <commercial_version/>. +This module is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_fastcgi_module.xml +++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml @@ -413,7 +413,8 @@ server { } </example> <note> -This functionality is available as part of our <commercial_version/>. +This functionality is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_hls_module.xml +++ b/xml/en/docs/http/ngx_http_hls_module.xml @@ -41,7 +41,8 @@ define fragment boundaries in seconds. <para> <note> -This module is available as part of our <commercial_version/>. +This module is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_log_module.xml +++ b/xml/en/docs/http/ngx_http_log_module.xml @@ -244,7 +244,8 @@ access_log syslog:server=[2001:db8::1]:1 <para> <note> -Logging to syslog is available as part of our <commercial_version/>. +Logging to syslog is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_mp4_module.xml +++ b/xml/en/docs/http/ngx_http_mp4_module.xml @@ -200,7 +200,8 @@ as the specified limit. <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -222,7 +223,8 @@ will be rate limited. <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_proxy_module.xml +++ b/xml/en/docs/http/ngx_http_proxy_module.xml @@ -411,7 +411,8 @@ server { } </example> <note> -This functionality is available as part of our <commercial_version/>. +This functionality is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_session_log_module.xml +++ b/xml/en/docs/http/ngx_http_session_log_module.xml @@ -21,7 +21,8 @@ individual HTTP requests. <para> <note> -This module is available as part of our <commercial_version/>. +This module is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_status_module.xml +++ b/xml/en/docs/http/ngx_http_status_module.xml @@ -20,7 +20,8 @@ access to various status information. <para> <note> -This module is available as part of our <commercial_version/>. +This module is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/http/ngx_http_upstream_module.xml +++ b/xml/en/docs/http/ngx_http_upstream_module.xml @@ -48,7 +48,8 @@ server { <para> Dynamically configurable group, -available as part of our <commercial_version/>: +available as part of our +<commercial_version>commercial subscription</commercial_version>: <example> upstream <emphasis>appservers</emphasis> { zone appservers 64k; @@ -197,7 +198,8 @@ the <link id="ip_hash"/> directive. <para> Additionally, -the following parameters are available as part of our <commercial_version/>: +the following parameters are available as part of our +<commercial_version>commercial subscription</commercial_version>: <list type="tag"> <tag-name id="max_conns"> @@ -284,7 +286,8 @@ handled by <link id="upstream_conf"/>. <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -593,7 +596,8 @@ considered unhealthy. <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -725,7 +729,8 @@ match server_ok { <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -760,7 +765,8 @@ The default value of the <literal>timeou <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -878,7 +884,8 @@ Otherwise, the route from the URI is use <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para> @@ -1144,7 +1151,8 @@ http://127.0.0.1/upstream_conf?upstream= <para> <note> -This directive is available as part of our <commercial_version/>. +This directive is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/en/docs/ngx_core_module.xml +++ b/xml/en/docs/ngx_core_module.xml @@ -248,7 +248,8 @@ error_log syslog:server=[2001:db8::1]:12 <para> <note> -Logging to syslog is available as part of our <commercial_version/>. +Logging to syslog is available as part of our +<commercial_version>commercial subscription</commercial_version>. </note> </para>
--- a/xml/i18n.xml +++ b/xml/i18n.xml @@ -22,7 +22,6 @@ <item id="outdated">This translation may be out of date. Check the <origin>English version</origin> for recent changes.</item> -<item id="commercial_subscription">commercial subscription</item> </text> <text lang="ru"> @@ -40,7 +39,6 @@ for recent changes.</item> <item id="outdated">Этот перевод может быть устаревшим. Смотрите <origin>английскую версию</origin> для ознакомления с последними изменениями.</item> -<item id="commercial_subscription">коммерческой подписки</item> </text> <text lang="cn">
--- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml +++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml @@ -411,7 +411,8 @@ server { } </example> <note> -Функциональность доступна как часть <commercial_version/>. +Функциональность доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para>
--- a/xml/ru/docs/http/ngx_http_hls_module.xml +++ b/xml/ru/docs/http/ngx_http_hls_module.xml @@ -41,7 +41,8 @@ URI фрагмента, имеющий расширение “<literal>.ts</literal>” и принимающий <para> <note> -Модуль доступен как часть <commercial_version/>. +Модуль доступен как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para>
--- a/xml/ru/docs/http/ngx_http_mp4_module.xml +++ b/xml/ru/docs/http/ngx_http_mp4_module.xml @@ -198,7 +198,8 @@ MP4-файла. <para> <note> -Директива доступна как часть <commercial_version/>. +Директива доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para> @@ -220,7 +221,8 @@ MP4-файла. <para> <note> -Директива доступна как часть <commercial_version/>. +Директива доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para>
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml +++ b/xml/ru/docs/http/ngx_http_proxy_module.xml @@ -409,7 +409,8 @@ server { } </example> <note> -Функциональность доступна как часть <commercial_version/>. +Функциональность доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml @@ -168,7 +168,8 @@ 5 запросов на <literal>backend1.example.com</literal> <para> Кроме того, -следующие параметры доступны как часть <commercial_version/>: +следующие параметры доступны как часть +<commercial_version>коммерческой подписки</commercial_version>: <list type="tag"> <tag-name id="max_conns"> @@ -230,7 +231,8 @@ http { <para> <note> -Эта директива доступна как часть <commercial_version/>. +Эта директива доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para> @@ -451,7 +453,8 @@ server { <para> <note> -Эта директива доступна как часть <commercial_version/>. +Эта директива доступна как часть +<commercial_version>коммерческой подписки</commercial_version>. </note> </para>