Merge the following from the English version:

1.66 -> 1.69 developers.sgml
   1.176 -> 1.177 docs.sgml
   1.55 -> 1.60 docproj/current.sgml
   1.56 -> 1.57 docproj/translations.sgml
   1.25 -> 1.26 internal/internal.sgml
   1.178 -> 1.180 news/news.xml
   1.103 -> 1.106 news/press.xml

Approved by: phantom (mentor)
This commit is contained in:
Denis Peplin 2003-12-01 16:27:34 +00:00
parent 6b42ed6e8a
commit 6922d40bcb
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=19030
7 changed files with 68 additions and 34 deletions

View file

@ -2,9 +2,9 @@
The FreeBSD Russian Documentation Project
$FreeBSD: www/en/developers.sgml,v 1.65 2003/08/25 16:54:37 rwatson Exp $
$FreeBSDru: frdp/www/ru/developers.sgml,v 1.3 2003/11/11 11:48:26 den Exp $
$FreeBSDru: frdp/www/ru/developers.sgml,v 1.4 2003/11/28 12:31:56 den Exp $
Original revision: 1.66
Original revision: 1.69
-->
<!--
@ -33,6 +33,7 @@ as adding email addresses), by just editing a single file.
<!ENTITY a.blackend "Marc Fonvieille">
<!ENTITY a.bmah "Bruce A. Mah">
<!ENTITY a.bmilekic "Bosko Milekic">
<!ENTITY a.bms "Bruce M. Simpson">
<!ENTITY a.brian "Brian Somers">
<!ENTITY a.brueffer "Christian Brueffer">
<!ENTITY a.ceri "Ceri Davies">
@ -108,6 +109,7 @@ as adding email addresses), by just editing a single file.
<!ENTITY a.nectar "Jacques Vidrine">
<!ENTITY a.nik "Nik Clayton">
<!ENTITY a.njl "Nate Lawson">
<!ENTITY a.non "Noriaki&nbsp;Mitsunaga">
<!ENTITY a.nsayer "Nick Sayer">
<!ENTITY a.nyan "Takahashi Yoshihiro">
<!ENTITY a.obrien "David O'Brien">
@ -148,7 +150,7 @@ as adding email addresses), by just editing a single file.
so that we may keep a list of hat owners and modify only this file. -->
<!-- FreeBSD Bugmeister -->
<!ENTITY a.bugmeister '&a.keramida;'>
<!ENTITY a.bugmeister '&a.ceri;'>
<!-- FreeBSD Doc Engineering Team -->
<!ENTITY a.doceng '&a.nik;, &a.murray;, &a.bmah;, &a.ru;, &a.kuriyama;'>

View file

@ -20,9 +20,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/docproj/current.sgml,v 1.12 2003/11/13 09:19:37 den Exp $
$FreeBSDru: frdp/www/ru/docproj/current.sgml,v 1.13 2003/11/28 12:31:56 den Exp $
Original revision: 1.55
Original revision: 1.60
-->
<html>
@ -272,9 +272,9 @@
<tr>
<td> ct(4) </td>
<td> ÏÓÎÏ×ÁÎÎÙÊ ÎÁ WD33C93 ÄÒÁÊ×ÅÒ SCSI</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.non; </td>
<td> 21 ÎÏÑÂÒÑ 2003 </td>
<td> &status.wip; </td>
</tr>
<tr>
@ -312,9 +312,9 @@
<tr>
<td> idt(4) </td>
<td> NICStar ATM Adapter</td>
<td> &a.trhodes; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.trhodes;, &a.bms; </td>
<td> 9 ÎÏÑÂÒÑ 2003 </td>
<td> &status.done; </td>
</tr>
<tr>
@ -344,17 +344,17 @@
<tr>
<td> ncv(4) </td>
<td> ÄÒÁÊ×ÅÒ NCR 53C500 SCSI (PC-98)</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.trhodes; </td>
<td> 20 ÎÏÑÂÒÑ 2003 </td>
<td> &status.done; </td>
</tr>
<tr>
<td> nsp(4) </td>
<td> ÄÒÁÊ×ÅÒ Workbit Ninja SCSI (PC-98)</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.non; </td>
<td> 24 ÎÏÑÂÒÑ 2003 </td>
<td> &status.done; </td>
</tr>
<tr>

View file

@ -8,9 +8,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/docproj/translations.sgml,v 1.11 2003/11/11 11:48:27 den Exp $
$FreeBSDru: frdp/www/ru/docproj/translations.sgml,v 1.12 2003/11/28 12:31:56 den Exp $
Original revision: 1.56
Original revision: 1.57
-->
<html>
@ -132,8 +132,9 @@
<a name="chinese-cn"></a>
<h2>Проект Документирования на упрощенном китайском</h2>
<b>Web</b>: <a href="http://www.freebsdchina.org">www.freebsdchina.org</a> <br>
<b>E-Mail</b>: <a href="mailto:lid@ufrima.imag.fr">lid@ufrima.imag.fr</a><br>
<b>Web</b>: <a href="http://www.FreeBSD.org.cn">www.FreeBSD.org.cn</a> <br>
<b>óÐÉÓÏË ÒÁÓÓÙÌËÉ</b>: <a href="http://lists.freebsd.org.cn/mailman/listinfo">http://lists.freebsd.org.cn/mailman/listinfo</a><br>
<b>E-Mail</b>: <a href="mailto:ld@FreeBSD.org.cn">ld@FreeBSD.org.cn</a><br>
<a name="dutch"></a>
<h2>Датский Проект Документирования FreeBSD</h2>

