Mercurial > hg > nginx-site
changeset 2244:467aef18bf12
Renamed the "About njs" page.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Mon, 24 Sep 2018 19:10:17 +0300 |
parents | 8cc7642ba82e |
children | 87a0e2c73a25 |
files | xml/en/GNUmakefile xml/en/docs/http/ngx_http_js_module.xml xml/en/docs/index.xml xml/en/docs/njs/index.xml xml/en/docs/njs/njs_api.xml xml/en/docs/njs_about.xml xml/en/docs/stream/ngx_stream_js_module.xml xml/en/index.xml xml/index.xml xml/ru/GNUmakefile xml/ru/docs/http/ngx_http_js_module.xml xml/ru/docs/index.xml xml/ru/docs/njs/index.xml xml/ru/docs/njs/njs_api.xml xml/ru/docs/njs_about.xml xml/ru/docs/stream/ngx_stream_js_module.xml xml/ru/index.xml |
diffstat | 15 files changed, 61 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/GNUmakefile +++ b/xml/en/GNUmakefile @@ -24,7 +24,6 @@ DOCS = \ contributing_changes \ beginners_guide \ configure \ - njs_about \ FAQ = \ welcome_nginx_facebook \ @@ -123,6 +122,7 @@ REFS = \ stream/stream_processing \ ngx_google_perftools_module \ dev/development_guide \ + njs/index \ njs/njs_changes \ njs/njs_api \
--- a/xml/en/docs/http/ngx_http_js_module.xml +++ b/xml/en/docs/http/ngx_http_js_module.xml @@ -9,21 +9,21 @@ <module name="Module ngx_http_js_module" link="/en/docs/http/ngx_http_js_module.html" lang="en" - rev="15"> + rev="16"> <section id="summary"> <para> The <literal>ngx_http_js_module</literal> module is used to implement location and variable handlers -in <link doc="../njs_about.xml">njs</link> — +in <link doc="../njs/">njs</link> — a subset of the JavaScript language. </para> <para> This module is not built by default. Download and install instructions are available -<link doc="../njs_about.xml" id="install">here</link>. +<link doc="../njs/index.xml" id="install">here</link>. </para> </section>
--- a/xml/en/docs/index.xml +++ b/xml/en/docs/index.xml @@ -8,7 +8,7 @@ <article name="nginx documentation" link="/en/docs/" lang="en" - rev="45" + rev="46" toc="no"> @@ -98,7 +98,7 @@ <list type="bullet"> <listitem> -<link doc="njs_about.xml"/> +<link doc="njs/index.xml">Scripting with njs</link> </listitem> </list>
rename from xml/en/docs/njs_about.xml rename to xml/en/docs/njs/index.xml --- a/xml/en/docs/njs_about.xml +++ b/xml/en/docs/njs/index.xml @@ -4,20 +4,20 @@ Copyright (C) Nginx, Inc. --> -<!DOCTYPE article SYSTEM "../../../dtd/article.dtd"> +<!DOCTYPE article SYSTEM "../../../../dtd/article.dtd"> -<article name="About njs" - link="/en/docs/njs_about.html" +<article name="njs scripting language" + link="/en/docs/njs/index.html" lang="en" - rev="22"> + rev="23"> <section id="summary"> <para> njs is a subset of the JavaScript language that allows implementing location and variable handlers in -<link doc="http/ngx_http_js_module.xml">http</link> and -<link doc="stream/ngx_stream_js_module.xml">stream</link>. +<link doc="../http/ngx_http_js_module.xml">http</link> and +<link doc="../stream/ngx_stream_js_module.xml">stream</link>. njs is created in compliance with <link url="http://www.ecma-international.org/ecma-262/5.1/">ECMAScript 5.1</link> (strict mode) with some @@ -247,7 +247,7 @@ non-integer fractions (<literal>.235</li <para> The complete list of njs changes is available -<link doc="njs/njs_changes.xml">here</link>. +<link doc="njs_changes.xml">here</link>. </para> </section> @@ -256,7 +256,7 @@ The complete list of njs changes is avai <para> njs API reference is available -<link doc="njs/njs_api.xml">here</link>. +<link doc="njs_api.xml">here</link>. </para> </section> @@ -268,11 +268,11 @@ njs is available in two modules: <list type="bullet"> <listitem> -<link doc="http/ngx_http_js_module.xml">ngx_http_js_module</link> +<link doc="../http/ngx_http_js_module.xml">ngx_http_js_module</link> </listitem> <listitem> -<link doc="stream/ngx_stream_js_module.xml">ngx_stream_js_module</link> +<link doc="../stream/ngx_stream_js_module.xml">ngx_stream_js_module</link> </listitem> </list> @@ -287,12 +287,12 @@ njs command-line <link id="cli">utility< <section id="install_package" name="Installing as a Linux package"> <para> For Linux, njs modules -<link doc="../linux_packages.xml" id="dynmodules">packages</link> can be used: +<link doc="../../linux_packages.xml" id="dynmodules">packages</link> can be used: <list type="bullet"> <listitem> <literal>nginx-module-njs</literal> — njs -<link doc="ngx_core_module.xml" id="load_module">dynamic</link> modules +<link doc="../ngx_core_module.xml" id="load_module">dynamic</link> modules </listitem> <listitem> @@ -321,7 +321,7 @@ Then the modules should be compiled usin ./configure --add-module=<value>path-to-njs</value>/nginx </example> The modules can also be built as -<link doc="ngx_core_module.xml" id="load_module">dynamic</link>: +<link doc="../ngx_core_module.xml" id="load_module">dynamic</link>: <example> ./configure --add-dynamic-module=<value>path-to-njs</value>/nginx </example> @@ -349,8 +349,8 @@ the Linux <link id="install_package">pac or after building from the <link id="install_sources">sources</link>. Compared to njs running inside nginx, nginx objects -(<link doc="njs/njs_api.xml" id="http">HTTP</link> and -<link doc="njs/njs_api.xml" id="stream">Stream</link>) +(<link doc="njs_api.xml" id="http">HTTP</link> and +<link doc="njs_api.xml" id="stream">Stream</link>) are not available in the utility. <example> $ echo "2**3" | njs -
--- a/xml/en/docs/njs/njs_api.xml +++ b/xml/en/docs/njs/njs_api.xml @@ -14,7 +14,7 @@ <section id="summary"> <para> -<link doc="../njs_about.xml">njs</link> provides objects, methods and properties +<link doc="index.xml">njs</link> provides objects, methods and properties for extending nginx functionality. </para>
--- a/xml/en/docs/stream/ngx_stream_js_module.xml +++ b/xml/en/docs/stream/ngx_stream_js_module.xml @@ -9,20 +9,20 @@ <module name="Module ngx_stream_js_module" link="/en/docs/stream/ngx_stream_js_module.html" lang="en" - rev="13"> + rev="14"> <section id="summary"> <para> The <literal>ngx_stream_js_module</literal> module is used to implement -handlers in <link doc="../njs_about.xml">njs</link> — +handlers in <link doc="../njs/">njs</link> — a subset of the JavaScript language. </para> <para> This module is not built by default. Download and install instructions are available -<link doc="../njs_about.xml" id="install">here</link>. +<link doc="../njs/index.xml" id="install">here</link>. </para> </section>
--- a/xml/en/index.xml +++ b/xml/en/index.xml @@ -8,7 +8,7 @@ <article name="nginx" link="/en/" lang="en" - rev="95"> + rev="96"> <section> @@ -209,7 +209,7 @@ Embedded <link doc="docs/http/ngx_http_p </listitem> <listitem> -<link doc="docs/njs_about.xml">njs</link>. +<link doc="docs/njs/index.xml">njs</link> scripting language. </listitem> </list> @@ -335,7 +335,7 @@ log writing</link>, </listitem> <listitem> -<link doc="docs/stream/ngx_stream_js_module.xml">njs</link>. +<link doc="docs/njs/index.xml">njs</link> scripting language. </listitem> </list>
--- a/xml/index.xml +++ b/xml/index.xml @@ -34,7 +34,7 @@ support and control API</link> for TLS c <event date="2018-09-18"> <para> -<link doc="en/docs/njs_about.xml">njs-0.2.4</link> +<link doc="en/docs/njs/">njs-0.2.4</link> version has been released, featuring <link doc="en/docs/njs/njs_api.xml" id="s_on">s.on()</link>, <link doc="en/docs/njs/njs_api.xml" id="s_off">s.off()</link>, @@ -56,7 +56,7 @@ mainline version has been released. <event date="2018-07-31"> <para> -<link doc="en/docs/njs_about.xml">njs-0.2.3</link> +<link doc="en/docs/njs/">njs-0.2.3</link> version has been released, featuring <link doc="en/docs/njs/njs_api.xml" id="string_bytesfrom">String.bytesFrom()</link>, <link doc="en/docs/njs/njs_api.xml" id="string_padstart">String.padStart()</link>, @@ -93,7 +93,7 @@ balancing method</link>. <event date="2018-06-19"> <para> -<link doc="en/docs/njs_about.xml">njs-0.2.2</link> +<link doc="en/docs/njs/">njs-0.2.2</link> version has been released, featuring HTTP <link doc="en/docs/njs/njs_api.xml" id="r_internal_redirect">internalRedirect()</link> method support @@ -119,7 +119,7 @@ mainline version has been released. <event date="2018-05-31"> <para> -<link doc="en/docs/njs_about.xml">njs-0.2.1</link> +<link doc="en/docs/njs/">njs-0.2.1</link> version has been <link doc="en/docs/njs/njs_changes.xml" id="njs0.2.1">released</link>. </para> @@ -178,7 +178,7 @@ mainline version has been released. <event date="2018-04-03"> <para> -<link doc="en/docs/njs_about.xml">njs-0.2.0</link> +<link doc="en/docs/njs/">njs-0.2.0</link> version has been released, featuring HTTP <link doc="en/docs/njs/njs_api.xml" id="subrequest">subrequest()</link> method support
--- a/xml/ru/GNUmakefile +++ b/xml/ru/GNUmakefile @@ -19,7 +19,6 @@ DOCS = \ contributing_changes \ beginners_guide \ configure \ - njs_about \ FAQ = \ sys_errlist \ @@ -107,6 +106,7 @@ REFS = \ stream/ngx_stream_upstream_hc_module \ stream/stream_processing \ ngx_google_perftools_module \ + njs/index \ njs/njs_api \ TOP = \
--- a/xml/ru/docs/http/ngx_http_js_module.xml +++ b/xml/ru/docs/http/ngx_http_js_module.xml @@ -9,21 +9,21 @@ <module name="Модуль ngx_http_js_module" link="/ru/docs/http/ngx_http_js_module.html" lang="ru" - rev="15"> + rev="16"> <section id="summary"> <para> Модуль <literal>ngx_http_js_module</literal> позволяет задавать обработчики location и переменных -на <link doc="../njs_about.xml">njs</link> — +на <link doc="../njs/">njs</link> — подмножестве языка JavaScript. </para> <para> По умолчанию этот модуль не собирается. Инструкция по сборке и установке доступны -<link doc="../njs_about.xml" id="install">здесь</link>. +<link doc="../njs/index.xml" id="install">здесь</link>. </para> </section>
--- a/xml/ru/docs/index.xml +++ b/xml/ru/docs/index.xml @@ -8,7 +8,7 @@ <article name="nginx: документация" link="/ru/docs/" lang="ru" - rev="45" + rev="46" toc="no"> @@ -99,7 +99,7 @@ <list type="bullet"> <listitem> -<link doc="njs_about.xml"/> +<link doc="njs/index.xml">Создание сценариев на njs</link> </listitem> </list>
rename from xml/ru/docs/njs_about.xml rename to xml/ru/docs/njs/index.xml --- a/xml/ru/docs/njs_about.xml +++ b/xml/ru/docs/njs/index.xml @@ -4,20 +4,20 @@ Copyright (C) Nginx, Inc. --> -<!DOCTYPE article SYSTEM "../../../dtd/article.dtd"> +<!DOCTYPE article SYSTEM "../../../../dtd/article.dtd"> -<article name="Информация о njs" - link="/ru/docs/njs_about.html" +<article name="Сценарный язык njs" + link="/ru/docs/njs/index.html" lang="ru" - rev="22"> + rev="23"> <section id="summary"> <para> njs - это подмножество языка JavaScript, который позволяет задавать обработчики location и переменных в -<link doc="http/ngx_http_js_module.xml">http</link> и -<link doc="stream/ngx_stream_js_module.xml">stream</link>. +<link doc="../http/ngx_http_js_module.xml">http</link> и +<link doc="../stream/ngx_stream_js_module.xml">stream</link>. njs совместим с <link url="http://www.ecma-international.org/ecma-262/5.1/">ECMAScript 5.1</link> (строгий режим) c некоторыми расширениями @@ -246,7 +246,7 @@ labels <para> Полная история изменений njs доступна -<link doc="njs/njs_changes.xml">здесь</link>. +<link doc="njs_changes.xml">здесь</link>. </para> </section> @@ -254,7 +254,7 @@ labels <para> Справочник njs API доступен -<link doc="njs/njs_api.xml">здесь</link>. +<link doc="njs_api.xml">здесь</link>. </para> </section> @@ -266,11 +266,11 @@ njs доступен в двух модулях: <list type="bullet"> <listitem> -<link doc="http/ngx_http_js_module.xml">ngx_http_js_module</link> +<link doc="../http/ngx_http_js_module.xml">ngx_http_js_module</link> </listitem> <listitem> -<link doc="stream/ngx_stream_js_module.xml">ngx_stream_js_module</link> +<link doc="../stream/ngx_stream_js_module.xml">ngx_stream_js_module</link> </listitem> </list> @@ -285,12 +285,12 @@ njs доступен в двух модулях: <section id="install_package" name="Установка пакета Linux"> <para> Для установки модулей njs на Linux могут быть использованы -<link doc="../linux_packages.xml" id="dynmodules">пакеты</link>: +<link doc="../../linux_packages.xml" id="dynmodules">пакеты</link>: <list type="bullet"> <listitem> <literal>nginx-module-njs</literal> — -<link doc="ngx_core_module.xml" id="load_module">динамические</link> модули +<link doc="../ngx_core_module.xml" id="load_module">динамические</link> модули njs </listitem> @@ -320,7 +320,7 @@ hg clone http://hg.nginx.org/njs ./configure --add-module=<value>path-to-njs</value>/nginx </example> Модули также можно собрать как -<link doc="ngx_core_module.xml" id="load_module">динамические</link>: +<link doc="../ngx_core_module.xml" id="load_module">динамические</link>: <example> ./configure --add-dynamic-module=<value>path-to-njs</value>/nginx </example> @@ -347,8 +347,8 @@ hg clone http://hg.nginx.org/njs или после сборки из <link id="install_sources">исходных файлов</link>. В отличие от njs, запущенном внутри nginx, в утилите недоступны объекты nginx -(<link doc="njs/njs_api.xml" id="http">HTTP</link> и -<link doc="njs/njs_api.xml" id="stream">Stream</link>). +(<link doc="njs_api.xml" id="http">HTTP</link> и +<link doc="njs_api.xml" id="stream">Stream</link>). <example> $ echo "2**3" | njs - 8
--- a/xml/ru/docs/njs/njs_api.xml +++ b/xml/ru/docs/njs/njs_api.xml @@ -14,7 +14,7 @@ <section id="summary"> <para> -<link doc="../njs_about.xml">njs</link> предоставляет объекты, методы и свойства +<link doc="index.xml">njs</link> предоставляет объекты, методы и свойства для расширения функциональности nginx. </para>
--- a/xml/ru/docs/stream/ngx_stream_js_module.xml +++ b/xml/ru/docs/stream/ngx_stream_js_module.xml @@ -9,20 +9,20 @@ <module name="Модуль ngx_stream_js_module" link="/ru/docs/stream/ngx_stream_js_module.html" lang="ru" - rev="13"> + rev="14"> <section id="summary"> <para> Модуль <literal>ngx_stream_js_module</literal> позволяет задавать -обработчики на <link doc="../njs_about.xml">njs</link> — +обработчики на <link doc="../njs/">njs</link> — подмножестве языка JavaScript. </para> <para> По умолчанию этот модуль не собирается. Инструкция по сборке и установке доступны -<link doc="../njs_about.xml" id="install">здесь</link>. +<link doc="../njs/index.xml" id="install">здесь</link>. </para> </section>
--- a/xml/ru/index.xml +++ b/xml/ru/index.xml @@ -8,7 +8,7 @@ <article name="nginx" link="/ru/" lang="ru" - rev="95"> + rev="96"> <section> @@ -208,7 +208,7 @@ PUT, DELETE, MKCOL, COPY и MOVE</link>; </listitem> <listitem> -<link doc="docs/njs_about.xml">njs</link>. +сценарный язык <link doc="docs/njs/index.xml">njs</link>. </listitem> </list> @@ -335,7 +335,7 @@ TCP и UDP;</link> </listitem> <listitem> -<link doc="docs/stream/ngx_stream_js_module.xml">njs</link>. +сценарный язык <link doc="docs/njs/index.xml">njs</link>. </listitem> </list>