Mercurial > hg > nginx-site

changeset 218:6fed92e2bcea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed LANG to DOC_LANG (the former interacts badly with locale).
author Ruslan Ermilov <ru@nginx.com>
date Wed, 30 Nov 2011 13:40:46 +0000
parents 85fcb4cf9745
children 22cc1569ada2
files xml/en/GNUmakefile xml/he/GNUmakefile xml/ja/GNUmakefile xml/ru/GNUmakefile xml/tr/GNUmakefile
diffstat 5 files changed, 92 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/GNUmakefile	Wed Nov 30 10:53:24 2011 +0000
+++ b/xml/en/GNUmakefile	Wed Nov 30 13:40:46 2011 +0000
@@ -1,4 +1,4 @@
-LANG =		en
+DOC_LANG =	en
 
 DOCS =									\
 		introduction						\
@@ -8,16 +8,16 @@
 		control							\
 		hash							\
 
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(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)
 
 INTRO =									\
 		http/request_processing					\
 		http/server_names					\
 		http/configuring_https_servers				\
 
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(LANG)/docs/$(name).html)
+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						\
@@ -25,8 +25,8 @@
 		howto_build_on_win32					\
 		freebsd_tuning						\
 
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(LANG)/docs/$(name).html)
+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					\
@@ -37,8 +37,8 @@
 		faq/chunked_encoding_from_backend			\
 		sys_errlist						\
 
-FAQ_XML =	$(foreach name, $(FAQ), xml/$(LANG)/docs/$(name).xml)
-FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(LANG)/docs/$(name).html)
+FAQ_XML =	$(foreach name, $(FAQ), xml/$(DOC_LANG)/docs/$(name).xml)
+FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
 REFS =									\
 		ngx_core_module						\
@@ -52,48 +52,48 @@
 		http/ngx_http_mp4_module				\
 		http/ngx_http_random_index_module			\
 
