MFen:

1.170 -> 1.175 index.xsl 1.103 -> 1.123 where.sgml 1.17 -> 1.20 events/Makefile 1.110 -> 1.130 releases/index.sgml 1.293 -> 1.297 releng/index.sgml 1.221 -> 1.223 security/security.sgml resync -> 1.18 share/sgml/header.ent (header.l10n.ent) resync -> 1.66 share/sgml/release.ent (l10n.ent) resync -> 1.32 share/sgml/navibar.ent (navibar.l10n.ent)
svn path=/www/; revision=38189
2012-01-11 14:02:59 +00:00 · 2012-01-11 14:02:59 +00:00 · 5359dbc477 · 2020-12-08 03:00:23 +00:00
commit 5359dbc477
parent 25236728a3
9 changed files with 371 additions and 134 deletions
--- a/ru/events/Makefile
+++ b/ru/events/Makefile
@ -1,10 +1,10 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/events/Makefile,v 1.4 2009/12/23 00:53:39 hrs Exp $
+# $FreeBSD: www/ru/events/Makefile,v 1.5 2009/12/23 13:39:06 bland Exp $
 # $FreeBSDru: frdp/www/ru/events/Makefile,v 1.3 2005/06/18 06:00:21 andy Exp $
 #
-# Original revision: 1.17
+# Original revision: 1.20
 #

 .if exists(../Makefile.conf)
@ -15,12 +15,12 @@
 .endif

 #SUBDIR=  2002
-SUBDIR+= 2003
+SUBDIR= 2003

 # The year the top level events.html file starts from:
-YEARSTART= 2009
+YEARSTART= 2011
 # Years to generate past events pages for and link from top level:
-PASTYEARS= 2008 2007 2006 2005 2004 2003
+PASTYEARS= 2010 2009 2008 2007 2006 2005 2004 2003

 DATA=	events.css
 INDEXLINK=	events.html
@ -34,7 +34,7 @@ DEPENDSET.events=	events
 XMLDOCS+=		events${year}:${XSL_EVENTS_PAST}:${XML_EVENTS_EVENTS}:
 PARAMS.events${year}=	--param year ${year}
 PARAMS.events${year}+=	--stringparam pastyears '${PASTYEARS}'
-DEPENDSET.events${year}= events${year}
+DEPENDSET.events${year}= events
 .endfor

 XMLDOCS+=		events_ics:${XSL_EVENTS_ICS}:${XML_EVENTS_EVENTS}:events.ics
--- a/ru/index.xsl
+++ b/ru/index.xsl
@ -7,10 +7,10 @@
 <!--
     The FreeBSD Russian Documentation Project

-     $FreeBSD: www/ru/index.xsl,v 1.40 2011/05/19 10:59:52 pluknet Exp $
+     $FreeBSD: www/ru/index.xsl,v 1.41 2011/05/24 15:01:16 pluknet Exp $
     $FreeBSDru: frdp/www/ru/index.xsl,v 1.47 2006/01/16 21:27:51 gad Exp $

-     Original revision: 1.170
+     Original revision: 1.175
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@ -54,6 +54,7 @@
    <link rel="stylesheet" media="screen" href="&enbase;/layout/css/fixed.css?20060509" type="text/css" title="Normal Text" />
    <link rel="alternate stylesheet" media="screen" href="&enbase;/layout/css/fixed_large.css" type="text/css" title="Large Text" />
    <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script>
+    <script type="text/javascript" src="&enbase;/layout/js/google.js"></script>
 	<link rel="alternate" type="application/rss+xml"
 	  title="îÏ×ÏÓÔÉ ÐÒÏÅËÔÁ FreeBSD" href="&enbase;/news/rss.xml" />
 	<link rel="alternate" type="application/rss+xml"
@ -125,21 +126,27 @@
 			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
 				  <h2><a href="&base;/releases/">ðïóìåäîéå òåìéúù</a></h2>
 				  <ul id="FRONTRELEASESLIST">
+					<!-- XXX: Uncomment this for
+					     9.0-RELEASE
 					<li>
-					  <a href="../&u.rel.announce;">ðÒÏÄÕËÔÉ×ÎÙÊ ÒÅÌÉÚ &rel.current;</a>
+					  <a href="../&u.rel.announce;">ðÒÏÄÕËÔÉ×ÎÙÊ: &rel.current;</a>
+					</li>
+					-->
+					<li>
+					  <a href="../&u.rel2.announce;">ðÒÏÄÕËÔÉ×ÎÙÊ: &rel2.current;</a>
 					</li>
 					<li>
-					  <a href="../&u.rel2.announce;">(óÔÁÒÙÊ) ðÒÏÄÕËÔÉ×ÎÙÊ ÒÅÌÉÚ &rel2.current;</a>
-					</li>
+					  <a href="../&u.rel3.announce;">óÔÁÒÙÊ: &rel3.current;</a>
+ 					</li>
 			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					<li>
