Merge the following from the English version:

1.5 -> 1.6 relnotes/Makefile
   1.9 -> 1.11 relnotes.sgml

Obtained from:	The FreeBSD Russian Documentation Project
This commit is contained in:
Denis Peplin 2004-09-10 14:23:00 +00:00
parent 9ed1ef867b
commit 36a5c270d4
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=22296
2 changed files with 9 additions and 8 deletions

View file

@ -1,9 +1,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/relnotes.sgml,v 1.5 2004/06/28 13:42:37 den Exp $
$FreeBSDru: frdp/www/ru/relnotes.sgml,v 1.6 2004/09/10 14:21:53 den Exp $
Original revision: 1.9
Original revision: 1.11
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
@ -15,7 +15,7 @@
<html>
&header;
<img src="../gifs/doc.jpg" alt="" align="right" border="0" width="274"
<img src="../gifs/doc.jpg" alt="BSD ÄÁÅÍÏÎ ÞÉÔÁÅÔ ÄÏËÕÍÅÎÔÁÃÉÀ" align="right" border="0" width="274"
height="163">
<p>ëÁÖÄÙÊ ÄÉÓÔÒÉÂÕÔÉ× FreeBSD ×ËÌÀÞÁÅÔ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ× ÄÏËÕÍÅÎÔÁÃÉÉ,
@ -96,7 +96,7 @@
<a href="relnotes/CURRENT/installation/ia64/index.html">ia64</a>,
<a href="relnotes/CURRENT/installation/amd64/index.html">amd64</a>)</li>
<li><a href="../relnotes/CURRENT/errata/index.html">Errata</a></li>
<li><a href="relnotes/CURRENT/errata/index.html">Errata</a></li>
</ul>
<p>äÌÑ FreeBSD 4-STABLE ÄÏÓÔÕÐÎÙ ÓÌÅÄÕÀÝÉÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ:</p>
@ -123,7 +123,7 @@
<p>äÏËÕÍÅÎÔÁÃÉÀ Ë ÒÅÌÉÚÁÍ × ×ÉÄÅ ÆÁÊÌÏ× ÆÏÒÍÁÔÁ HTML, PDF É ÏÂÙÞÎÏÇÏ ÔÅËÓÔÁ
ÄÌÑ FreeBSD -CURRENT, -STABLE É ÐÏÓÌÅÄÎÉÈ RELEASE-×ÅÒÓÉÊ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ
<a href="http://people.freebsd.org/~bmah/relnotes/">óÁÊÔÅ ÓÎÜÐÛÏÔÏ×
<a href="http://people.FreeBSD.org/~bmah/relnotes/">óÁÊÔÅ ÓÎÜÐÛÏÔÏ×
ÄÏËÕÍÅÎÔÁÃÉÉ Ë ÒÅÌÉÚÁÍ</a>. îÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÄÏËÕÍÅÎÔÁÃÉÑ ÏÂÎÏ×ÌÑÅÔÓÑ
ÎÅÒÅÇÕÌÑÒÎÏ, ÎÏ ÄÏÓÔÁÔÏÞÎÏ ÞÁÓÔÏ.</p>

View file

@ -8,13 +8,14 @@
# of relnotes should appear on the web site. The second word is the
# path to that relnotes set.
#
# $FreeBSDru$
# $FreeBSDru: frdp/www/ru/relnotes/Makefile,v 1.2 2004/09/10 14:21:53 den Exp $
# $FreeBSD$
#
# Original Revision: 1.5
# Original revision: 1.6
#
RELNOTES?= CURRENT ${.CURDIR}/../../../relnotes/doc/ru_RU.KOI8-R
RELNOTES?= CURRENT ${.CURDIR}/../../../relnotes/doc/ru_RU.KOI8-R \
5-STABLE ${.CURDIR}/../../../relnotes5/doc/ru_RU.KOI8-R
all install clean obj:
@set ${RELNOTES}; \