Mercurial > hg > nginx-site

changeset 606:cb43695220b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
o Move introduction/ and howto/ are rather small so move those sections into docs/. o Rename "nginx: faq" article and its lang-specific variations to "FAQ".
author Maxim Konovalov <maxim@nginx.com>
date Tue, 24 Jul 2012 10:18:38 +0000
parents bfdc7833085a
children a8f7b93b0a5f
files xml/cn/GNUmakefile xml/cn/docs/faq.xml xml/cn/docs/howto.xml xml/cn/docs/index.xml xml/cn/docs/introduction.xml xml/en/GNUmakefile xml/en/docs/faq.xml xml/en/docs/howto.xml xml/en/docs/index.xml xml/en/docs/introduction.xml xml/he/GNUmakefile xml/he/docs/howto.xml xml/he/docs/index.xml xml/he/docs/introduction.xml xml/ja/GNUmakefile xml/ja/docs/faq.xml xml/ja/docs/howto.xml xml/ja/docs/index.xml xml/ja/docs/introduction.xml xml/menu.xml xml/ru/GNUmakefile xml/ru/docs/faq.xml xml/ru/docs/howto.xml xml/ru/docs/index.xml xml/ru/docs/introduction.xml xml/tr/GNUmakefile xml/tr/docs/faq.xml xml/tr/docs/howto.xml xml/tr/docs/index.xml xml/tr/docs/introduction.xml
diffstat 30 files changed, 166 insertions(+), 620 deletions(-) [+]
line wrap: on
line diff
--- a/xml/cn/GNUmakefile
+++ b/xml/cn/GNUmakefile
@@ -1,29 +1,17 @@
 DOC_LANG =	cn
 
 DOCS =									\
-		introduction						\
-		howto							\
 		faq							\
 		windows							\
+		http/request_processing					\
+		http/server_names					\
+		http/configuring_https_servers				\
+		debugging_log						\
+		http/converting_rewrite_rules				\
 
 DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
 DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-INTRO =									\
-		http/request_processing					\
-		http/server_names					\
-		http/configuring_https_servers				\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
-		debugging_log						\
-		http/converting_rewrite_rules				\
-
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
 FAQ =									\
 		welcome_nginx_facebook					\
 		sys_errlist						\