-					  <a href="&base;/where.html#helptest">Upcoming Release
+					  <a href="&base;/where.html#helptest">ðÒÅÄÓÔÏÑÝÉÊ:
 				            &betarel.current; - &betarel.vers;</a>
 					</li>
 			    </xsl:if>
 			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
 					<li>
-					  <a href="&base;/where.html#helptest">Upcoming Release
+					  <a href="&base;/where.html#helptest">ðÒÅÄÓÔÏÑÝÉÊ:
 				            &betarel2.current; - &betarel2.vers;</a>
 					</li>
 			    </xsl:if>
--- a/ru/releases/index.sgml
+++ b/ru/releases/index.sgml
@ -3,12 +3,12 @@

     $FreeBSDru: frdp/www/ru/releases/index.sgml,v 1.37 2006/07/19 08:20:23 den Exp $

-     Original revision: 1.110
+     Original revision: 1.130
 -->

 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/releases/index.sgml,v 1.28 2009/01/05 15:47:47 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releases/index.sgml,v 1.29 2010/12/03 07:18:38 maxim Exp $">
 <!ENTITY title "éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÁÈ">
 <!ENTITY % navinclude.download "INCLUDE">
 ]>
@ -41,13 +41,12 @@
      <a href="&u.rel2.announce;">áÎÏÎÓ</a> :
      <a href="&u.rel2.notes;">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a> :
      <a href="&u.rel2.hardware;">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a> :
-      <a href="&u.rel2.installation;">Заметки по установке</a> :
      <a href="&u.rel2.readme;">Readme</a> :
      <a href="&u.rel2.errata;">éÓÐÒÁ×ÌÅÎÉÑ É ÄÏÐÏÌÎÅÎÉÑ</a>
    </em>
  </p>

-  <p>Доступны также и самые последние ежедневные снэпшоты из веток <a
+  <p>äÏÓÔÕÐÎÙ ÔÁËÖÅ É ÐÏÓÌÅÄÎÉÅ ÓÎÜÐÛÏÔÙ ÉÚ ×ÅÔÏË <a
    href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/current-stable.html#STABLE">
    FreeBSD-STABLE</a> É <a
    href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/current-stable.html#CURRENT">
@ -55,6 +54,13 @@
    ðÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÞËÅ Ï <a
    href="../where.html">ðÏÌÕÞÅÎÉÉ FreeBSD</a>.</p>

+  <a name="supported-branches"></A>
+  <h2>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÒÅÌÉÚÙ</h2>
+
+  <p>ôÅËÕÝÅÅ ÎÁÚÎÁÞÅÎÉÅ É ÏÖÉÄÁÅÍÏÅ ×ÒÅÍÑ ÖÉÚÎÉ ÄÌÑ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ × ÎÁÓÔÏÑÝÅÅ
+    ×ÒÅÍÑ ÒÅÌÉÚÏ× ÎÁÈÏÄÑÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ
+    <a href="&base;/security/security.html#sup">éÎÆÏÒÍÁÃÉÏÎÎÁÑ
+    ÂÅÚÏÐÁÓÎÏÓÔØ FreeBSD</a>.</p>

  <a name="future"></a>
  <h2>âÕÄÕÝÉÅ ÒÅÌÉÚÙ</h2>
@ -71,7 +77,7 @@
    ÐÏÓÅÔÉÔÅ ÒÁÚÄÅÌ Ï <a href="../releng/index.html">ðÏÄÇÏÔÏ×ËÅ ÒÅÌÉÚÏ×</a>
    ÎÁ Web-ÓÁÊÔÅ.</p>

-  <p>Файлы документации о релизах для FreeBSD-stable и FreeBSD-current
+  <p>æÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ Ï ÒÅÌÉÚÁÈ ÄÌÑ FreeBSD-STABLE É FreeBSD-CURRENT
    ÄÏÓÔÕÐÎÙ ÄÌÑ ÐÒÏÓÍÏÔÒÁ × ÆÏÒÍÁÔÅ HTML ÎÁ ÓÔÒÁÎÉÃÅ <a
    HREF="../relnotes.html">éÎÆÏÒÍÁÃÉÉ Ï ÒÅÌÉÚÁÈ</a>.  üÔÉ ÆÁÊÌÙ
    ÐÅÒÉÏÄÉÞÅÓËÉ ÏÂÎÏ×ÌÑÀÔÓÑ, É × ÎÉÈ ÏÔÒÁÖÁÀÔÓÑ ÉÚÍÅÎÅÎÉÑ × ÓÏÓÔÏÑÎÉÉ
@ -81,6 +87,134 @@
  <h2>ðÒÏÛÌÙÅ ÒÅÌÉÚÙ</h2>

  <ul>