View file

@ -1,9 +1,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/docs.sgml,v 1.26 2003/10/27 08:29:11 den Exp $
$FreeBSDru: frdp/www/ru/docs.sgml,v 1.27 2003/11/28 12:31:56 den Exp $
Original revision: 1.176
Original revision: 1.177
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
@ -116,7 +116,7 @@
òÕËÏ×ÏÄÓÔ×Ï ÄÌÑ ËÏÍÍÉÔÔÅÒÁ</a> (<tt>committers-guide</tt>)<br>
<small>îÁÞÁÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÄÌÑ ËÏÍÍÉÔÔÅÒÏ× FreeBSD.</small></p>
<p><a href="../../doc/en_US.ISO8859-1/articles/console-server/article.html">
<p><a href="../../doc/en_US.ISO8859-1/articles/console-server/index.html">
õÞÅÂÎÉË ÐÏ ÏÒÇÁÎÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÅÒ×ÅÒÁ</a>
(<tt>console-server</tt>)<br>
<small>ëÁË ÐÏÓÔÒÏÉÔØ ÔÅÒÍÉÎÁÌØÎÙÊ ÓÅÒ×ÅÒ ÎÁ ÏÓÎÏ×Å FreeBSD Ó ÄÅÛ£×ÙÍ

View file

@ -1,9 +1,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/internal/internal.sgml,v 1.6 2003/10/13 07:16:40 den Exp $
$FreeBSDru: frdp/www/ru/internal/internal.sgml,v 1.7 2003/11/28 12:31:57 den Exp $
Original revision: 1.25
Original revision: 1.26
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
@ -76,10 +76,6 @@
<h2><a href="statistic.html">óÔÁÔÉÓÔÉËÁ FreeBSD</a></h2>
<p>óÔÁÔÉÓÔÉËÁ ÒÁÂÏÔÙ ×ÅÂ-ÓÅÒ×ÅÒÁ, ÔÒÁÆÉË FTP, ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÒÅÌÉÚÏ×.</p>
<h2><a href="&en-base;/staff.html">FreeBSD Staff</a></h2>
<p>üÔÏ ÓÐÉÓÏË ÓÕÝÅÓÔ×ÕÀÝÉÈ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ËÏÍÁÎÄ É ÉÈ ÆÕÎËÃÉÊ
× FreeBSD.</p>
&footer;
</body>
</html>

View file

@ -3,9 +3,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/news/news.xml,v 1.30 2003/11/13 09:19:37 den Exp $
$FreeBSDru: frdp/www/ru/news/news.xml,v 1.31 2003/11/28 12:31:57 den Exp $
Original revision: 1.178
Original revision: 1.180
-->
<!-- Simple schema for FreeBSD Project news.
@ -39,8 +39,23 @@
<month>
<name>îÏÑÂÒØ</name>
<day>
<name>21</name>
<event>
<p>îÏ×ÙÊ ËÏÍÍÉÔÔÅÒ: <a
href="mailto:matk@FreeBSD.org">Mathew Kanner</a>
(ÍÉÄÉ, Ú×ÕË)</p>
</event>
</day>
<day>
<name>12</name>
<event>
<p>îÏ×ÙÊ ËÏÍÍÉÔÔÅÒ: <a
href="mailto:eik@FreeBSD.org">Oliver Eikemeier</a>
(ðÏÒÔÙ)</p>
</event>
<event>
<p>îÏ×ÙÊ ËÏÍÍÉÔÔÅÒ: <a href="mailto:pav@FreeBSD.org">Pav Lucistnik</a>
(ðÏÒÔÙ)</p>

View file

@ -3,9 +3,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/news/press.xml,v 1.23 2003/11/13 09:19:37 den Exp $
$FreeBSDru: frdp/www/ru/news/press.xml,v 1.24 2003/11/28 12:31:57 den Exp $
Original revision: 1.103
Original revision: 1.106
-->
<!--
@ -27,6 +27,26 @@
<month>
<name>îÏÑÂÒØ</name>
<story>
<name>äÅÓÑÔØ ÌÅÔ FreeBSD: ÷ÅÞÅÒÉÎËÁ ÓÏÓÔÏÑÌÁÓØ</name>
<url>http://www.osnews.com/story.php?news_id=5224</url>
<site-name>OSNews</site-name>
<site-url>http://www.osnews.com</site-url>
<date>25 ÎÏÑÂÒÑ 2003</date>
<author>Eugenia Loli-Queru</author>
<p>ëÒÁÔËÉÊ ÏÔÞÅÔ Ï ×ÅÞÅÒÅ É ÎÅÓËÏÌØËÏ ÆÏÔÏÇÒÁÆÉÊ.</p>
</story>
<story>
<name>éÎÔÅÒרÀ: Greg Lehey ÉÚ AUUG</name>
<url>http://www.linuxworld.com.au/pp.php?id=337297289&amp;fp=2&amp;fpid=1</url>
<site-name>linuxworld.com.au</site-name>
<site-url>http://linuxworld.com.au/</site-url>
<date>24 ÎÏÑÂÒÑ 2003</date>
<author>Howard Dahdah</author>
<p>éÎÔÅÒרÀ Ó ÒÁÚÒÁÂÏÔÞÉËÏÍ Greg Lehey.</p>
</story>
<story>
<name>ïÔ Linux Ë FreeBSD: ïÂÚÏÒ FreeBSD</name>
<url>http://www.osnews.com/story.php?news_id=5106</url>