Mercurial > hg > nginx-site

changeset 1017:9f9a427a73eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed broken links to chinese versions of some modules. The chinese version contains untranslated copies of english documentation for random_index and realip modules. The result is the appearance of 'translation to chinese' link for this modules pointing to non-existing document. This files are removed. Also, broken links are generated for the chinese version of the "flv" module, but the translation exists, although not enabled for publication. Since contents of file looks like a valid translation, it is allowed to be published.
author Vladimir Homutov <vl@nginx.com>
date Mon, 18 Nov 2013 12:48:10 +0400
parents 2d8269d8fea8
children 19129672444e
files xml/cn/GNUmakefile xml/cn/docs/http/ngx_http_flv_module.xml xml/cn/docs/http/ngx_http_random_index_module.xml xml/cn/docs/http/ngx_http_realip_module.xml xml/cn/docs/index.xml
diffstat 5 files changed, 7 insertions(+), 175 deletions(-) [+]
line wrap: on
line diff
--- a/xml/cn/GNUmakefile
+++ b/xml/cn/GNUmakefile
@@ -21,6 +21,7 @@ REFS =									\
 		http/ngx_http_browser_module				\
 		http/ngx_http_core_module				\
 		http/ngx_http_empty_gif_module				\
+		http/ngx_http_flv_module				\
 		http/ngx_http_geo_module				\
 		http/ngx_http_geoip_module				\
 		http/ngx_http_gzip_static_module			\
--- a/xml/cn/docs/http/ngx_http_flv_module.xml
+++ b/xml/cn/docs/http/ngx_http_flv_module.xml
@@ -8,7 +8,7 @@
 <!DOCTYPE module SYSTEM "../../../../dtd/module.dtd">
 
 <module name="ngx_http_flv_module 模块"
-        link="/en/docs/http/ngx_http_flv_module.html"
+        link="/cn/docs/http/ngx_http_flv_module.html"
         lang="cn"
         translator="litianqing"
         rev="1">
deleted file mode 100644
--- a/xml/cn/docs/http/ngx_http_random_index_module.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE module SYSTEM "../../../../dtd/module.dtd">
-
-<module name="Module ngx_http_random_index_module"
-        link="/en/docs/http/ngx_http_random_index_module.html"
-        lang="en"
-        rev="1">
-
-<section id="summary">
-
-<para>
-The module <literal>ngx_http_random_index_module</literal> picks a random
-file in a directory as an index file.
-It works before the
-<link doc="ngx_http_index_module.xml">ngx_http_index_module</link>
-module.
-</para>
-
-<para>
-This module is not built by default, it should be enabled with the
-<literal>--with-http_random_index_module</literal>
-configuration parameter.
-</para>
-
-</section>
-
-
-<section id="example" name="Example Configuration">
-
-<para>
-<example>
-location / {
-    random_index on;
-}
-</example>
-</para>
-
-</section>
-
-
-<section id="directives" name="Directives">
-
-<directive name="random_index">
-<syntax><literal>on</literal> | <literal>off</literal></syntax>
-<default>off</default>
-<context>location</context>
-
-<para>
-Enables or disables module processing in a surrounding location.
-</para>
-
-</directive>
-
-</section>
-
-</module>
deleted file mode 100644
--- a/xml/cn/docs/http/ngx_http_realip_module.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE module SYSTEM "../../../../dtd/module.dtd">
-
-<module name="Module ngx_http_realip_module"
-        link="/en/docs/http/ngx_http_realip_module.html"
-        lang="en"
-        rev="1">
-
-<section id="summary">
-
-<para>
-The <literal>ngx_http_realip_module</literal> module allows
-to change the client address to the one sent in the specified header field.
-</para>
-
-<para>
-This module is not built by default, it should be enabled with the
-<literal>--with-http_realip_module</literal>
-configuration parameter.
-</para>
-
-</section>
-
-
-<section id="example" name="Example Configuration">
-
-<para>
-<example>
-set_real_ip_from  192.168.1.0/24;
-set_real_ip_from  192.168.2.1;
-set_real_ip_from  2001:0db8::/32;
-real_ip_header    X-Forwarded-For;
-real_ip_recursive on;
-</example>
-</para>
-
-</section>
-
-
-<section id="directives" name="Directives">
-
-<directive name="set_real_ip_from">
-<syntax>
-    <value>address</value> |
-    <value>CIDR</value> |
-    <literal>unix:</literal></syntax>
-<default/>
-<context>http</context>
-<context>server</context>
-<context>location</context>
-
-<para>
-Defines trusted addresses that are known to send correct
-replacement addresses.
-If the special value <literal>unix:</literal> is specified,
-all UNIX-domain sockets will be trusted.
-<note>
-IPv6 addresses are supported starting from versions 1.3.0 and 1.2.1.
-</note>
-</para>
-
-</directive>
-
-
-<directive name="real_ip_header">
-<syntax>
-    <value>field</value> |
-    <literal>X-Real-IP</literal> |
-    <literal>X-Forwarded-For</literal></syntax>
-<default>X-Real-IP</default>
-<context>http</context>
-<context>server</context>
-<context>location</context>
-
-<para>
-Defines a request header field used to send
-the address for a replacement.
-</para>
-
-</directive>
-
-
-<directive name="real_ip_recursive">
-<syntax><literal>on</literal> | <literal>off</literal></syntax>
-<default>off</default>
-<context>http</context>
-<context>server</context>
-<context>location</context>
-<appeared-in>1.3.0</appeared-in>
-<appeared-in>1.2.1</appeared-in>
-
-<para>
-If recursive search is disabled, an original client address that
-matches one of the trusted addresses is replaced by the last
-address sent in the request header field defined by the
-<link id="real_ip_header"/> directive.
-If recursive search is enabled, an original client address that
-matches one of the trusted addresses is replaced by the last
-non-trusted address sent in the request header field.
-</para>
-
-</directive>
-
-</section>
-
-</module>
--- a/xml/cn/docs/index.xml
+++ b/xml/cn/docs/index.xml
@@ -103,6 +103,11 @@ ngx_http_empty_gif_module</link>
 </listitem>
 
 <listitem>
+<link doc="http/ngx_http_flv_module.xml">
+ngx_http_flv_module</link>
+</listitem>
+
+<listitem>
 <link doc="http/ngx_http_geo_module.xml">
 ngx_http_geo_module</link>
 </listitem>