diff --git a/ru/Makefile b/ru/Makefile
index 61aba9523a..59024ef408 100644
--- a/ru/Makefile
+++ b/ru/Makefile
@@ -2,9 +2,9 @@
# The FreeBSD Russian Documentation Project
#
# $FreeBSD$
-# $FreeBSDru: frdp/www/ru/Makefile,v 1.27 2003/10/22 16:55:50 andy Exp $
+# $FreeBSDru: frdp/www/ru/Makefile,v 1.29 2003/11/27 14:01:07 den Exp $
#
-# Original revision: 1.98
+# Original revision: 1.102
#
.if exists(Makefile.conf)
@@ -86,13 +86,6 @@ WEBDIR?= data/ru
DATA+= index.html
CLEANFILES+= index.html
-index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl ../en/security/advisories.xml
- ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
- ${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
-.if !defined(NO_TIDY)
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
WEBCHECK?= ${PREFIX}/bin/webcheck
WEBCHECKOPTS?= -ab ${WEBCHECKFLAGS}
WEBCHECKDIR?= /webcheck
@@ -104,3 +97,15 @@ webcheck:
${WEBCHECK} ${WEBCHECKOPTS} -o ${WEBCHECKINSTALLDIR} ${WEBCHECKURL}
.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
+index.html: index.xsl ${XML_INCLUDES}\
+ ${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS}\
+ ${XML_MIRRORS} ${XML_ADVISORIES}
+ ${XSLTPROC} ${XSLTPROCOPTS} \
+ -o $@ \
+ --param mirrors.xml "'${XML_MIRRORS}'" \
+ --param advisories.xml "'${XML_ADVISORIES}'" \
+ ${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
diff --git a/ru/includes.xsl b/ru/includes.xsl
index af0a89b626..8dc04b563d 100644
--- a/ru/includes.xsl
+++ b/ru/includes.xsl
@@ -4,13 +4,19 @@
The FreeBSD Russian Documentation Project
$FreeBSD$
- $FreeBSDru: frdp/www/ru/includes.xsl,v 1.10 2003/10/29 13:52:54 den Exp $
+ $FreeBSDru: frdp/www/ru/includes.xsl,v 1.12 2003/11/27 14:01:07 den Exp $
- Original revision: 1.17
+ Original revision: 1.20
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:import href="../share/sgml/includes.xsl" />
+
+ <xsl:variable name="url.doc.langcode" select="'ru_RU.KOI8-R'" />
+
+ <!-- Language-specific definitions should be put below this line -->
+
<xsl:variable name="i.daemon">
<img src="{$base}/../gifs/daemon.gif" alt="" align="left" width="80" height="76"/>
</xsl:variable>
@@ -19,25 +25,6 @@
<img src="{$base}/../gifs/new.gif" alt="[New!]" width="28" height="11"/>
</xsl:variable>
- <xsl:variable name="copyright">
- <a href="{$base}/copyright/index.html">Copyright</a> © 1995-2003 the FreeBSD Project. All rights reserved.
- </xsl:variable>
-
- <!-- Often used trademarks -->
- <xsl:variable name="unix" select="'UNIX®'"/>
- <xsl:variable name="java" select="'Java™'"/>
- <xsl:variable name="jdk" select="'JDK™'"/>
- <xsl:variable name="posix" select="'POSIX®'"/>
-
- <xsl:variable name="email" select="'freebsd-questions'"/>
- <xsl:variable name="author">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat($base, '/mailto.html')"/>
- </xsl:attribute>
- <xsl:value-of select="$email"/>@FreeBSD.org</a><br/><xsl:copy-of select="$copyright"/>
- </xsl:variable>
-
<xsl:variable name="home">
<a href="{$base}/index.html"><img src="{$base}/../gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"/></a>
</xsl:variable>
@@ -51,12 +38,6 @@
</head>
</xsl:variable>
- <xsl:attribute-set name="att.body">
- <xsl:attribute name="text">#000000</xsl:attribute>
- <xsl:attribute name="bgcolor">#FFFFFF</xsl:attribute>
- <xsl:attribute name="alink">#FFCC33</xsl:attribute>
- </xsl:attribute-set>
-
<xsl:variable name="header2">
<img src="{$base}/../gifs/bar.gif" alt="Navigation Bar" width="565"
height="33" border="0" usemap="#bar"/>
@@ -87,13 +68,6 @@
</map>
</xsl:variable>
- <xsl:variable name="footer">
- <hr noshade="noshade"/>
- <address><xsl:copy-of select="$author"/><br/>
- <xsl:copy-of select="$date"/></address>
- </xsl:variable>
-
- <xsl:variable name="rel.current" select='"5.1"'/>
<xsl:variable name="u.rel.notes">
<xsl:value-of select="$base"/>/../releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
@@ -106,8 +80,6 @@
<xsl:variable name="u.rel.early">
<xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
- <xsl:variable name="rel2.current" select='"4.9"'/>
-
<xsl:variable name="u.rel2.notes">
<xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
diff --git a/ru/index.xsl b/ru/index.xsl
index 2ab5f98b6b..f2fb0d4741 100644
--- a/ru/index.xsl
+++ b/ru/index.xsl
@@ -4,9 +4,9 @@
The FreeBSD Russian Documentation Project
$FreeBSD$
- $FreeBSDru: frdp/www/ru/index.xsl,v 1.23 2003/10/31 06:16:33 den Exp $
+ $FreeBSDru: frdp/www/ru/index.xsl,v 1.25 2003/11/27 14:01:07 den Exp $
- Original revision: 1.80
+ Original revision: 1.83
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -62,105 +62,9 @@
which are not mirrored should be listed in
support.sgml. -->
- <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">IPv6 (6Bone) ������</option>
- <option value="http://www2.at.FreeBSD.org/">IPv6 �������</option>
- <option value="http://www1.uk.FreeBSD.org/">IPv6 ��������������</option>
- <option value="http://www2.de.FreeBSD.org">IPv6 ��������</option>
- <option value="http://www.dk.FreeBSD.org/">IPv6 �����</option>
- <option value="http://www2.no.FreeBSD.org/">IPv6 ��������</option>
- <option value="http://www4.us.FreeBSD.org/">IPv6 ���/1</option>
- <option value="http://www5.us.FreeBSD.org/">IPv6 ���/2</option>
- <option value="http://www.au.FreeBSD.org/">���������/1</option>
- <option value="http://www2.au.FreeBSD.org/">���������/2</option>
- <option value="http://www.at.FreeBSD.org/">�������/1</option>
- <option value="http://www2.at.FreeBSD.org/">�������/2</option>
- <option value="http://www.ar.FreeBSD.org/">���������</option>
- <option value="http://freebsd.unixtech.be/">�������</option>
- <option value="http://www.bg.FreeBSD.org/">��������</option>
- <option value="http://www.br.FreeBSD.org/">��������/1</option>
- <option value="http://www2.br.FreeBSD.org/www.freebsd.org/">��������/2</option>
- <option value="http://www3.br.FreeBSD.org/">��������/3</option>
- <option value="http://www.uk.FreeBSD.org/">��������������/1</option>
- <option value="http://www2.uk.FreeBSD.org/">��������������/2</option>
- <option value="http://www3.uk.FreeBSD.org/">��������������/3</option>
- <option value="http://www4.uk.FreeBSD.org/">��������������/4</option>
- <option value="http://www1.uk.FreeBSD.org/">��������������/5</option>
- <option value="http://www.hu.FreeBSD.org/">�������/1</option>
- <option value="http://www2.hu.FreeBSD.org/">�������/2</option>
- <option value="http://www.de.FreeBSD.org/">��������/1</option>
- <option value="http://www1.de.FreeBSD.org/">��������/2</option>
- <option value="http://www2.de.FreeBSD.org/">��������/3</option>
- <option value="http://www.hk.FreeBSD.org/">�������</option>
- <option value="http://www.gr.FreeBSD.org/">������/1</option>
- <option value="http://www.FreeBSD.gr/">������/2</option>
- <option value="http://www.dk.FreeBSD.org/">�����/1</option>
- <option value="http://www3.dk.FreeBSD.org/">�����/2</option>
- <option value="http://www.ie.FreeBSD.org/">��������/1</option>
- <option value="http://www2.ie.FreeBSD.org/">��������/2</option>
- <option value="http://www.is.FreeBSD.org/">��������</option>
- <option value="http://www.es.FreeBSD.org/">�������/1</option>
- <option value="http://www2.es.FreeBSD.org/">�������/2</option>
- <option value="http://www3.es.FreeBSD.org/">�������/3</option>
- <option value="http://www.it.FreeBSD.org/">������/1</option>
- <option value="http://www.gufi.org/mirrors/www.freebsd.org/data/">������/2</option>
- <option value="http://www.ca.FreeBSD.org/">������/1</option>
- <option value="http://www2.ca.FreeBSD.org/">������/2</option>
- <option value="http://www.cn.FreeBSD.org/">�����</option>
- <option value="http://www.kr.FreeBSD.org/">�����/1</option>
- <option value="http://www2.kr.FreeBSD.org/">�����/2</option>
- <option value="http://www.kw.FreeBSD.org/">������</option>
- <option value="http://www.lv.FreeBSD.org/">������</option>
- <option value="http://www.lt.FreeBSD.org/">�����</option>
- <option value="http://www.nl.FreeBSD.org/">����������/1</option>
- <option value="http://www2.nl.FreeBSD.org/">����������/2</option>
- <option value="http://www.nz.FreeBSD.org/">����� ��������</option>
- <option value="http://www.no.FreeBSD.org/">��������/1</option>
- <option value="http://www2.no.FreeBSD.org/">��������/2</option>
- <option value="http://www.pl.FreeBSD.org/">������/1</option>
- <option value="http://www2.pl.FreeBSD.org/">������/2</option>
- <option value="http://www.pt.FreeBSD.org/">����������/1</option>
- <option value="http://www4.pt.FreeBSD.org/">����������/2</option>
- <option value="http://www5.pt.FreeBSD.org/">����������/3</option>
- <option value="http://www.ru.FreeBSD.org/">������/1</option>
- <option value="http://www2.ru.FreeBSD.org/">������/2</option>
- <option value="http://www3.ru.FreeBSD.org/">������/3</option>
- <option value="http://www4.ru.FreeBSD.org/">������/4</option>
- <option value="http://www.ro.FreeBSD.org/">�������/1</option>
- <option value="http://www2.ro.FreeBSD.org/">�������/2</option>
- <option value="http://www3.ro.FreeBSD.org/">�������/3</option>
- <option value="http://www.sm.FreeBSD.org/">���-������</option>
- <option value="http://www2.sg.FreeBSD.org/">��������</option>
- <option value="http://www.sk.FreeBSD.org/">��������/1</option>
- <option value="http://www2.sk.FreeBSD.org/">��������/2</option>
- <option value="http://www.si.FreeBSD.org/">��������/1</option>
- <option value="http://www2.si.FreeBSD.org/">��������/2</option
->
- <option value="http://www2.us.FreeBSD.org/">���/1</option>
- <option value="http://www4.us.FreeBSD.org/">���/2</option>
- <option value="http://www5.us.FreeBSD.org/">���/3</option>
- <option value="http://www.tw.FreeBSD.org/">�������/1</option>
- <option value="http://www2.tw.FreeBSD.org/">�������/2</option>
- <option value="http://www3.tw.FreeBSD.org/">�������/3</option>
- <option value="http://www4.tw.FreeBSD.org/">�������/4</option>
- <option value="http://www.tr.FreeBSD.org/">������/1</option>
- <option value="http://www2.tr.FreeBSD.org/">������/2</option>
- <option value="http://www.enderunix.org/freebsd/">������/3</option>
- <option value="http://www.ua.FreeBSD.org/">�������/1</option>
- <option value="http://www2.ua.FreeBSD.org/">�������/2</option>
- <option value="http://www5.ua.FreeBSD.org/">�������/3</option>
- <option value="http://www4.ua.FreeBSD.org/">�������/����</option>
- <option value="http://www.FreeBSD.org.ph/">���������</option>
- <option value="http://www.fi.FreeBSD.org/">���������/1</option>
- <option value="http://www2.fi.FreeBSD.org/">���������/2</option>
- <option value="http://www.fr.FreeBSD.org/">�������</option>
- <option value="http://www.se.FreeBSD.org/">������/1</option>
- <option value="http://www2.se.FreeBSD.org/">������/2</option>
- <option value="http://www.ch.FreeBSD.org/">���������/1</option>
- <option value="http://www2.ch.FreeBSD.org/">���������/2</option>
- <option value="http://www.ee.FreeBSD.org/">�������</option>
- <option value="http://www.za.FreeBSD.org/">����� ������/1</option>
- <option value="http://www2.za.FreeBSD.org/">����� ������/2</option>
- <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">������</option>
+ <xsl:call-template name="html-index-mirrors-options-list">
+ <xsl:with-param name="mirrors.xml" select="$mirrors.xml" />
+ </xsl:call-template>
</select>
<input type="submit" value=" ������� "/>
@@ -491,16 +395,16 @@
<font size="-1">
��������� ����������:
<xsl:value-of
- select="document('../en/security/advisories.xml')/descendant::month[position() = 1]/name"/>
+ select="document($advisories.xml)/descendant::month[position() = 1]/name"/>
<xsl:text> </xsl:text>
<xsl:value-of
- select="document('../en/security/advisories.xml')/descendant::day[position() = 1]/name"/>
+ select="document($advisories.xml)/descendant::day[position() = 1]/name"/>
<xsl:text>, </xsl:text>
<xsl:value-of
- select="document('../en/security/advisories.xml')/descendant::year[position() = 1]/name"/>
+ select="document($advisories.xml)/descendant::year[position() = 1]/name"/>
<br/>
<!-- Pull in the 10 most recent security advisories -->
- <xsl:for-each select="document('../en/security/advisories.xml')/descendant::advisory[position() < 10]">
+ <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() < 10]">
· <a>
<xsl:attribute name="href">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/<xsl:value-of select="name"/>.asc</xsl:attribute>
<xsl:value-of select="name"/>
diff --git a/ru/security/Makefile b/ru/security/Makefile
index 0efae92148..3bb50260c6 100644
--- a/ru/security/Makefile
+++ b/ru/security/Makefile
@@ -1,9 +1,9 @@
# The FreeBSD Russian Documentation Project
#
# $FreeBSD$
-# $FreeBSDru: frdp/www/ru/security/Makefile,v 1.5 2003/10/20 07:18:47 andy Exp $
+# $FreeBSDru: frdp/www/ru/security/Makefile,v 1.6 2003/11/27 14:01:08 den Exp $
#
-# Original revision: 1.8
+# Original revision: 1.9
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -23,6 +23,6 @@ CLEANFILES+= advisories.html.inc
security.html: advisories.html.inc
-advisories.html.inc: mkindex.xsl ../../en/security/advisories.xml
+advisories.html.inc: mkindex.xsl ${XML_ADVISORIES}
${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
- ${.CURDIR}/mkindex.xsl ${.CURDIR}/../../en/security/advisories.xml
+ ${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}