+      <li><b>8.1</b> (éÀÌØ 2010)
+	<em>
+	  <a href="&enbase;/releases/8.1R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/8.1R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/8.1R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/8.1R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/8.1R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>8.0</b> (îÏÑÂÒØ 2009)
+	<em>
+	  <a href="&enbase;/releases/8.0R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/8.0R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/8.0R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/8.0R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/8.0R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>7.3</b> (íÁÒÔ 2010)
+	<em>
+	  <a href="&enbase;/releases/7.3R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/7.3R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/7.3R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/7.3R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/7.3R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>7.2</b> (íÁÊ 2009)
+	<em>
+	  <a href="&enbase;/releases/7.2R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/7.2R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/7.2R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/7.2R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/7.2R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>7.1</b> (ñÎ×ÁÒØ 2009)
+	<em>
+	  <a href="&enbase;/releases/7.1R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/7.1R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/7.1R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/7.1R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/7.1R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>7.0</b> (æÅ×ÒÁÌØ 2008)
+	<em>
+	  <a href="&enbase;/releases/7.0R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/7.0R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/7.0R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/7.0R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/7.0R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>6.4</b> (îÏÑÂÒØ 2008)
+	<em>
+	  <a href="&enbase;/releases/6.4R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/6.4R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/6.4R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/6.4R/installation.html">úÁÍÅÞÁÎÉÑ ÐÏ
+	    ÕÓÔÁÎÏ×ËÅ</a>:
+	  <a href="&enbase;/releases/6.4R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/6.4R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>6.3</b> (ñÎ×ÁÒØ 2008)
+	<em>
+	  <a href="&enbase;/releases/6.3R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/6.3R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/6.3R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/6.3R/installation.html">úÁÍÅÞÁÎÉÑ ÐÏ
+	    ÕÓÔÁÎÏ×ËÅ</a>:
+	  <a href="&enbase;/releases/6.3R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/6.3R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>6.2</b> (ñÎ×ÁÒØ 2007)
+	<em>
+	  <a href="&enbase;/releases/6.2R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/6.2R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/6.2R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/6.2R/installation.html">úÁÍÅÞÁÎÉÑ ÐÏ
+	    ÕÓÔÁÎÏ×ËÅ</a>:
+	  <a href="&enbase;/releases/6.2R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/6.2R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
+      <li><b>6.1</b> (íÁÊ 2006)
+	<em>
+	  <a href="&enbase;/releases/6.1R/announce.html">áÎÏÎÓ</a>:
+	  <a href="&enbase;/releases/6.1R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+	  <a href="&enbase;/releases/6.1R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	  <a href="&enbase;/releases/6.1R/installation.html">úÁÍÅÞÁÎÉÑ ÐÏ
+	    ÕÓÔÁÎÏ×ËÅ</a>:
+	  <a href="&enbase;/releases/6.1R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/6.1R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+	    ÄÏÐÏÌÎÅÎÉÑ</a>
+	</em>
+      </li>
+
    <li><b>6.0</b> (îÏÑÂÒØ 2005)
      <em>
        <a href="&enbase;/releases/6.0R/announce.html">áÎÏÎÓ</a>:
@ -95,6 +229,20 @@
      </em>
    </li>

+    <li><b>5.5</b> (íÁÊ 2006)
+      <em>
+        <a href="&enbase;/releases/5.5R/announce.html">áÎÏÎÓ</a>:
+        <a href="&enbase;/releases/5.5R/relnotes.html">éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ</a>:
+        <a href="&enbase;/releases/5.5R/hardware.html">éÎÆÏÒÍÁÃÉÑ ÏÂ ÁÐÐÁÒÁÔÎÏÊ
+          ÓÏ×ÍÅÓÔÉÍÏÓÔÉ</a>:
+	<a href="&enbase;/releases/5.5R/installation.html">úÁÍÅÞÁÎÉÑ ÐÏ
+          ÕÓÔÁÎÏ×ËÅ</a>:
+	<a href="&enbase;/releases/5.5R/readme.html">Readme</a>:
+        <a href="&enbase;/releases/5.5R/errata.html">éÓÐÒÁ×ÌÅÎÉÑ É
+          ÄÏÐÏÌÎÅÎÉÑ</a>:
+      </em>
+    </li>
+
    <li><b>5.4</b> (íÁÊ 2005)
      <em>
        <a href="&base;/releases/5.4R/announce.html">áÎÏÎÓ</a>:
@ -480,13 +628,10 @@
  <a name="releasestatistic"></a>
  <h2>óÔÁÔÉÓÔÉËÁ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÅÌÉÚÏ×</h2>

