Merge the following from the English version:

1.13 -> 1.14 Makefile
   1.58 -> 1.60 article.sgml
   1.1 -> 1.3 extra.css

Obtained from:	The FreeBSD Russian Documentation Project
This commit is contained in:
Denis Peplin 2004-08-10 10:52:43 +00:00
parent a5454b6826
commit 473f781d78
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=21904
3 changed files with 12 additions and 20 deletions
ru_RU.KOI8-R/articles/releng

View file

@ -3,9 +3,9 @@
# The FreeBSD Russian Documentation Project # The FreeBSD Russian Documentation Project
# #
# $FreeBSD$ # $FreeBSD$
# $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/Makefile,v 1.1 2004/02/21 05:38:41 andy Exp $ # $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/Makefile,v 1.3 2004/08/10 09:02:08 den Exp $
# #
# Original revision: 1.13 # Original revision: 1.14
# #
DOC?= article DOC?= article
@ -23,5 +23,7 @@ IMAGES_EN+= branches-releng4.pic
CSS_SHEET_ADDITIONS= extra.css CSS_SHEET_ADDITIONS= extra.css
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../.. DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk"

View file

@ -1,25 +1,15 @@
<!-- <!--
The FreeBSD Russian Documentation Project The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/article.sgml,v 1.6 2004/07/16 12:06:13 den Exp $ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/article.sgml,v 1.7 2004/08/10 09:02:08 den Exp $
Original revision: 1.58 Original revision: 1.60
--> -->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//RU">
%authors; %articles.ent;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"> <!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
%teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
%mailing-lists;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
%trademarks;
<!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">The Release Engineering of Third Party Packages</ulink>'>
]> ]>
<article lang="ru"> <article lang="ru">
@ -796,7 +786,7 @@
<para>Для получения дополнительной информации о системе зеркальных <para>Для получения дополнительной информации о системе зеркальных
FTP-серверов FreeBSD, пожалуйста, прочтите статью о <ulink FTP-серверов FreeBSD, пожалуйста, прочтите статью о <ulink
url="../hubs/">úÅÒËÁÌÉÒÏ×ÁÎÉÉ FreeBSD</ulink>.</para> url="&url.articles.hubs;">úÅÒËÁÌÉÒÏ×ÁÎÉÉ FreeBSD</ulink>.</para>
<para>Может пройти от нескольких часов до двух дней между тем, как <para>Может пройти от нескольких часов до двух дней между тем, как
обновится <hostid>ftp-master</hostid>, и на основной массе FTP-серверов обновится <hostid>ftp-master</hostid>, и на основной массе FTP-серверов

View file

@ -7,9 +7,9 @@
* The FreeBSD Russian Documentatin Project * The FreeBSD Russian Documentatin Project
* *
* $FreeBSD$ * $FreeBSD$
* $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/extra.css,v 1.1 2004/02/16 17:01:35 andy Exp $ * $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/extra.css,v 1.2 2004/08/10 09:02:08 den Exp $
* *
* Original revision: 1.1 * Original revision: 1.3
*/ */
/* @import "docbook.css"; */ /* @import "docbook.css"; */