@@ -42,11 +30,5 @@ FAQ_HTML =	$(foreach name, $(FAQ), $(OUT
 $(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
-
 $(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/cn/docs/faq.xml
+++ b/xml/cn/docs/faq.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="nginx faq"
+<article name="FAQ"
          link="/cn/docs/faq.html"
          lang="cn">
 
--- a/xml/cn/docs/howto.xml
+++ b/xml/cn/docs/howto.xml
@@ -1,26 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx howto"
-         link="/cn/docs/howto.html"
-         lang="cn">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/cn/docs/index.xml
+++ b/xml/cn/docs/index.xml
@@ -2,34 +2,48 @@
 
 <article name="nginx文档"
          link="/cn/docs/"
-         lang="cn">
+         lang="cn"
+         toc="no">
 
 
-<section>
+<section id="introduction" name="介绍">
 
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="introduction.xml"/>
+<link doc="http/request_processing.xml"/>
+</listitem>
+
+<listitem>
+<link doc="http/server_names.xml"/>
 </listitem>
 
 <listitem>
-<link doc="howto.xml"/>
+<link doc="windows.xml"/>
 </listitem>
 
 <listitem>
-<link doc="faq.xml"/>
+<link doc="http/configuring_https_servers.xml"/>
+</listitem>
+
+<listitem>
+<link doc="debugging_log.xml"/>
 </listitem>
 
 </list>
 </para>
 
+</section>
+
+
+<section id="howto" name="howto">
+
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="windows.xml"/>
+<link doc="http/converting_rewrite_rules.xml"/>
 </listitem>
 
 </list>
--- a/xml/cn/docs/introduction.xml
+++ b/xml/cn/docs/introduction.xml
@@ -1,30 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx介绍"
-         link="/cn/docs/introduction.html"
-         lang="cn">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/en/GNUmakefile
+++ b/xml/en/GNUmakefile
@@ -1,8 +1,6 @@
 DOC_LANG =	en
 
 DOCS =									\
-		introduction						\
-		howto							\
 		faq							\
 		install							\
 		windows							\
@@ -10,27 +8,17 @@ DOCS =									\
 		control							\
 		hash							\
 		dirindex						\
-
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-INTRO =									\
 		http/request_processing					\
 		http/server_names					\
 		http/configuring_https_servers				\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
 		debugging_log						\
 		http/converting_rewrite_rules				\
 		howto_build_on_win32					\
 		freebsd_tuning						\
 		howto_setup_development_environment_on_ec2		\
 
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
+DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
+DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
 FAQ =									\
 		welcome_nginx_facebook					\
@@ -128,12 +116,6 @@ xml/$(DOC_LANG)/docs/dirindex.xml:					\
 	xslt/dirindex.xslt - |						\
 	sed 's;xml/[^/]*/docs/;;g' > $@
 
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
-
 $(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
 
--- a/xml/en/docs/faq.xml
+++ b/xml/en/docs/faq.xml
@@ -5,7 +5,7 @@
 
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="nginx faq"
+<article name="FAQ"
          link="/en/docs/faq.html"
          lang="en"
          rev="2">
--- a/xml/en/docs/howto.xml
+++ b/xml/en/docs/howto.xml
@@ -1,40 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx howto"
-         link="/en/docs/howto.html"
-         lang="en"
-         rev="1">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto_build_on_win32.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto_setup_development_environment_on_ec2.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/en/docs/index.xml
+++ b/xml/en/docs/index.xml
@@ -8,28 +8,11 @@
 <article name="nginx documentation"
          link="/en/docs/"
          lang="en"
-         rev="1">
+         rev="2"
+         toc="no">
 
 
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="introduction.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto.xml"/>
-</listitem>
-
-<listitem>
-<link doc="faq.xml"/>
-</listitem>
-
-</list>
-</para>
+<section id="introduction" name="Introduction">
 
 <para>
 <list type="bullet">
@@ -39,7 +22,11 @@
 </listitem>
 
 <listitem>
-<link doc="windows.xml"/>
+<link doc="http/request_processing.xml"/>
+</listitem>
+
+<listitem>
+<link doc="http/server_names.xml"/>
 </listitem>
 
 <listitem>
@@ -47,18 +34,54 @@
 </listitem>
 
 <listitem>
+<link doc="windows.xml"/>
+</listitem>
+
+<listitem>
 <link doc="control.xml"/>
 </listitem>
 
 <listitem>
+<link doc="http/configuring_https_servers.xml"/>
+</listitem>
+
+<listitem>
 <link doc="hash.xml"/>
 </listitem>
 
+<listitem>
+<link doc="debugging_log.xml"/>
+</listitem>
+
 </list>
 </para>
 
 </section>
 
+
+<section id="howto" name="How-To">
+
+<para>
+<list type="bullet">
+
+<listitem>
+<link doc="http/converting_rewrite_rules.xml"/>
+</listitem>
+
+<listitem>
+<link doc="howto_build_on_win32.xml"/>
+</listitem>
+
+<listitem>
+<link doc="howto_setup_development_environment_on_ec2.xml"/>
+</listitem>
+
+</list>
+</para>
+
+</section>
+
+
 <section name="Modules reference">
 
 <para>
--- a/xml/en/docs/introduction.xml
+++ b/xml/en/docs/introduction.xml
@@ -1,36 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="Introduction to nginx"
-         link="/en/docs/introduction.html"
-         lang="en"
-         rev="1">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/he/GNUmakefile
+++ b/xml/he/GNUmakefile
@@ -1,25 +1,13 @@
 DOC_LANG =	he
 
 DOCS =									\
-		introduction						\
-		howto							\
 		windows							\
+		http/server_names					\
+		http/converting_rewrite_rules				\
 
 DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
 DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-INTRO =									\
-		http/server_names					\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
-		http/converting_rewrite_rules				\
-
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
 $(DOC_LANG):								\
 		$(OUT)/$(DOC_LANG)/index.html				\
 		$(OUT)/$(DOC_LANG)/docs/index.html			\
@@ -29,9 +17,3 @@ HOWTO_HTML =	$(foreach name, $(HOWTO), $
 
 $(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
--- a/xml/he/docs/howto.xml
+++ b/xml/he/docs/howto.xml
@@ -1,30 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="איך עושים ב nginx"
-         link="/he/docs/howto.html"
-         lang="he">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<!--
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
--->
-
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/he/docs/index.xml
+++ b/xml/he/docs/index.xml
@@ -2,36 +2,19 @@
 
 <article name="תיעוד nginx"
          link="/he/docs/"
-         lang="he">
+         lang="he"
+         toc="no">
 
 
-<section>
+<section id="introduction" name="הקדמה ל nginx">
 
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="introduction.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto.xml"/>
+<link doc="http/server_names.xml"/>
 </listitem>
 
-<!--
-
-<listitem>
-<link doc="faq.xml"/>
-</listitem>
-
--->
-
-</list>
-</para>
-
-<para>
-<list type="bullet">
-
 <listitem>
 <link doc="windows.xml"/>
 </listitem>
@@ -41,4 +24,19 @@
 
 </section>
 
+
+<section id="howto" name="איך עושים ב nginx">
+
+<para>
+<list type="bullet">
+
+<listitem>
+<link doc="http/converting_rewrite_rules.xml"/>
+</listitem>
+
+</list>
+</para>
+
+</section>
+
 </article>
--- a/xml/he/docs/introduction.xml
+++ b/xml/he/docs/introduction.xml
@@ -1,38 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="הקדמה ל nginx"
-         link="/he/docs/introduction.html"
-         lang="he">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<!--
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
--->
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
-<!--
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
--->
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/ja/GNUmakefile
+++ b/xml/ja/GNUmakefile
@@ -1,28 +1,16 @@
 DOC_LANG =	ja
 
 DOCS =									\
-		introduction						\
-		howto							\
 		faq							\
+		http/request_processing					\
+		http/server_names					\
+		http/configuring_https_servers				\
+		debugging_log						\
+		http/converting_rewrite_rules				\
 
 DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
 DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-INTRO =									\
-		http/request_processing					\
-		http/server_names					\
-		http/configuring_https_servers				\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
-		debugging_log						\
-		http/converting_rewrite_rules				\
-
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
 FAQ =									\
 		sys_errlist						\
 
@@ -40,11 +28,5 @@ FAQ_HTML =	$(foreach name, $(FAQ), $(OUT
 $(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
-
 $(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/ja/docs/faq.xml
+++ b/xml/ja/docs/faq.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="nginx faq"
+<article name="FAQ"
          link="/ja/docs/faq.html"
          lang="ja">
 
--- a/xml/ja/docs/howto.xml
+++ b/xml/ja/docs/howto.xml
@@ -1,25 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx ハウツー"
-         link="/ja/docs/howto.html"
-         lang="ja">
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/ja/docs/index.xml
+++ b/xml/ja/docs/index.xml
@@ -2,42 +2,49 @@
 
 <article name="nginx ドキュメント"
          link="/ja/docs/"
-         lang="ja">
+         lang="ja"
+         toc="no">
 
-<section>
+
+<section id="introduction" name="入門">
 
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="introduction.xml"/>
+<link doc="http/request_processing.xml"/>
 </listitem>
 
 <listitem>
-<link doc="howto.xml"/>
+<link doc="http/server_names.xml"/>
 </listitem>
 
 <listitem>
-<link doc="faq.xml"/>
+<link doc="http/configuring_https_servers.xml"/>
+</listitem>
+
+<listitem>
+<link doc="debugging_log.xml"/>
 </listitem>
 
 </list>
 </para>
 
-<!--
+</section>
+
+
+<section id="howto" name="ハウツー">
 
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="windows.xml"/>
+<link doc="http/converting_rewrite_rules.xml"/>
 </listitem>
 
 </list>
 </para>
 
--->
-
 </section>
 
 </article>
--- a/xml/ja/docs/introduction.xml
+++ b/xml/ja/docs/introduction.xml
@@ -1,29 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx 入門"
-         link="/ja/docs/introduction.html"
-         lang="ja">
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/menu.xml
+++ b/xml/menu.xml
@@ -26,8 +26,6 @@
 <item href="/en/download.html" lang="en"> 下载 </item>
 <item href="/en/security_advisories.html" lang="en"> 安全漏洞 </item>
 <item href="/cn/docs/"> 文档 </item>
-<item href="/cn/docs/introduction.html"> 入门 </item>
-<item href="/cn/docs/howto.html"> How to </item>
 <item href="/cn/docs/faq.html"> FAQ </item>
 <item href="http://trac.nginx.org/nginx" lang="en"> trac </item>
 <item href="http://wiki.nginx.org" lang="en"> wiki </item>
@@ -66,12 +64,10 @@
 -->
 <item href="/en/security_advisories.html"> security advisories </item>
 <item href="/en/docs/"> documentation </item>
-<item href="/en/docs/introduction.html"> introduction </item>
 <item href="/en/pgp_keys.html"> pgp keys </item>
 <!--
 <item href="/en/docs/reference.html"> reference </item>
 -->
-<item href="/en/docs/howto.html"> howto </item>
 <item href="/en/docs/faq.html"> faq </item>
 <item href="http://trac.nginx.org/nginx"> trac </item>
 <item href="http://wiki.nginx.org"> wiki </item>
@@ -104,8 +100,6 @@
 <item href="/en/download.html" lang="אנגלית"> הורדה </item>
 <item href="/en/security_advisories.html" lang="אנגלית"> דיווחי אבטחה </item>
 <item href="/he/docs/"> תיעוד </item>
-<item href="/he/docs/introduction.html"> הקדמה </item>
-<item href="/he/docs/howto.html"> איך עושים... </item>
 <item href="/en/docs/faq.html" lang="אנגלית"> שאלות נפוצות </item>
 <item href="http://wiki.nginx.org" lang="אנגלית"> ויקי </item>
 <item href="/en/links.html" lang="אנגלית"> קישורים </item>
@@ -135,8 +129,6 @@
 <item href="/en/download.html" lang="en"> ダウンロード </item>
 <item href="/en/security_advisories.html" lang="en"> セキュリティ情報 </item>
 <item href="/ja/docs/"> ドキュメント </item>
-<item href="/ja/docs/introduction.html"> 入門 </item>
-<item href="/ja/docs/howto.html"> ハウツー </item>
 <item href="/ja/docs/faq.html"> faq </item>
 <item href="/en/links.html" lang="en"> リンク </item>
 <item href="/en/books.html" lang="en"> 本 </item>
@@ -167,8 +159,6 @@
 <item href="/en/security_advisories.html" lang="en"> безопасность </item>
 <item href="/en/pgp_keys.html" lang="en"> pgp ключи </item>
 <item href="/ru/docs/"> документация </item>
-<item href="/ru/docs/introduction.html"> введение </item>
-<item href="/ru/docs/howto.html"> howto </item>
 <item href="/ru/docs/faq.html"> faq </item>
 <item href="http://trac.nginx.org/nginx"> trac </item>
 <item href="http://wiki.nginx.org/"> wiki </item>
@@ -202,8 +192,6 @@
 <item href="/en/security_advisories.html" lang="ing">
       güvenlik tavsiyeleri </item>
 <item href="/tr/docs/"> dökümantasyon </item>
-<item href="/tr/docs/introduction.html"> giriş </item>
-<item href="/tr/docs/howto.html"> kılavuz </item>
 <item href="/tr/docs/faq.html"> sss </item>
 <item href="http://wiki.nginx.org/NginxTr"> wiki </item>
 <item href="/en/links.html" lang="ing"> bağlantılar </item>
--- a/xml/ru/GNUmakefile
+++ b/xml/ru/GNUmakefile
@@ -1,8 +1,6 @@
 DOC_LANG =	ru
 
 DOCS =									\
-		introduction						\
-		howto							\
 		faq							\
 		install							\
 		windows							\
@@ -13,23 +11,13 @@ DOCS =									\
 		control							\
 		hash							\
 		dirindex						\
+		http/request_processing					\
+		http/configuring_https_servers				\
+		debugging_log						\
 
 DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
 DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-INTRO =									\
-		http/request_processing					\
-		http/configuring_https_servers				\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
-		debugging_log						\
-
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
 FAQ =									\
 		sys_errlist						\
 
@@ -111,11 +99,5 @@ xml/$(DOC_LANG)/docs/dirindex.xml:					\
 	xslt/dirindex.xslt - |						\
 	sed 's;xml/[^/]*/docs/;;g' > $@
 
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
-
 $(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/ru/docs/faq.xml
+++ b/xml/ru/docs/faq.xml
@@ -5,7 +5,7 @@
 
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="nginx: faq"
+<article name="FAQ"
          link="/ru/docs/faq.html"
          lang="ru"
          rev="1">
--- a/xml/ru/docs/howto.xml
+++ b/xml/ru/docs/howto.xml
@@ -1,38 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx howto"
-         link="/ru/docs/howto.html"
-         lang="ru"
-         rev="1">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
-<!--
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto_build_on_win32.xml"/>
-</listitem>
--->
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/ru/docs/index.xml
+++ b/xml/ru/docs/index.xml
@@ -8,28 +8,11 @@
 <article name="nginx: документация"
          link="/ru/docs/"
          lang="ru"
-         rev="1">
+         rev="2"
+         toc="no">
 
 
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="introduction.xml"/>
-</listitem>
-
-<listitem>
-<link doc="howto.xml"/>
-</listitem>
-
-<listitem>
-<link doc="faq.xml"/>
-</listitem>
-
-</list>
-</para>
+<section id="introduction" name="Введение">
 
 <para>
 <list type="bullet">
@@ -39,11 +22,23 @@
 </listitem>
 
 <listitem>
+<link doc="http/request_processing.xml"/>
+</listitem>
+
+<listitem>
+<link doc="events.xml"/>
+</listitem>
+
+<listitem>
 <link doc="windows.xml"/>
 </listitem>
 
 <listitem>
-<link doc="events.xml"/>
+<link doc="control.xml"/>
+</listitem>
+
+<listitem>
+<link doc="http/configuring_https_servers.xml"/>
 </listitem>
 
 <listitem>
@@ -59,11 +54,11 @@
 </listitem>
 
 <listitem>
-<link doc="control.xml"/>
+<link doc="hash.xml"/>
 </listitem>
 
 <listitem>
-<link doc="hash.xml"/>
+<link doc="debugging_log.xml"/>
 </listitem>
 
 </list>
@@ -71,6 +66,7 @@
 
 </section>
 
+
 <section name="Справочник по модулям">
 
 <para>
--- a/xml/ru/docs/introduction.xml
+++ b/xml/ru/docs/introduction.xml
@@ -1,40 +0,0 @@
-<!--
-  Copyright (C) Igor Sysoev
-  Copyright (C) Nginx, Inc.
-  -->
-
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="Введение в nginx"
-         link="/ru/docs/introduction.html"
-         lang="ru"
-         rev="1">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
-<!--
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
--->
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/tr/GNUmakefile
+++ b/xml/tr/GNUmakefile
@@ -1,29 +1,17 @@
 DOC_LANG =	tr
 
 DOCS =									\
-		introduction						\
-		howto							\
 		faq							\
 		windows							\
+		http/request_processing					\
+		http/server_names					\
+		http/configuring_https_servers				\
+		debugging_log						\
+		http/converting_rewrite_rules				\
 
 DOCS_XML =	$(foreach name, $(DOCS), xml/$(DOC_LANG)/docs/$(name).xml)
 DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-INTRO =									\
-		http/request_processing					\
-		http/server_names					\
-		http/configuring_https_servers				\
-
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(DOC_LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
-HOWTO =									\
-		debugging_log						\
-		http/converting_rewrite_rules				\
-
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
-
 FAQ =									\
 		sys_errlist						\
 
@@ -41,11 +29,5 @@ FAQ_HTML =	$(foreach name, $(FAQ), $(OUT
 $(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 
-$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
-		$(INTRO_XML)						\
-
-$(OUT)/$(DOC_LANG)/docs/howto.html:					\
-		$(HOWTO_XML)						\
-
 $(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/tr/docs/faq.xml
+++ b/xml/tr/docs/faq.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="nginx - Sık Sorulan Sorular"
+<article name="FAQ"
          link="/tr/docs/faq.html"
          lang="tr">
 
--- a/xml/tr/docs/howto.xml
+++ b/xml/tr/docs/howto.xml
@@ -1,26 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx - Kılavuz"
-         link="/tr/docs/howto.html"
-         lang="tr">
-
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="debugging_log.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/converting_rewrite_rules.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>
--- a/xml/tr/docs/index.xml
+++ b/xml/tr/docs/index.xml
@@ -2,33 +2,48 @@
 
 <article name="nginx dökümantasyonu"
          link="/tr/docs/"
-         lang="tr">
+         lang="tr"
+         toc="no">
 
-<section>
+
+<section id="introduction" name="Giriş">
 
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="introduction.xml"/>
+<link doc="http/request_processing.xml"/>
+</listitem>
+
+<listitem>
+<link doc="http/server_names.xml"/>
 </listitem>
 
 <listitem>
-<link doc="howto.xml"/>
+<link doc="windows.xml"/>
 </listitem>
 
 <listitem>
-<link doc="faq.xml"/>
+<link doc="http/configuring_https_servers.xml"/>
+</listitem>
+
+<listitem>
+<link doc="debugging_log.xml"/>
 </listitem>
 
 </list>
 </para>
 
+</section>
+
+
+<section id="howto" name="Kılavuz">
+
 <para>
 <list type="bullet">
 
 <listitem>
-<link doc="windows.xml"/>
+<link doc="http/converting_rewrite_rules.xml"/>
 </listitem>
 
 </list>
--- a/xml/tr/docs/introduction.xml
+++ b/xml/tr/docs/introduction.xml
@@ -1,29 +0,0 @@
-<!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
-
-<article name="nginx - Giriş"
-         link="/tr/docs/introduction.html"
-         lang="tr">
-
-<section>
-
-<para>
-<list type="bullet">
-
-<listitem>
-<link doc="http/request_processing.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/server_names.xml"/>
-</listitem>
-
-<listitem>
-<link doc="http/configuring_https_servers.xml"/>
-</listitem>
-
-</list>
-</para>
-
-</section>
-
-</article>