-  <p>Текущая статистика использования релизов FreeBSD находится по адресу <a
-    href="http://www.FreeBSD.org/statistic/release_usage/2006/">
-    http://www.FreeBSD.org/statistic/release_usage/2006/</a>.
-    <br>
-    Статистика использования релизов FreeBSD за прошлый год доступна по
-    адресу <a href="http://www.FreeBSD.org/statistic/release_usage/2005/">
-    http://www.FreeBSD.org/statistic/release_usage/2005/</a>.</p>
+  <p>óÔÁÔÉÓÔÉËÁ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÔÅËÕÝÉÈ É ÐÒÅÄÙÄÕÝÉÈ ÒÅÌÉÚÏ× FreeBSD ÎÁÈÏÄÉÔÓÑ
+    ÐÏ ÁÄÒÅÓÕ <A HREF="http://www.FreeBSD.org/statistic/release_usage/">
+    http://www.FreeBSD.org/statistic/release_usage/</A>.
+  </p>

  &footer;

--- a/ru/releng/index.sgml
+++ b/ru/releng/index.sgml
@ -3,12 +3,12 @@

     $FreeBSDru: frdp/www/ru/releng/index.sgml,v 1.15 2004/09/21 07:31:11 den Exp $

-     Original revision: 1.293
+     Original revision: 1.297
 -->

 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/releng/index.sgml,v 1.16 2011/04/27 19:18:15 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/ru/releng/index.sgml,v 1.17 2011/04/28 11:43:51 pluknet Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÄÇÏÔÏ×ËÅ ÒÅÌÉÚÏ×">
 <!ENTITY % navinclude.developers "INCLUDE">
@ -56,15 +56,15 @@
    </tr>

    <tr>
-      <td>æÅ×ÒÁÌØ 2011</td>
-      <td>&os; 8.2</td>
-      <td><a href="&enbase;/releases/8.2R/announce.html">áÎÏÎÓÉÒÏ×ÁÎ</a> 24 ÆÅ×ÒÁÌÑ 2011</td>
+      <td>ñÎ×ÁÒØ 2012</td>
+      <td>&os; 9.0</td>
+      <td>ðÅÒÅÄ ×ÙÈÏÄÏÍ ÒÅÌÉÚÁ.</td>
    </tr>

    <tr>
-      <td>æÅ×ÒÁÌØ 2011</td>
-      <td>&os; 7.4</td>
-      <td><a href="&enbase;/releases/7.4R/announce.html">áÎÏÎÓÉÒÏ×ÁÎ</a> 24 ÆÅ×ÒÁÌÑ 2011</td>
+      <td>íÁÒÔ 2012</td>
+      <td>&os; 8.3</td>
+      <td>òÁÓÐÉÓÁÎÉÅ × ÒÁÚÒÁÂÏÔËÅ.</td>
    </tr>
  </table>

@ -89,14 +89,28 @@
      <td><tt>HEAD</tt></td>
      <td>ïÔËÒÙÔÁ</td>
      <td>ÒÁÚÒÁÂÏÔÞÉËÉ</td>
-      <td>áËÔÉ×ÎÁÑ ×ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ 9-CURRENT.</td>
+      <td>áËÔÉ×ÎÁÑ ×ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ 10-CURRENT.</td>
+    </tr>
+
+    <tr>
+      <td><tt>stable/9</tt></td>
+      <td>ïÔËÒÙÔÁ</td>
+      <td>ÒÁÚÒÁÂÏÔÞÉËÉ</td>
+      <td>÷ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ 9-STABLE.</td>
+    </tr>
+
+    <tr>
+      <td><tt>releng/9.0</tt></td>
+      <td>úÁÍÏÒÏÖÅÎÁ</td>
+      <td>&contact.re;</td>
+      <td>òÅÌÉÚÎÁÑ ×ÅÔËÁ FreeBSD 9.0.</td>
    </tr>

    <tr>
      <td><tt>RELENG_8</tt></td>
      <td>ïÔËÒÙÔÁ</td>
      <td>ÒÁÚÒÁÂÏÔÞÉËÉ</td>
-      <td>÷ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ 8-STABLE.</td>
+      <td>÷ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ 8-STABLE.</td>
    </tr>

    <tr>
@ -125,7 +139,7 @@
      <td><tt>RELENG_7</tt></td>
      <td>ïÔËÒÙÔÁ</td>
      <td>ÒÁÚÒÁÂÏÔÞÉËÉ</td>
-      <td>÷ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ 7-STABLE.</td>
+      <td>÷ÅÔËÁ ÒÁÚÒÁÂÏÔËÉ 7-STABLE.</td>
    </tr>

    <tr>
--- a/ru/security/security.sgml
+++ b/ru/security/security.sgml
@ -1,15 +1,15 @@
 <!--
     The FreeBSD Russian Documentation Project

-     $FreeBSD: www/ru/security/security.sgml,v 1.25 2011/01/31 15:03:42 pluknet Exp $
+     $FreeBSD: www/ru/security/security.sgml,v 1.26 2011/03/02 08:07:26 pluknet Exp $
     $FreeBSDru: frdp/www/ru/security/security.sgml,v 1.33 2004/09/21 07:31:12 den Exp $

-     Original revision: 1.221
+     Original revision: 1.223
 -->

 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ru/security/security.sgml,v 1.25 2011/01/31 15:03:42 pluknet Exp $">
