Merge the following from the English version:

1.61 -> 1.62 includes.sgml
   1.48 -> 1.55 docproj/current.sgml
   1.176 -> 1.178 news/news.xml
   1.102 -> 1.103 news/press.xml

Approved by: phantom (mentor)
This commit is contained in:
Denis Peplin 2003-11-20 13:03:08 +00:00
parent 794b0d838c
commit ac212ef3b2
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=18930
4 changed files with 69 additions and 64 deletions

View file

@ -20,9 +20,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/docproj/current.sgml,v 1.11 2003/11/11 11:48:27 den Exp $
$FreeBSDru: frdp/www/ru/docproj/current.sgml,v 1.12 2003/11/13 09:19:37 den Exp $
Original revision: 1.48
Original revision: 1.55
-->
<html>
@ -51,8 +51,6 @@
<li><a href="#newpapers">îÁÐÉÓÁÎÉÅ ÎÅËÏÔÏÒÙÈ ÎÏ×ÙÈ ÄÏËÕÍÅÎÔÏ×</a></li>
<li><a href="#develbook">îÁÐÉÓÁÎÉÅ ÎÅËÏÔÏÒÙÈ ÇÌÁ× ÄÌÑ òÕËÏ×ÏÄÓÔ×Á
òÁÚÒÁÂÏÔÞÉËÁ</a></li>
<li><a href="#newkernelmanpages">
îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà óÐÒÁ×ÏÞÎÉËÁ ÐÏ ÑÄÒÕ</a></li>
<li><a href="#cgiscripts">óËÒÉÐÔÙ CGI</a></li>
<li><a href="#multilingualwebscripts">íÎÏÇÏÎÁÃÉÏÎÁÌØÎÙÅ ÓËÒÉÐÔÙ Web</a></li>
<li><a href="#translations">ðÅÒÅ×ÏÄÙ ÄÏËÕÍÅÎÔÁÃÉÉ FreeBSD</a></li>
@ -60,6 +58,8 @@
õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÉÑ ÓÒÅÄÓÔ× ÐÏÉÓËÁ</a></li>
<li><a href="#tunables">äÏËÕÍÅÎÔÉÒÏ×ÁÎÉÅ ÐÁÒÁÍÅÔÒÏ× ÎÁÓÔÒÏÊËÉ
FreeBSD</a></li>
<li><a href="#newkernelmanpages">
îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ ÒÁÚÄÅÌÁ 9</a></li>
<li><a href="#sec4manualpages">îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ
ÒÁÚÄÅÌÁ 4</a></li>
</ul>
@ -151,13 +151,6 @@
ÐÏÍÏÇÉÔÅ ÎÁÍ ÚÁËÏÎÞÉÔØ ËÎÉÇÕ.</li>
</ul>
<a name="newkernelmanpages"></a>
<h3><font color="#660000">îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà óÐÒÁ×ÏÞÎÉËÁ ÐÏ ÑÄÒÕ</font></h3>
<p><b>ïÔ×ÅÔÓÔ×ÅÎÎÙÊ:</b>
Tom Rhodes &lt;<a href="mailto:trhodes@FreeBSD.org">trhodes@FreeBSD.org</a>&gt;</p>
<p><b>ïÐÉÓÁÎÉÅ:</b> äÏËÕÍÅÎÔÉÒÏ×ÁÎÉÅ ÆÕÎËÃÉÊ ÑÄÒÁ, ÒÁÚÄÅÌ 9</p>
<a name="cgiscripts"></a>
<h3><font color="#660000">óËÒÉÐÔÙ CGI</font></h3>
<p><b>ïÔ×ÅÔÓÔ×ÅÎÎÙÊ:</b>
@ -232,6 +225,13 @@
ÎÁÓÔÒÏÊËÉ. óÌÅÄÏ×ÁÔÅÌØÎÏ, ÎÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÓÏÚÄÁÔØ ÜÔÏÔ ÓÐÉÓÏË ÉÚ
ÉÓÈÏÄÎÏÇÏ ËÏÄÁ.</p>
<a name="newkernelmanpages"></a>
<h3><font color="#660000">îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ ÒÁÚÄÅÌÁ 9</font></h3>
<p><b>ïÔ×ÅÔÓÔ×ÅÎÎÙÊ:</b>
Tom Rhodes &lt;<a href="mailto:trhodes@FreeBSD.org">trhodes@FreeBSD.org</a>&gt;
É Hiten Pandya &lt;<a href="mailto:hmp@FreeBSD.org">hmp@FreeBSD.org</a>&gt;</p>
<p><b>ïÐÉÓÁÎÉÅ:</b> äÏËÕÍÅÎÔÉÒÏ×ÁÎÉÅ ÉÎÔÅÒÆÅÊÓÏ× É ÆÕÎËÃÉÊ ÑÄÒÁ.</p>
<a name="sec4manualpages"></a>
<h3><font color="#660000">îÁÐÉÓÁÎÉÅ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ ÒÁÚÄÅÌÁ 4</font></h3>
@ -288,9 +288,9 @@
<tr>
<td> emu10k1(4) </td>
<td> ÄÒÁÊ×ÅÒ Soundblaster Pro</td>
<td> &a.trhodes; </td>
<td> &a.trhodes;, &a.hmp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &status.done; </td>
</tr>
<tr>
@ -320,9 +320,9 @@
<tr>
<td> ips(4) </td>
<td> ËÏÎÔÒÏÌÌÅÒ IBM/Adaptec ServerRAID</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.trhodes; </td>
<td> 11 ÎÏÑÂÒÑ 2003 </td>
<td> &status.done; </td>
</tr>
<tr>
@ -333,14 +333,6 @@
<td> &status.new; </td>
</tr>
<tr>
<td> mpu(4) </td>
<td> ÄÒÁÊ×ÅÒ Roland MPU-401 MIDI</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
</tr>
<tr>
<td> mss(4) </td>
<td> AD1848-ÓÏ×ÍÅÓÔÉÍÙÊ ÄÒÁÊ×ÅÒ MSS/WSS</td>
@ -416,9 +408,9 @@
<tr>
<td> uaudio(4) </td>
<td> ÄÒÁÊ×ÅÒ USB Audio</td>
<td> &nbsp; </td>
<td> 7 ÎÏÑÂÒÑ 2003 </td>
<td> &status.new; </td>
<td> &a.hmp; </td>
<td> 10 ÎÏÑÂÒÑ 2003 </td>
<td> &status.done; </td>
</tr>
<tr>