-REFS_XML =	$(foreach name, $(REFS), xml/$(LANG)/docs/$(name).xml)
-REFS_HTML =	$(foreach name, $(REFS), $(OUT)/$(LANG)/docs/$(name).html)
+REFS_XML =	$(foreach name, $(REFS), xml/$(DOC_LANG)/docs/$(name).xml)
+REFS_HTML =	$(foreach name, $(REFS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-$(LANG):								\
-		$(OUT)/$(LANG)/index.html				\
-		$(OUT)/$(LANG)/download.html				\
-		$(OUT)/$(LANG)/security_advisories.html			\
-		$(OUT)/$(LANG)/docs/index.html				\
+$(DOC_LANG):								\
+		$(OUT)/$(DOC_LANG)/index.html				\
+		$(OUT)/$(DOC_LANG)/download.html			\
+		$(OUT)/$(DOC_LANG)/security_advisories.html		\
+		$(OUT)/$(DOC_LANG)/docs/index.html			\
 		$(DOCS_HTML)						\
 		$(REFS_HTML)						\
 		$(INTRO_HTML)						\
 		$(HOWTO_HTML)						\
 		$(FAQ_HTML)						\
-		$(OUT)/$(LANG)/links.html				\
-		$(OUT)/$(LANG)/books.html				\
-		$(OUT)/$(LANG)/support.html				\
-		$(OUT)/$(LANG)/donation.html				\
+		$(OUT)/$(DOC_LANG)/links.html				\
+		$(OUT)/$(DOC_LANG)/books.html				\
+		$(OUT)/$(DOC_LANG)/support.html				\
+		$(OUT)/$(DOC_LANG)/donation.html			\
 
-$(OUT)/$(LANG)/download.html:						\
-		xml/$(LANG)/download.xml				\
+$(OUT)/$(DOC_LANG)/download.html:					\
+		xml/$(DOC_LANG)/download.xml				\
 		$(DOWNLOAD_DEPS)
 	$(call XSLT, xslt/download.xslt, $<, $@)
 
-$(OUT)/$(LANG)/security_advisories.html:				\
-		xml/$(LANG)/security_advisories.xml			\
+$(OUT)/$(DOC_LANG)/security_advisories.html:				\
+		xml/$(DOC_LANG)/security_advisories.xml			\
 		$(SECURITY_DEPS)
 	$(call XSLT, xslt/security.xslt, $<, $@)
 
-$(OUT)/$(LANG)/docs/index.html:						\
+$(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 		$(REFS_XML)						\
 
-$(OUT)/$(LANG)/docs/introduction.html:					\
+$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
 		$(INTRO_XML)						\
 
-$(OUT)/$(LANG)/docs/howto.html:						\
+$(OUT)/$(DOC_LANG)/docs/howto.html:					\
 		$(HOWTO_XML)						\
 
-$(OUT)/$(LANG)/docs/faq.html:						\
+$(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
 
-$(OUT)/$(LANG)/books.html:						\
-		xml/$(LANG)/books.xml					\
+$(OUT)/$(DOC_LANG)/books.html:						\
+		xml/$(DOC_LANG)/books.xml				\
 		$(BOOK_DEPS)
 	$(call XSLT, xslt/books.xslt, $<, $@)
--- a/xml/he/GNUmakefile	Wed Nov 30 10:53:24 2011 +0000
+++ b/xml/he/GNUmakefile	Wed Nov 30 13:40:46 2011 +0000
@@ -1,37 +1,37 @@
-LANG =		he
+DOC_LANG =	he
 
 DOCS =									\
 		introduction						\
 		howto							\
 		windows							\
 
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(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)
 
 INTRO =									\
 		http/server_names					\
 
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(LANG)/docs/$(name).html)
+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/$(LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(LANG)/docs/$(name).html)
+HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(DOC_LANG)/docs/$(name).xml)
+HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-$(LANG):								\
-		$(OUT)/$(LANG)/index.html				\
-		$(OUT)/$(LANG)/docs/index.html				\
+$(DOC_LANG):								\
+		$(OUT)/$(DOC_LANG)/index.html				\
+		$(OUT)/$(DOC_LANG)/docs/index.html			\
 		$(DOCS_HTML)						\
 		$(INTRO_HTML)						\
 		$(HOWTO_HTML)						\
 
-$(OUT)/$(LANG)/docs/index.html:						\
+$(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 
-$(OUT)/$(LANG)/docs/introduction.html:					\
+$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
 		$(INTRO_XML)						\
 
-$(OUT)/$(LANG)/docs/howto.html:						\
+$(OUT)/$(DOC_LANG)/docs/howto.html:					\
 		$(HOWTO_XML)						\
--- a/xml/ja/GNUmakefile	Wed Nov 30 10:53:24 2011 +0000
+++ b/xml/ja/GNUmakefile	Wed Nov 30 13:40:46 2011 +0000
@@ -1,47 +1,47 @@
-LANG =		ja
+DOC_LANG =	ja
 
 DOCS =									\
 		introduction						\
 		howto							\
 		faq							\
 
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(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)
 
 INTRO =									\
 		http/request_processing					\
 		http/server_names					\
 		http/configuring_https_servers				\
 
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(LANG)/docs/$(name).html)
+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/$(LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(LANG)/docs/$(name).html)
+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						\
 
-FAQ_XML =	$(foreach name, $(FAQ), xml/$(LANG)/docs/$(name).xml)
-FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(LANG)/docs/$(name).html)
+FAQ_XML =	$(foreach name, $(FAQ), xml/$(DOC_LANG)/docs/$(name).xml)
+FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-$(LANG):								\
-		$(OUT)/$(LANG)/index.html				\
-		$(OUT)/$(LANG)/docs/index.html				\
+$(DOC_LANG):								\
+		$(OUT)/$(DOC_LANG)/index.html				\
+		$(OUT)/$(DOC_LANG)/docs/index.html			\
 		$(DOCS_HTML)						\
 		$(INTRO_HTML)						\
 		$(HOWTO_HTML)						\
 		$(FAQ_HTML)						\
 
-$(OUT)/$(LANG)/docs/introduction.html:					\
+$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
 		$(INTRO_XML)						\
 
-$(OUT)/$(LANG)/docs/howto.html:						\
+$(OUT)/$(DOC_LANG)/docs/howto.html:					\
 		$(HOWTO_XML)						\
 
-$(OUT)/$(LANG)/docs/faq.html:						\
+$(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/ru/GNUmakefile	Wed Nov 30 10:53:24 2011 +0000
+++ b/xml/ru/GNUmakefile	Wed Nov 30 13:40:46 2011 +0000
@@ -1,4 +1,4 @@
-LANG =		ru
+DOC_LANG =	ru
 
 DOCS =									\
 		howto							\
@@ -13,20 +13,20 @@
 		control							\
 		hash							\
 
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(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)
 
 HOWTO =									\
 		debugging_log						\
 
-HOWTO_XML =	$(foreach name, $(HOWTO), xml/$(LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(LANG)/docs/$(name).html)
+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						\
 
-FAQ_XML =	$(foreach name, $(FAQ), xml/$(LANG)/docs/$(name).xml)
-FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(LANG)/docs/$(name).html)
+FAQ_XML =	$(foreach name, $(FAQ), xml/$(DOC_LANG)/docs/$(name).xml)
+FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
 REFS =									\
 		ngx_core_module						\
@@ -70,26 +70,26 @@
 		http/ngx_http_userid_module				\
 		http/ngx_http_xslt_module				\
 
-REFS_XML =	$(foreach name, $(REFS), xml/$(LANG)/docs/$(name).xml)
-REFS_HTML =	$(foreach name, $(REFS), $(OUT)/$(LANG)/docs/$(name).html)
+REFS_XML =	$(foreach name, $(REFS), xml/$(DOC_LANG)/docs/$(name).xml)
+REFS_HTML =	$(foreach name, $(REFS), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-$(LANG):								\
-		$(OUT)/$(LANG)/index.html				\
-		$(OUT)/$(LANG)/download.html				\
-		$(OUT)/$(LANG)/support.html				\
-		$(OUT)/$(LANG)/docs/index.html				\
+$(DOC_LANG):								\
+		$(OUT)/$(DOC_LANG)/index.html				\
+		$(OUT)/$(DOC_LANG)/download.html			\
+		$(OUT)/$(DOC_LANG)/support.html				\
+		$(OUT)/$(DOC_LANG)/docs/index.html			\
 		$(DOCS_HTML)						\
 		$(REFS_HTML)						\
 		$(HOWTO_HTML)						\
 		$(FAQ_HTML)						\
 
-$(OUT)/$(LANG)/download.html:						\
-		xml/$(LANG)/download.xml				\
+$(OUT)/$(DOC_LANG)/download.html:					\
+		xml/$(DOC_LANG)/download.xml				\
 		$(DOWNLOAD_DEPS)
 	$(call XSLT, xslt/download.xslt, $<, $@)
 
-$(OUT)/$(LANG)/docs/howto.html:						\
+$(OUT)/$(DOC_LANG)/docs/howto.html:					\
 		$(HOWTO_XML)						\
 
-$(OUT)/$(LANG)/docs/faq.html:						\
+$(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\
--- a/xml/tr/GNUmakefile	Wed Nov 30 10:53:24 2011 +0000
+++ b/xml/tr/GNUmakefile	Wed Nov 30 13:40:46 2011 +0000
@@ -1,4 +1,4 @@
-LANG =		tr
+DOC_LANG =	tr
 
 DOCS =									\
 		introduction						\
@@ -6,46 +6,46 @@
 		faq							\
 		windows							\
 
-DOCS_XML =	$(foreach name, $(DOCS), xml/$(LANG)/docs/$(name).xml)
-DOCS_HTML =	$(foreach name, $(DOCS), $(OUT)/$(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)
 
 INTRO =									\
 		http/request_processing					\
 		http/server_names					\
 		http/configuring_https_servers				\
 
-INTRO_XML =	$(foreach name, $(INTRO), xml/$(LANG)/docs/$(name).xml)
-INTRO_HTML =	$(foreach name, $(INTRO), $(OUT)/$(LANG)/docs/$(name).html)
+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/$(LANG)/docs/$(name).xml)
-HOWTO_HTML =	$(foreach name, $(HOWTO), $(OUT)/$(LANG)/docs/$(name).html)
+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						\
 
-FAQ_XML =	$(foreach name, $(FAQ), xml/$(LANG)/docs/$(name).xml)
-FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(LANG)/docs/$(name).html)
+FAQ_XML =	$(foreach name, $(FAQ), xml/$(DOC_LANG)/docs/$(name).xml)
+FAQ_HTML =	$(foreach name, $(FAQ), $(OUT)/$(DOC_LANG)/docs/$(name).html)
 
-$(LANG):								\
-		$(OUT)/$(LANG)/index.html				\
-		$(OUT)/$(LANG)/docs/index.html				\
+$(DOC_LANG):								\
+		$(OUT)/$(DOC_LANG)/index.html				\
+		$(OUT)/$(DOC_LANG)/docs/index.html			\
 		$(DOCS_HTML)						\
 		$(INTRO_HTML)						\
 		$(HOWTO_HTML)						\
 		$(FAQ_HTML)						\
 
-$(OUT)/$(LANG)/docs/index.html:						\
+$(OUT)/$(DOC_LANG)/docs/index.html:					\
 		$(DOCS_XML)						\
 
-$(OUT)/$(LANG)/docs/introduction.html:					\
+$(OUT)/$(DOC_LANG)/docs/introduction.html:				\
 		$(INTRO_XML)						\
 
-$(OUT)/$(LANG)/docs/howto.html:						\
+$(OUT)/$(DOC_LANG)/docs/howto.html:					\
 		$(HOWTO_XML)						\
 
-$(OUT)/$(LANG)/docs/faq.html:						\
+$(OUT)/$(DOC_LANG)/docs/faq.html:					\
 		$(FAQ_XML)						\