+<!ENTITY date "$FreeBSD: www/ru/security/security.sgml,v 1.26 2011/03/02 08:07:26 pluknet Exp $">
 <!ENTITY title "éÎÆÏÒÍÁÃÉÏÎÎÁÑ ÂÅÚÏÐÁÓÎÏÓÔØ FreeBSD">
 <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % developers SYSTEM "../../en/developers.sgml"> %developers;
@ -291,7 +291,21 @@
      <td>8.2-RELEASE</td>
      <td>ïÂÙÞÎÙÊ</td>
      <td>24 ÆÅ×ÒÁÌÑ 2011</td>
-      <td>29 ÆÅ×ÒÁÌÑ 2012</td>
+      <td>31 ÉÀÌÑ 2012</td>
+    </tr>
+    <tr>
+      <td>RELENG_9</td>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>ÐÏÓÌÅÄÎÉÊ ÒÅÌÉÚ + 2 ÇÏÄÁ</td>
+    </tr>
+    <tr>
+      <td>RELENG_9_0</td>
+      <td>9.0-RELEASE</td>
+      <td>îÏÒÍÁÌØÎÙÊ</td>
+      <td>10 ÑÎ×ÁÒÑ 2012</td>
+      <td>31 ÑÎ×ÁÒÑ 2013</td>
    </tr>
  </table>

--- a/ru/share/sgml/header.l10n.ent
+++ b/ru/share/sgml/header.l10n.ent
@ -2,16 +2,22 @@
 <!--
     The FreeBSD Russian Documentation Project

-     $FreeBSD: www/ru/share/sgml/header.l10n.ent,v 1.6 2010/01/05 02:35:42 bland Exp $
+     $FreeBSD: www/ru/share/sgml/header.l10n.ent,v 1.7 2010/07/08 09:01:48 maxim Exp $
     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $

     Original revision: 1.62
+
+     from: share/sgml/header.ent
+
+     Original revision: 1.18
 -->

 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                     -->
-<!ENTITY copyright '<a href="&base;/search/index-site.html">ëÁÒÔÁ ÓÁÊÔÁ</a> | <a href="&base;/copyright/">õÓÌÏ×ÉÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ</a> | &copy; 1995-2010 ðÒÏÅËÔ FreeBSD. ÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ.'>
+<!ENTITY copyright '<a href="&base;/search/index-site.html">ëÁÒÔÁ ÓÁÊÔÁ</a> |
+  <a href="&base;/copyright/">õÓÌÏ×ÉÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ</a> | &copy; 1995-2012
+  ðÒÏÅËÔ FreeBSD. ÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ.'>
 <!ENTITY author '<a href="&base;/index.html">çÌÁ×ÎÁÑ</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">ëÏÎÔÁËÔÙ</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">á×ÔÏÒÓËÉÅ ÐÒÁ×Á</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
  alt="çÌÁ×ÎÁÑ ÓÔÒÁÎÉÃÁ FreeBSD" border="0" align="right" width="101" height="33"></a>'>
@ -19,11 +25,11 @@
 <!-- Standard headers and footers -->

 <!ENTITY header2.word.search 'ðÏÉÓË'>
-<!ENTITY header2.word.textsize 'Text Size'>
+<!ENTITY header2.word.textsize 'òÁÚÍÅÒ ÔÅËÓÔÁ'>
 <!ENTITY header2.word.normaltextsize 'îÏÒÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÂÕË×'>
 <!ENTITY header2.word.largetextsize 'âÏÌØÛÏÊ ÒÁÚÍÅÒ ÂÕË×'>
-<!ENTITY header2.word.normal 'Normal'>
-<!ENTITY header2.word.large 'Large'>
+<!ENTITY header2.word.normal 'îÏÒÍÁÌØÎÙÊ'>
+<!ENTITY header2.word.large 'âÏÌØÛÏÊ'>
 <!ENTITY header2.word.donate 'ðÏÖÅÒÔ×Ï×ÁÎÉÑ'>
 <!ENTITY header2.word.contact 'ëÏÎÔÁËÔÙ'>

@ -76,7 +82,7 @@
    <ul>
      <li><a href="&base;/projects/index.html">òÁÚÒÁÂÏÔËÁ</a>
 	<ul>
-	  <li><a href="&enbase;/projects/ideas/ideas.html">éÄÅÉ ÄÌÑ ÐÒÏÅËÔÁ</a></li>
+	  <li><a href="http://wiki.FreeBSD.org/IdeasPage">éÄÅÉ ÄÌÑ ÐÒÏÅËÔÁ</a></li>
 	  <li><a href="http://svn.FreeBSD.org/viewvc/base/">SVN ÒÅÐÏÚÉÔÏÒÉÊ</a></li>
 	  <li><a href="http://cvsweb.FreeBSD.org">CVS ÒÅÐÏÚÉÔÏÒÉÊ</a></li>
 	  <li><a href="http://p4web.FreeBSD.org">Perforce ÒÅÐÏÚÉÔÏÒÉÊ</a></li>