View file

@ -2,11 +2,13 @@
The FreeBSD Russian Documentation Project
$FreeBSD$
$FreeBSDru: frdp/www/ru/includes.sgml,v 1.14 2003/10/29 13:55:21 den Exp $
$FreeBSDru: frdp/www/ru/includes.sgml,v 1.15 2003/11/20 11:25:22 den Exp $
Original revision: 1.61
Original revision: 1.62
-->
<!ENTITY url.doc.langcode 'ru_RU.KOI8-R'>
<!--
Base is the absolute URL for the given page, minus the actual page
part. It should either be specified as a fully qualified URL, or
@ -29,11 +31,8 @@
<!-- Components making up the standard headers and footers. -->
<!-- Override in the prolog <em>before</em> including this -->
<!-- file if necessary. -->
<!ENTITY copyright '&copy; 1995-2003 The FreeBSD Project. All rights reserved.'>
<!ENTITY email 'freebsd-questions'>
<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>
<!ENTITY date ''>
<!ENTITY home '<a href="&base;/"><img src="&base;/../gifs/home.gif"
<!ENTITY home '<a href="&base;/index.html"><img src="&base;/../gifs/home.gif"
alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
<!ENTITY stylesheet '&base;/../freebsd.css'>
@ -52,19 +51,16 @@ src="&base;/../gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border
<map name="bar">
<area shape="rect" coords="1,1,111,31" href="&base;/index.html" alt="Top">
<area shape="rect" coords="112,11,196,31" href="&base;/../ports/index.html" alt="Applications">
<area shape="rect" coords="112,11,196,31" href="&base;/ports/index.html" alt="Applications">
<area shape="rect" coords="196,12,257,33" href="&base;/support.html" alt="Support">
<area shape="rect" coords="256,12,365,33" href="&base;/docs.html" alt="Documentation">
<area shape="rect" coords="366,13,424,32" href="&base;/../commercial/commercial.html" alt="Vendors">
<area shape="rect" coords="425,16,475,32" href="&base;/../search/search.html" alt="Search">
<area shape="rect" coords="477,16,516,33" href="&base;/../search/index-site.html" alt="Index">
<area shape="rect" coords="366,13,424,32" href="&base;/commercial/commercial.html" alt="Vendors">
<area shape="rect" coords="425,16,475,32" href="&base;/search/search.html" alt="Search">
<area shape="rect" coords="477,16,516,33" href="&base;/search/index-site.html" alt="Index">
<area shape="rect" coords="516,15,562,33" href="&base;/index.html" alt="Top">
<area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="Top">
</map>'>
<!ENTITY footer '<HR NOSHADE>
<address>&author;<br>&date;</address>'>
<!-- XXX rel.current and u.rel.* should be available in doc/ -->
<!-- The currently released versions of FreeBSD. This value is used to
create some links on web sites and such, so do NOT change it until
@ -94,17 +90,17 @@ src="&base;/../gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border
<!ENTITY u.rel.announce '&base;/../releases/&rel.current;R/announce.html'>
<!ENTITY u.rel.errata '&base;/../releases/&rel.current;R/errata.html'>
<!ENTITY u.rel.hardware '&base;/../releases/&rel.current;R/hardware.html'>
<!ENTITY u.rel.early '&base;/releases/&rel.current;R/early-adopter.html'>
<!ENTITY u.rel.early '&base;/../releases/&rel.current;R/early-adopter.html'>
<!-- Secondary "current release" entities -->
<!ENTITY rel2.current '4.9'>
<!ENTITY rel2.current.date 'ïËÔÑÂÒØ 2003'>
<!-- 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.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'>
<!-- macro for webbuild paper -->
<!ENTITY webbuild '
@ -112,24 +108,12 @@ src="&base;/../gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border
ÄÅÒÅ×Á CVS × ÒÕÞÎÏÍ ÒÅÖÉÍÅ.</p>'>
<!-- avoid replacing &nbsp; etc. with hardcoded Latin1 values -->
<!ENTITY nbsp SDATA "[nbsp ]">
<!ENTITY copy SDATA "[copy ]">
<!ENTITY reg SDATA "[reg ]">
<!ENTITY deg SDATA "[deg ]">
<!ENTITY middot SDATA "[middot ]">
<!ENTITY raquo SDATA "[raquo ]">
<!ENTITY laquo SDATA "[laquo ]">
<!ENTITY Eacute SDATA "[x00C9 ]">
<!-- Often used trademarks -->
<!ENTITY unix 'UNIX&reg;'>
<!ENTITY java 'Java&trade;'>
<!ENTITY jdk 'JDK&trade;'>
<!ENTITY posix 'POSIX&reg;'>
<!-- Language-specific entities should be put above this line -->
<!-- XXX: for compatibility with not updated pages -->
<!ENTITY a.latest.not '<a href="&base;/releases/4.6.2R/notes.html">'>
<!ENTITY a.latest.ann '<a href="&base;/releases/4.6.2R/announce.html">'>
<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
%includes.global;
<!--
Local Variables:

View file

@ -3,9 +3,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/news/news.xml,v 1.29 2003/10/29 13:52:54 den Exp $
$FreeBSDru: frdp/www/ru/news/news.xml,v 1.30 2003/11/13 09:19:37 den Exp $
Original revision: 1.176
Original revision: 1.178
-->
<!-- Simple schema for FreeBSD Project news.
@ -36,6 +36,24 @@
<year>
<name>2003</name>
<month>
<name>îÏÑÂÒØ</name>
<day>
<name>12</name>
<event>
<p>îÏ×ÙÊ ËÏÍÍÉÔÔÅÒ: <a href="mailto:pav@FreeBSD.org">Pav Lucistnik</a>
(ðÏÒÔÙ)</p>
</event>
<event>
<p>îÏ×ÙÊ ËÏÍÍÉÔÔÅÒ: <a
href="mailto:andre@FreeBSD.org">Andre Oppermann</a>
(src)</p>
</event>
</day>
</month>
<month>
<name>ïËÔÑÂÒØ</name>

View file

@ -3,9 +3,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/news/press.xml,v 1.22 2003/11/11 11:48:28 den Exp $
$FreeBSDru: frdp/www/ru/news/press.xml,v 1.23 2003/11/13 09:19:37 den Exp $
Original revision: 1.102
Original revision: 1.103
-->
<!--
@ -27,6 +27,17 @@
<month>
<name>îÏÑÂÒØ</name>
<story>
<name>ïÔ Linux Ë FreeBSD: ïÂÚÏÒ FreeBSD</name>
<url>http://www.osnews.com/story.php?news_id=5106</url>
<site-name>OSNews</site-name>
<site-url>http://www.osnews.com</site-url>
<date>11 ÎÏÑÂÒÑ 2003</date>
<author>Gabe Yoder</author>
<p>á×ÔÏÒ ÄÅÌÁÅÔ ËÒÁÔËÉÊ ÏÂÚÏÒ FreeBSD 4.8 É ÓÒÁ×ÎÉ×ÁÅÔ
ÅÅ Ó GNU/Linux.</p>
</story>
<story>
<name>ï ÐÅÞÁÔÉ ÄÌÑ ÎÅÔÅÒÐÅÌÉ×ÙÈ</name>
<url>http://www.onlamp.com/lpt/a/4303</url>