# HG changeset patch # User Ruslan Ermilov # Date 1319177836 0 # Node ID 7db449e89e92a809a76e82073089c12f16752471 # Parent 871ea104fdbfd24ea69509875a56ca8bbebefbc3 Unified the use of the "name" attribute instead of "title". diff --git a/dtd/article.dtd b/dtd/article.dtd --- a/dtd/article.dtd +++ b/dtd/article.dtd @@ -1,6 +1,6 @@ diff --git a/dtd/news.dtd b/dtd/news.dtd --- a/dtd/news.dtd +++ b/dtd/news.dtd @@ -1,6 +1,6 @@ diff --git a/xml/404.xml b/xml/404.xml --- a/xml/404.xml +++ b/xml/404.xml @@ -1,3 +1,3 @@ - + diff --git a/xml/en/books.xml b/xml/en/books.xml --- a/xml/en/books.xml +++ b/xml/en/books.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/debugging_log.xml b/xml/en/docs/debugging_log.xml --- a/xml/en/docs/debugging_log.xml +++ b/xml/en/docs/debugging_log.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/faq.xml b/xml/en/docs/faq.xml --- a/xml/en/docs/faq.xml +++ b/xml/en/docs/faq.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/freebsd_tuning.xml b/xml/en/docs/freebsd_tuning.xml --- a/xml/en/docs/freebsd_tuning.xml +++ b/xml/en/docs/freebsd_tuning.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/howto.xml b/xml/en/docs/howto.xml --- a/xml/en/docs/howto.xml +++ b/xml/en/docs/howto.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/howto_build_on_win32.xml b/xml/en/docs/howto_build_on_win32.xml --- a/xml/en/docs/howto_build_on_win32.xml +++ b/xml/en/docs/howto_build_on_win32.xml @@ -2,7 +2,7 @@ -
diff --git a/xml/en/docs/http/configuring_https_servers.xml b/xml/en/docs/http/configuring_https_servers.xml --- a/xml/en/docs/http/configuring_https_servers.xml +++ b/xml/en/docs/http/configuring_https_servers.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/en/docs/http/request_processing.xml b/xml/en/docs/http/request_processing.xml --- a/xml/en/docs/http/request_processing.xml +++ b/xml/en/docs/http/request_processing.xml @@ -1,6 +1,6 @@ -
-
-
diff --git a/xml/en/docs/introduction.xml b/xml/en/docs/introduction.xml --- a/xml/en/docs/introduction.xml +++ b/xml/en/docs/introduction.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/docs/sys_errlist.xml b/xml/en/docs/sys_errlist.xml --- a/xml/en/docs/sys_errlist.xml +++ b/xml/en/docs/sys_errlist.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/en/docs/windows.xml b/xml/en/docs/windows.xml --- a/xml/en/docs/windows.xml +++ b/xml/en/docs/windows.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/donation.xml b/xml/en/donation.xml --- a/xml/en/donation.xml +++ b/xml/en/donation.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/download.xml b/xml/en/download.xml --- a/xml/en/download.xml +++ b/xml/en/download.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/index.xml b/xml/en/index.xml --- a/xml/en/index.xml +++ b/xml/en/index.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/links.xml b/xml/en/links.xml --- a/xml/en/links.xml +++ b/xml/en/links.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/en/security_advisories.xml b/xml/en/security_advisories.xml --- a/xml/en/security_advisories.xml +++ b/xml/en/security_advisories.xml @@ -1,6 +1,6 @@ -
@@ -12,32 +12,32 @@ - - - - - - - - -
diff --git a/xml/he/docs/howto.xml b/xml/he/docs/howto.xml --- a/xml/he/docs/howto.xml +++ b/xml/he/docs/howto.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/he/docs/http/converting_rewrite_rules.xml b/xml/he/docs/http/converting_rewrite_rules.xml --- a/xml/he/docs/http/converting_rewrite_rules.xml +++ b/xml/he/docs/http/converting_rewrite_rules.xml @@ -1,6 +1,6 @@ -
-
-
diff --git a/xml/he/docs/introduction.xml b/xml/he/docs/introduction.xml --- a/xml/he/docs/introduction.xml +++ b/xml/he/docs/introduction.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/he/docs/windows.xml b/xml/he/docs/windows.xml --- a/xml/he/docs/windows.xml +++ b/xml/he/docs/windows.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/he/index.xml b/xml/he/index.xml --- a/xml/he/index.xml +++ b/xml/he/index.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/index.xml b/xml/index.xml --- a/xml/index.xml +++ b/xml/index.xml @@ -1,6 +1,6 @@ - + diff --git a/xml/ja/docs/debugging_log.xml b/xml/ja/docs/debugging_log.xml --- a/xml/ja/docs/debugging_log.xml +++ b/xml/ja/docs/debugging_log.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ja/docs/faq.xml b/xml/ja/docs/faq.xml --- a/xml/ja/docs/faq.xml +++ b/xml/ja/docs/faq.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ja/docs/howto.xml b/xml/ja/docs/howto.xml --- a/xml/ja/docs/howto.xml +++ b/xml/ja/docs/howto.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ja/docs/http/configuring_https_servers.xml b/xml/ja/docs/http/configuring_https_servers.xml --- a/xml/ja/docs/http/configuring_https_servers.xml +++ b/xml/ja/docs/http/configuring_https_servers.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/ja/docs/http/request_processing.xml b/xml/ja/docs/http/request_processing.xml --- a/xml/ja/docs/http/request_processing.xml +++ b/xml/ja/docs/http/request_processing.xml @@ -1,6 +1,6 @@ -
-
-
diff --git a/xml/ja/docs/introduction.xml b/xml/ja/docs/introduction.xml --- a/xml/ja/docs/introduction.xml +++ b/xml/ja/docs/introduction.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ja/docs/sys_errlist.xml b/xml/ja/docs/sys_errlist.xml --- a/xml/ja/docs/sys_errlist.xml +++ b/xml/ja/docs/sys_errlist.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/ru/docs/control.xml b/xml/ru/docs/control.xml --- a/xml/ru/docs/control.xml +++ b/xml/ru/docs/control.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/events.xml b/xml/ru/docs/events.xml --- a/xml/ru/docs/events.xml +++ b/xml/ru/docs/events.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/example.xml b/xml/ru/docs/example.xml --- a/xml/ru/docs/example.xml +++ b/xml/ru/docs/example.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/faq.xml b/xml/ru/docs/faq.xml --- a/xml/ru/docs/faq.xml +++ b/xml/ru/docs/faq.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/hash.xml b/xml/ru/docs/hash.xml --- a/xml/ru/docs/hash.xml +++ b/xml/ru/docs/hash.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/index.xml b/xml/ru/docs/index.xml --- a/xml/ru/docs/index.xml +++ b/xml/ru/docs/index.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/install.xml b/xml/ru/docs/install.xml --- a/xml/ru/docs/install.xml +++ b/xml/ru/docs/install.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/switches.xml b/xml/ru/docs/switches.xml --- a/xml/ru/docs/switches.xml +++ b/xml/ru/docs/switches.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/syntax.xml b/xml/ru/docs/syntax.xml --- a/xml/ru/docs/syntax.xml +++ b/xml/ru/docs/syntax.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/docs/sys_errlist.xml b/xml/ru/docs/sys_errlist.xml --- a/xml/ru/docs/sys_errlist.xml +++ b/xml/ru/docs/sys_errlist.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/ru/docs/windows.xml b/xml/ru/docs/windows.xml --- a/xml/ru/docs/windows.xml +++ b/xml/ru/docs/windows.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/download.xml b/xml/ru/download.xml --- a/xml/ru/download.xml +++ b/xml/ru/download.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/index.xml b/xml/ru/index.xml --- a/xml/ru/index.xml +++ b/xml/ru/index.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/ru/support.xml b/xml/ru/support.xml --- a/xml/ru/support.xml +++ b/xml/ru/support.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/tr/docs/debugging_log.xml b/xml/tr/docs/debugging_log.xml --- a/xml/tr/docs/debugging_log.xml +++ b/xml/tr/docs/debugging_log.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/tr/docs/faq.xml b/xml/tr/docs/faq.xml --- a/xml/tr/docs/faq.xml +++ b/xml/tr/docs/faq.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/tr/docs/howto.xml b/xml/tr/docs/howto.xml --- a/xml/tr/docs/howto.xml +++ b/xml/tr/docs/howto.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/tr/docs/http/configuring_https_servers.xml b/xml/tr/docs/http/configuring_https_servers.xml --- a/xml/tr/docs/http/configuring_https_servers.xml +++ b/xml/tr/docs/http/configuring_https_servers.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/tr/docs/http/request_processing.xml b/xml/tr/docs/http/request_processing.xml --- a/xml/tr/docs/http/request_processing.xml +++ b/xml/tr/docs/http/request_processing.xml @@ -1,6 +1,6 @@ -
-
-
diff --git a/xml/tr/docs/introduction.xml b/xml/tr/docs/introduction.xml --- a/xml/tr/docs/introduction.xml +++ b/xml/tr/docs/introduction.xml @@ -1,6 +1,6 @@ -
diff --git a/xml/tr/docs/sys_errlist.xml b/xml/tr/docs/sys_errlist.xml --- a/xml/tr/docs/sys_errlist.xml +++ b/xml/tr/docs/sys_errlist.xml @@ -1,6 +1,6 @@ -
-
diff --git a/xml/tr/index.xml b/xml/tr/index.xml --- a/xml/tr/index.xml +++ b/xml/tr/index.xml @@ -1,6 +1,6 @@ -
diff --git a/xsls/article.xsls b/xsls/article.xsls --- a/xsls/article.xsls +++ b/xsls/article.xsls @@ -25,61 +25,35 @@ X:include href = "content.xslt"; X:include href = "versions.xslt"; -X:template = "/article" { - +X:template = "/article | /module" { + - !{@title} + - !style (lang="$LANG") + !{@name} + + !style (lang="@lang") - !body (lang="$LANG") + !body (lang="@lang") } -X:template = "/article[@lang='he']" { - +X:template = "/article[@lang='he'] | /module[@lang='he']" { + - !{@title} + - !style (lang="$LANG") + !{@name} + + !style (lang="@lang") - !body (lang="$LANG") - - -} - - -X:template = "/module" { - - - !{@title} - - !style (lang="$LANG") - - - - !body (lang="$LANG") - - -} - - -X:template = "/module[@lang='he']" { - - - !{@title} - - !style (lang="$LANG") - - - - !body (lang="$LANG") + !body (lang="@lang") } diff --git a/xsls/body.xsls b/xsls/body.xsls --- a/xsls/body.xsls +++ b/xsls/body.xsls @@ -15,7 +15,7 @@ X:template body (lang) {

- !{@name | @title} X:if "$YEAR" { X:text{: } !{$YEAR} } + !{@name} X:if "$YEAR" { X:text{: } !{$YEAR} }

diff --git a/xsls/books.xsls b/xsls/books.xsls --- a/xsls/books.xsls +++ b/xsls/books.xsls @@ -24,13 +24,13 @@ X:include href = "content.xslt"; X:template = "/article" { - !{@title} + !{@name} !style () - !body (lang="/article/@lang") + !body (lang="@lang") } diff --git a/xsls/download.xsls b/xsls/download.xsls --- a/xsls/download.xsls +++ b/xsls/download.xsls @@ -24,13 +24,13 @@ X:include href = "content.xslt"; X:template = "/article" { - !{@title} + !{@name} !style () - !body (lang="/article/@lang") + !body (lang="@lang") } diff --git a/xsls/error.xsls b/xsls/error.xsls --- a/xsls/error.xsls +++ b/xsls/error.xsls @@ -12,7 +12,7 @@ X:param XML = "'../xml'"; X:template = "/error" { - !{@title} + !{@name}