--- a/ru/share/sgml/l10n.ent
+++ b/ru/share/sgml/l10n.ent
@ -2,23 +2,24 @@
 <!--
     The FreeBSD Russian Documentation Project

-     $FreeBSD: www/ru/share/sgml/l10n.ent,v 1.1 2006/08/19 21:25:55 hrs Exp $
+     $FreeBSD: www/ru/share/sgml/l10n.ent,v 1.2 2010/12/03 07:18:38 maxim Exp $
     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $

-     Original revision: 1.62
+     from: share/sgml/release.ent
+
+     Original revision: 1.66
 -->

 <!ENTITY url.doc.langcode    'ru_RU.KOI8-R'>
 <!ENTITY xml.encoding        'koi8-r'>

-<!ENTITY rel.current.date 'éÀÌØ 2010'>
+<!ENTITY rel.current.date 'ñÎ×ÁÒØ 2012'>

 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
 <!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
 <!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
 <!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
 <!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>

 <!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
@ -27,15 +28,27 @@

 <!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>

-<!ENTITY rel2.current.date 'íÁÒÔ 2010'>
+<!ENTITY rel2.current.date 'æÅ×ÒÁÌØ 2011'>

 <!-- URLs to information on the latest release -->
-<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
-<!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
-<!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
+<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
+<!ENTITY u.rel2.installation '&enbase;/releases/&rel2.current;R/installation.html'>
+<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
+
+<!-- Tertiary "current release" entities -->
+
+<!ENTITY rel3.current.date 'æÅ×ÒÁÌØ 2011'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel3.notes '&enbase;/releases/&rel3.current;R/relnotes.html'>
+<!ENTITY u.rel3.announce '&enbase;/releases/&rel3.current;R/announce.html'>
+<!ENTITY u.rel3.errata '&enbase;/releases/&rel3.current;R/errata.html'>
+<!ENTITY u.rel3.hardware '&enbase;/releases/&rel3.current;R/hardware.html'>
+<!ENTITY u.rel3.installation '&enbase;/releases/&rel3.current;R/installation.html'>
+<!ENTITY u.rel3.readme '&enbase;/releases/&rel3.current;R/readme.html'>

 <!-- 
     Local Variables:
--- a/ru/share/sgml/navibar.l10n.ent
+++ b/ru/share/sgml/navibar.l10n.ent
@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!-- $FreeBSD: www/ru/share/sgml/navibar.l10n.ent,v 1.5 2010/01/05 06:03:20 bland Exp $ -->
+<!--
+     $FreeBSD: www/ru/share/sgml/navibar.l10n.ent,v 1.6 2011/01/31 15:03:42 pluknet Exp $
+
+     from: share/sgml/navibar.ent
+
+     Original revision: 1.32
+-->

 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
@ -54,7 +60,7 @@
 <li><a href="&base;/developers/cvs.html">CVS ÒÅÐÏÚÉÔÏÒÉÊ</a></li>
 <li><a href="&base;/releng/index.html">ðÏÄÇÏÔÏ×ËÁ ÒÅÌÉÚÏ×</a></li>
 <li><a href="&base;/platforms/">ðÌÁÔÆÏÒÍÙ</a></li>
-<li><a href="&enbase;/projects/ideas/">éÄÅÉ ÄÌÑ ÐÒÏÅËÔÁ</a></li>
+<li><a href="http://wiki.freebsd.org/IdeasPage">éÄÅÉ ÄÌÑ ÐÒÏÅËÔÁ</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">óÏÄÅÊÓÔ×ÉÅ ÐÒÏÅËÔÕ</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
--- a/ru/where.sgml
+++ b/ru/where.sgml
@ -3,11 +3,11 @@

     $FreeBSDru: frdp/www/ru/where.sgml,v 1.17 2006/07/19 09:33:24 den Exp $

-     Original revision: 1.103
+     Original revision: 1.123
 -->

 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/ru/where.sgml,v 1.19 2010/02/24 01:38:00 delphij Exp $">
+<!ENTITY date "$FreeBSD: www/ru/where.sgml,v 1.20 2011/08/05 22:56:40 gjb Exp $">
 <!ENTITY title "ðÏÌÕÞÅÎÉÅ FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
@ -67,51 +67,51 @@
 	  <td colspan="2"></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[óÍÏÔÒÅÔØ]</a></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/hardware.html">[óÍÏÔÒÅÔØ]</a></td>
-	  <td rowspan="7"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">[óÍÏÔÒÅÔØ]</a></td>
+	  <td rowspan="7"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">[óÍÏÔÒÅÔØ]</a></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/errata.html">[óÍÏÔÒÅÔØ]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
-	  <td><a href="&url.rel;/i386/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
-	  <td><a href="&url.rel;/ia64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
-	</tr>
-	<tr>
-	  <td></td>
-	  <td>pc98</td>
-	  <td><a href="&url.rel;/pc98/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><a href="&url.rel;/powerpc/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc64</td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
-	  <td><a href="&url.rel;/sparc64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&rel.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
 	  <td colspan="2"></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/relnotes.html">[óÍÏÔÒÅÔØ]</a></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/hardware.html">[óÍÏÔÒÅÔØ]</a></td>
