Merge the following from the English version:

1.102 -> 1.105 Makefile
   1.69 -> 1.70 developers.sgml
   1.83 -> 1.90 index.xsl
   1.34 -> 1.35 commercial/commercial.sgml
   1.60 -> 1.61 docproj/current.sgml
   1.18 -> 1.19 java/index.sgml
   1.11 -> 1.12 java/install.sgml
   1.106 -> 1.109 news/press.xml
   1.89 -> 1.92 search/search.sgml

Approved by: phantom (mentor)
This commit is contained in:
Denis Peplin 2003-12-18 09:30:49 +00:00
parent 290ce4a882
commit c60a91e08a
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=19231
9 changed files with 212 additions and 157 deletions

View file

@ -9,9 +9,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/java/index.sgml,v 1.5 2003/10/17 09:02:07 den Exp $
$FreeBSDru: frdp/www/ru/java/index.sgml,v 1.6 2003/12/09 12:07:35 den Exp $
Original revision: 1.18
Original revision: 1.19
-->
<html>
@ -124,6 +124,13 @@
href="http://www.FreeBSDFoundation.org/downloads/java.shtml">FreeBSD
Foundation Java Downloads</a>.</p>
<h3>ôÒÅÂÕÅÔÓÑ ÐÏÍÏÝØ × ÕÓÔÁÎÏ×ËÅ &java; ÎÁ FreeBSD?</h3>
<p>óÔÁÔØÑ <a href="../doc/en_US.ISO8859-1/articles/java-tomcat/">
Java É Jakarta Tomcat</a> ÜÔÏ ÐÏÌÅÚÎÏÅ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ ÎÁÓÔÒÏÊËÅ
&jdk; É JRE&trade; × FreeBSD. ïÎÏ ÔÁËÖÅ ×ËÌÀÞÁÅÔ ÎÅÂÏÌØÛÏÊ ÒÁÚÄÅÌ
ÐÏ ÕÓÔÁÎÏ×ËÅ
<a href="http://jakarta.apache.org/tomcat/">Jakarta Tomcat</a> Ó
<a href="http://www.apache.org/">Apache Software Foundation</a>.
</td>
</tr>
</table>

View file

@ -1,9 +1,9 @@
<!--
The FreeBSD Russian Documentation Project
$FreeBSDru: frdp/www/ru/java/install.sgml,v 1.5 2003/11/11 11:48:27 den Exp $
$FreeBSDru: frdp/www/ru/java/install.sgml,v 1.6 2003/12/09 12:07:35 den Exp $
Original revision: 1.11
Original revision: 1.12
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [