Merge the following from the English version:

1.110 -> 1.114 Makefile 1.103 -> 1.113 index.xsl 1.239 -> 1.241 news/news.xml Obtained from: The FreeBSD Russian Documentation Project
svn path=/www/; revision=22753
2004-11-02 08:53:08 +00:00 · 2004-11-02 08:53:08 +00:00 · d67634a49f · 2020-12-08 03:00:23 +00:00
commit d67634a49f
parent 76d08a7266
3 changed files with 68 additions and 13 deletions
--- a/ru/Makefile
+++ b/ru/Makefile
@ -4,7 +4,7 @@
 # $FreeBSD$
 # $FreeBSDru: frdp/www/ru/Makefile,v 1.38 2004/10/22 12:33:49 den Exp $
 #
-# Original revision: 1.110
+# Original revision: 1.114
 #

 .if exists(Makefile.conf)
@ -49,7 +49,6 @@ SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
-#SUBDIR+= gallery
 SUBDIR+= projects
 #SUBDIR+= prstats
 SUBDIR+= platforms
@ -84,11 +83,14 @@ XML_NEWS_PRESS=		${XML_NEWS_PRESS_MASTER}

 index.html: index.xsl ${XML_INCLUDES}\
 		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
-		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}
+		${XML_MIRRORS} ${XML_TRANSTABLE} \
+		${XML_ADVISORIES} ${XML_NOTICES} \
+		${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
+		--param notices.xml "'${XML_NOTICES}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
--- a/ru/index.xsl
+++ b/ru/index.xsl
@ -6,7 +6,7 @@
     $FreeBSD$
     $FreeBSDru: frdp/www/ru/index.xsl,v 1.38 2004/10/22 12:33:49 den Exp $

-     Original revision: 1.103
+     Original revision: 1.113
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@ -21,6 +21,7 @@
  <!-- these params should be externally bound. The values
       here are not used actually -->
  <xsl:param name="advisories.xml" select="'none'"/>
+  <xsl:param name="notices.xml" select="'none'"/>
  <xsl:param name="mirrors.xml" select="'none'"/>
  <xsl:param name="news.press.xml" select="'none'"/>
  <xsl:param name="news.project.xml" select="'none'"/>
@ -46,6 +47,11 @@

 	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>

+	<link rel="alternate" type="application/rss+xml"
+	  title="FreeBSD Project News" href="{$base}/ru/news/news.rdf" />
+	<link rel="alternate" type="application/rss+xml"
+	  title="FreeBSD Security Advisories" href="{$base}/security/advisories.rdf" />
+
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
 	ìÏ×ÕÛËÁ ÄÌÑ ÓÐÁÍÅÒÏ×, ÎÅ ÐÉÛÉÔÅ ÐÏ ÁÄÒÅÓÕ:
@ -201,14 +207,14 @@
 		<i>Ó×ÏÂÏÄÎÏ</i></font></h2>
 	    
 	      <a href="copyright/daemon.html"><img
-                src="{$base}/gifs/dae_up3.gif" alt="" height="81" width="72" 
-		align="right" border="0"/></a>
+                src="{$base}/gifs/dae_up3.gif" alt="BSD ÄÁÅÍÏÎ" height="81"
+		width="72" align="right" border="0"/></a>

 	      <p>èÏÔÑ ×Ù ÍÏÖÅÔÅ ÐÏÄÕÍÁÔØ, ÞÔÏ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ Ó ÔÁËÉÍÉ
 		×ÏÚÍÏÖÎÏÓÔÑÍÉ ÐÒÏÄÁ£ÔÓÑ ÐÏ ×ÙÓÏËÏÊ ÃÅÎÅ, FreeBSD
 		ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ <a href="copyright/index.html">ÂÅÓÐÌÁÔÎÏ</a>
                É ÐÏÓÔÁ×ÌÑÅÔÓÑ ÓÏ ×ÓÅÍÉ ÉÓÈÏÄÎÙÍÉ ÔÅËÓÔÁÍÉ. åÓÌÉ ×ÁÍ ÚÁÈÏÞÅÔÓÑ
-		Å£ ÐÏÐÒÏÂÏ×ÁÔØ, ÏÂÒÁÔÉÔÅÓØ Ë <a
+		ËÕÐÉÔØ ÉÌÉ ÚÁÇÒÕÚÉÔØ Å£ ËÏÐÉÀ, ÏÂÒÁÔÉÔÅÓØ Ë <a
 		href="{$base}/doc/ru_RU.KOI8-R/books/handbook/mirrors.html">
 		ÓÌÅÄÕÀÝÅÊ ÉÎÆÏÒÍÁÃÉÉ</a>.</p>

@ -256,12 +262,11 @@
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
 			<td valign="top"><p>
-			      <a href="{$u.rel.early}">
+			      <a href="{$u.rel.announce}">
 			      <font size="+1" color="#990000"><b>îÏ×ÙÊ ÔÅÈÎÏÌÏÇÉÞÅÓËÉÊ ÒÅÌÉÚ:
 			    <xsl:value-of select="$rel.current"/></b></font></a><br/>

-			    <small>&#183; <a href="{$u.rel.announce}">áÎÏÎÓ</a><br/>
-			      &#183; <a href="{$base}/doc/ru_RU.KOI8-R/books/handbook/install.html">òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
+			    <small>&#183; <a href="{$base}/doc/ru_RU.KOI8-R/books/handbook/install.html">òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
 			      &#183; <a href="{$u.rel.notes}">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a><br/>
 			      &#183; <a href="{$u.rel.hardware}">éÎÆÏÒÍÁÃÉÑ Ï ÏÂÏÒÕÄÏ×ÁÎÉÉ</a><br/>
 			      &#183; <a href="{$u.rel.installation}">úÁÍÅÔËÉ ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
@ -273,8 +278,7 @@
 			      <font size="+1" color="#990000"><b>ðÒÏÄÕËÔÉ×ÎÙÊ ÒÅÌÉÚ:
 			    <xsl:value-of select="$rel2.current"/></b></font></a><br/>

-                            <small>&#183; <a href="{$u.rel2.announce}">áÎÏÎÓ</a><br/>
-                              &#183; <a href="{$base}/doc/ru_RU.KOI8-R/books/handbook/install.html">òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
+                            <small>&#183; <a href="{$base}/doc/ru_RU.KOI8-R/books/handbook/install.html">òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
                              &#183; <a href="{$u.rel2.notes}">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a><br/>
                              &#183; <a href="{$u.rel2.hardware}">éÎÆÏÒÍÁÃÉÑ Ï ÏÂÏÒÕÄÏ×ÁÎÉÉ</a><br/>
 			      &#183; <a href="{$u.rel2.installation}">úÁÍÅÔËÉ ÐÏ ÕÓÔÁÎÏ×ËÅ</a><br/>
@ -323,17 +327,38 @@
                             ðÏÓÌÅÄÎÅÅ ÏÂÎÏ×ÌÅÎÉÅ:
 			      <xsl:call-template name="html-index-advisories-items-lastmodified">
 				<xsl:with-param name="advisories.xml" select="$advisories.xml" />
+				<xsl:with-param name="type" select="'advisory'" />
 			      </xsl:call-template>

 			      <br/>

 			      <xsl:call-template name="html-index-advisories-items">
 				<xsl:with-param name="advisories.xml" select="$advisories.xml" />
+				<xsl:with-param name="type" select="'advisory'" />
 			      </xsl:call-template>

                             <a href="security/">äÏÐÏÌÎÉÔÅÌØÎÏ...</a>
 			    </font>
 			  </p>
+
+			  <p><font size="+1" color="#990000"><b>óÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ</b></font>
+			    <xsl:text> </xsl:text>
+			    <br/>
+			    <font size="-1">
+			      ðÏÓÌÅÄÎÅÅ ÏÂÎÏ×ÌÅÎÉÅ: 
+			      <xsl:call-template name="html-index-advisories-items-lastmodified">
+				<xsl:with-param name="advisories.xml" select="$notices.xml" />
+				<xsl:with-param name="type" select="'notice'" />
+			      </xsl:call-template>
+
+			      <br/>
+
+			      <xsl:call-template name="html-index-advisories-items">
+				<xsl:with-param name="advisories.xml" select="$notices.xml" />
+				<xsl:with-param name="type" select="'notice'" />
+			      </xsl:call-template>
+			    </font>
+			  </p>
 			</td>
 		      </tr>
 		    </table>
--- a/ru/news/news.xml
+++ b/ru/news/news.xml
@ -5,7 +5,7 @@

     $FreeBSDru: frdp/www/ru/news/news.xml,v 1.45 2004/10/22 13:25:41 den Exp $

-     Original revision: 1.239
+     Original revision: 1.241
 -->

 <!-- Simple schema for FreeBSD Project news.
@ -39,6 +39,34 @@
    <month>
      <name>10</name>

+	<day>
+	  <name>31</name>
+
+	  <event>
+	    <title>Выпущена FreeBSD 5.3-RC2</title>
+
+	    <p>Группа подготовки релизов FreeBSD рада сообщить о
+	      доступности FreeBSD 5.3-RC2.  Две серьезные ошибки
+	      были обнаружены во время тестирования RC1, и еще один
+	      релиз-кандидат выпущен для широкого тестирования.  Если не
+	      будет обнаружено других критических ошибок, этот
+	      релиз-кандидат станет последним тестовым релизом перед
+	      5.3-RELEASE.  Полный анонс доступен в рассылке
+	      FreeBSD-CURRENT <a
+	      href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=219950+0+current/freebsd-current">по
+	      этому адресу</a>.</p>
+	  </event>
+	</day>
+	
+	<day>
+	  <name>29</name>
+
+	  <event>
+	    <p>Новый коммиттер: <a
+	      href="mailto:ahze@FreeBSD.org">Michael Johnson</a> (ports)</p>
+	  </event>
+	</day>
+
 	<day>
 	  <name>16</name>