-	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/installation.html">[óÍÏÔÒÅÔØ]</a></td>
+	  <td rowspan="7"><a href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/install.html">[óÍÏÔÒÅÔØ]</a></td>
 	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/errata.html">[óÍÏÔÒÅÔØ]</a></td>
 	</tr>
 	<tr>
@ -126,8 +126,8 @@
 	  <td><a href="&url.rel;/i386/&rel2.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
 	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	</tr>
-	<tr>
-	  <td></td>
+ 	<tr>
+ 	  <td></td>
 	  <td>ia64</td>
 	  <td><a href="&url.rel;/ia64/&rel2.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
 	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
@ -150,6 +150,38 @@
 	  <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
 	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	</tr>
+	<tr>
+	  <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
+	  <td colspan="2"></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/relnotes.html">[óÍÏÔÒÅÔØ]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/hardware.html">[óÍÏÔÒÅÔØ]</a></td>
+	  <td rowspan="7"><a href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/install.html">[óÍÏÔÒÅÔØ]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/errata.html">[óÍÏÔÒÅÔØ]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>amd64</td>
+	  <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>i386</td>
+	  <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>pc98</td>
+	  <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>sparc64</td>
+	  <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
      </tbody>
    </table>

@ -179,121 +211,114 @@
 	<tr style="text-align: center;">
 	  <td colspan="2">÷ÅÒÓÉÑ É ÐÌÁÔÆÏÒÍÁ</td>
 	  <td>äÉÓÔÒÉÂÕÔÉ×</td>
-	  <td title="ISO9660 CD image"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
-	  <td>òÁÓÐÉÓÁÎÉÅ</td>
-<!--
-	  <td>TODO</td>
-->
+	  <td title="ISO9660 CD image"><a href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
+	  <td>óÔÁÔÕÓ</td>
 	</tr>
      </thead>
      <tbody>
 	<tr>
 	  <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
 	  <td colspan="2"></td>
-	  <td colspan="7"><a href="&enbase;/releases/&betarel.current;R/schedule.html">[óÍÏÔÒÅÔØ]</a></td>
-<!--
-	  <td rowspan="7"><a href="&enbase;/releases/&betarel.current;R/todo.html">[óÍÏÔÒÅÔØ]</a></td>
-->
+	  <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/9.0TODO">[óÍÏÔÒÅÔØ]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
-	  <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
-	  <td><a href="&url.rel;/ia64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc64</td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
-	  <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
      </tbody>
    </table>

  <![ %beta2.testing; [
+
    <table class="tblbasic">
      <thead>
 	<tr style="text-align: center;">
 	  <td colspan="2">÷ÅÒÓÉÑ É ÐÌÁÔÆÏÒÍÁ</td>
 	  <td>äÉÓÔÒÉÂÕÔÉ×</td>
-	  <td title="ISO9660 CD image"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
-	  <td>òÁÓÐÉÓÁÎÉÅ</td>
-<!--
+	  <td title="ISO9660 CD image"><a href="&enbase;/doc/ru_RU.KOI8-R/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
 	  <td>TODO</td>
-->
 	</tr>
      </thead>
      <tbody>
+
 	<tr>
 	  <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
 	  <td colspan="2"></td>
-	  <td rowspan="8"><a href="&enbase;/releases/&betarel2.current;R/schedule.html">[óÍÏÔÒÅÔØ]</a></td>
-<!--
+
 	  <td><a href="&enbase;/releases/&betarel2.current;R/todo.html">[óÍÏÔÒÅÔØ]</a></td>
-->
-	</tr>
-	<tr>
-	  <td>&nbsp;&nbsp;&nbsp;</td>
-	  <td>alpha</td>
-	  <td><!-- a href="&url.rel;/alpha/&betarel2.current;-&betarel2.vers;" -->[äÉÓÔÒÉÂÕÔÉ×]<!-- /a --></td>
-	  <td><!-- a href="&url.rel;/alpha/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
+
+	  <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[óÍÏÔÒÅÔØ]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
-	  <td><a href="&url.rel;/i386/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
-	  <td><!-- a href="&url.rel;/ia64/&betarel2.current;-&betarel2.vers;" -->[äÉÓÔÒÉÂÕÔÉ×]<!-- /a --></td>
-	  <td><!-- a href="&url.rel;/ia64/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
-	</tr>
-	<tr>
-	  <td></td>
-	  <td>pc98</td>
-	  <td><a href="&url.rel;/pc98/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><!-- a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;" -->[äÉÓÔÒÉÂÕÔÉ×]<!-- /a --></td>
-	  <td><!-- a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc64</td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
-	  <td><a href="&url.rel;/sparc64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
-	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[äÉÓÔÒÉÂÕÔÉ×]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
      </tbody>
    </table>
+
  ]]>
  ]]>

@ -310,14 +335,21 @@
    <h2>òÁÓÐÒÏÓÔÒÁÎÑÅÍÙÅ FreeBSD-ÐÒÏÉÚ×ÏÄÎÙÅ ÏÐÅÒÁÃÉÏÎÎÙÅ ÓÉÓÔÅÍÙ</h2>

    <p>FreeBSD ÛÉÒÏËÏ ÉÓÐÏÌØÚÕÅÔÓÑ × ËÁÞÅÓÔ×Å ÓÏÓÔÁ×ÎÏÊ ÞÁÓÔÉ ËÏÍÍÅÒÞÅÓËÉÈ
-      ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍ É ÓÉÓÔÅÍ Ó ÏÔËÒÙÔÙÍ ËÏÄÏÍ.  ðÒÏÅËÔ ÐÒÉ×ÅÄ£ÎÎÙÊ ÎÉÖÅ,
-      ÐÏÌÕÞÉÌ ÂÏÌØÛÏÅ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ É ÐÒÅÄÓÔÁ×ÌÑÅÔ ÏÓÏÂÙÊ ÉÎÔÅÒÅÓ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ FreeBSD.</p>
+      ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍ É ÓÉÓÔÅÍ Ó ÏÔËÒÙÔÙÍ ËÏÄÏÍ.  ðÒÉ×ÅÄ£ÎÎÙÅ ÎÉÖÅ ÐÒÏÅËÔÙ
+      ÐÏÌÕÞÉÌÉ ÂÏÌØÛÏÅ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ É ÐÒÅÄÓÔÁ×ÌÑÀÔ ÏÓÏÂÙÊ ÉÎÔÅÒÅÓ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ FreeBSD.</p>

    <ul>
+      <li><p><a href="http://www.freenas.org">FreeNAS</a> - ÜÔÏ ÐÌÁÔÆÏÒÍÁ Ó
+	ÏÔËÒÙÔÙÍ ËÏÄÏÍ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÈÒÁÎÉÌÉÝÁ ÄÁÎÎÙÈ, ÏÓÎÏ×ÁÎÎÁÑ ÎÁ FreeBSD,
+	ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÅÔ ÏÂÍÅÎÉ×ÁÔØÓÑ ÒÅÓÕÒÓÁÍÉ ÍÅÖÄÕ Windows, Apple É
+	UNIX-ÐÏÄÏÂÎÙÍÉ ÓÉÓÔÅÍÁÍÉ.</p></li>
      <li><p><a href="http://www.pcbsd.org">PC-BSD</a> - ÜÔÏ ÐÒÏÉÚ×ÏÄÎÁÑ FreeBSD,
-        ÎÁÄÅÌÅÎÎÁÑ ÇÒÁÆÉÞÅÓËÏÊ ÐÒÏÇÒÁÍÍÏÊ ÕÓÔÁÎÏ×ËÉ, ×ÐÅÞÁÔÌÑÀÝÉÍ ÉÎÓÔÒÕÍÅÎÔÁÒÉÅÍ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ,
-        ÏÒÉÅÎÔÉÒÏ×ÁÎÎÁÑ ÎÁ ÄÏÓÔÕÐÎÏÓÔØ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÄÌÑ ÎÅ ÉÓËÕÛÅÎÎÏÇÏ
-        ÐÏÌØÚÏ×ÁÔÅÌÑ.</p></li>
+	ÎÁÄÅÌÅÎÎÁÑ ÇÒÁÆÉÞÅÓËÏÊ ÐÒÏÇÒÁÍÍÏÊ ÕÓÔÁÎÏ×ËÉ, ×ÐÅÞÁÔÌÑÀÝÉÍ ÉÎÓÔÒÕÍÅÎÔÁÒÉÅÍ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ,
+	ÏÒÉÅÎÔÉÒÏ×ÁÎÎÁÑ ÎÁ ÄÏÓÔÕÐÎÏÓÔØ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÄÌÑ ÎÅ ÉÓËÕÛÅÎÎÏÇÏ
+	ÐÏÌØÚÏ×ÁÔÅÌÑ.</p></li>
+      <li><p><a href="http://www.pfsense.org">pfSense</a> - ÜÔÏ Ó×ÏÂÏÄÎÙÊ
+	ÏÔËÒÙÔÙÊ ÎÁÓÔÒÁÉ×ÁÅÍÙÊ ÄÉÓÔÒÉÂÕÔÉ× ÎÁ ÏÓÎÏ×Å FreeBSD, ÐÒÉÓÐÏÓÏÂÌÅÎÎÙÊ
+	ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÆÁÅÒ×ÏÌÁ É ÒÏÕÔÅÒÁ.</p></li>
    </ul>

    <a name="apps"></a>