You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sj...@apache.org on 2010/11/03 12:58:05 UTC
svn commit: r1030424 - in /harmony/standard/site/trunk: docs/
docs/documentation/ docs/subcomponents/classlibrary/
docs/subcomponents/drlvm/ xdocs/ xdocs/documentation/
xdocs/subcomponents/classlibrary/ xdocs/subcomponents/drlvm/
Author: sjanuary
Date: Wed Nov 3 11:58:03 2010
New Revision: 1030424
URL: http://svn.apache.org/viewvc?rev=1030424&view=rev
Log:
Add trademark symbols for first use of trademarks where required.
Modified:
harmony/standard/site/trunk/docs/bundles.html
harmony/standard/site/trunk/docs/documentation/dev_eclipse.html
harmony/standard/site/trunk/docs/documentation/eclipse_update.html
harmony/standard/site/trunk/docs/download.html
harmony/standard/site/trunk/docs/index.html
harmony/standard/site/trunk/docs/index.ru.html
harmony/standard/site/trunk/docs/newshistory.html
harmony/standard/site/trunk/docs/newshistory.ru.html
harmony/standard/site/trunk/docs/quickhelp_contributors.html
harmony/standard/site/trunk/docs/quickhelp_contributors.ru.html
harmony/standard/site/trunk/docs/sitemap.html
harmony/standard/site/trunk/docs/subcomponents/classlibrary/index.html
harmony/standard/site/trunk/docs/subcomponents/classlibrary/pkgnaming.html
harmony/standard/site/trunk/docs/subcomponents/drlvm/index.html
harmony/standard/site/trunk/xdocs/bundles.xml
harmony/standard/site/trunk/xdocs/documentation/dev_eclipse.xml
harmony/standard/site/trunk/xdocs/documentation/eclipse_update.xml
harmony/standard/site/trunk/xdocs/download.xml
harmony/standard/site/trunk/xdocs/index.ru.xml
harmony/standard/site/trunk/xdocs/index.xml
harmony/standard/site/trunk/xdocs/newshistory.ru.xml
harmony/standard/site/trunk/xdocs/newshistory.xml
harmony/standard/site/trunk/xdocs/quickhelp_contributors.ru.xml
harmony/standard/site/trunk/xdocs/quickhelp_contributors.xml
harmony/standard/site/trunk/xdocs/sitemap.xml
harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/index.xml
harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/pkgnaming.xml
harmony/standard/site/trunk/xdocs/subcomponents/drlvm/index.xml
Modified: harmony/standard/site/trunk/docs/bundles.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/bundles.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/bundles.html (original)
+++ harmony/standard/site/trunk/docs/bundles.html Wed Nov 3 11:58:03 2010
@@ -212,7 +212,7 @@ limitations under the License.
</p>
<ul>
<li>
- <a href="#eclipse-harmony">In Harmony with Eclipse</a>
+ <a href="#eclipse-harmony">In Harmony with Eclipseâ¢</a>
</li>
<li>
<a href="#Tomcat">Apache Tomcat</a>
Modified: harmony/standard/site/trunk/docs/documentation/dev_eclipse.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/documentation/dev_eclipse.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/documentation/dev_eclipse.html (original)
+++ harmony/standard/site/trunk/docs/documentation/dev_eclipse.html Wed Nov 3 11:58:03 2010
@@ -36,7 +36,7 @@ limitations under the License.
- <title>Apache Harmony - Apache Harmony Development Using Eclipse</title>
+ <title>Apache Harmony - Apache Harmony Development Using Eclipseâ¢</title>
@@ -256,7 +256,7 @@ limitations under the License.
<p>
Next you will need the code to work with. <i>For class library development</i>,
- you will need a compatible VM, such as DRLVM or IBM virtual machine (the latter
+ you will need a compatible VM, such as DRLVM or IBM® virtual machine (the latter
available under a non-open source, binary evaluation license). Install the VM following the
instructions that accompany that VM in the same location as the class libraries build (or the
location you will be building to if you are building the class libraries yourself).
Modified: harmony/standard/site/trunk/docs/documentation/eclipse_update.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/documentation/eclipse_update.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/documentation/eclipse_update.html (original)
+++ harmony/standard/site/trunk/docs/documentation/eclipse_update.html Wed Nov 3 11:58:03 2010
@@ -36,7 +36,7 @@ limitations under the License.
- <title>Apache Harmony - Apache Harmony Eclipse Plug-in</title>
+ <title>Apache Harmony - Apache Harmony Eclipse⢠Plug-in</title>
Modified: harmony/standard/site/trunk/docs/download.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/download.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/download.html (original)
+++ harmony/standard/site/trunk/docs/download.html Wed Nov 3 11:58:03 2010
@@ -298,7 +298,7 @@ limitations under the License.
</ul>
</li>
<li>
- <a href="documentation/eclipse_update.html">Eclipse plug-in for Apache Harmony VM</a>
+ <a href="documentation/eclipse_update.html">Eclipse⢠plug-in for Apache Harmony VM</a>
</li>
</ul>
</p>
Modified: harmony/standard/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/index.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/index.html (original)
+++ harmony/standard/site/trunk/docs/index.html Wed Nov 3 11:58:03 2010
@@ -383,7 +383,7 @@ limitations under the License.
Regular milestone builds.
</li>
<li>
- JRE can run popular programs like Apache Tomcat, Eclipse, Maven, Derby, Ant
+ JRE can run popular programs like Apache Tomcat, Eclipseâ¢, Apache Maven, Apache Derby, Apache Ant
</li>
<li>
More than
Modified: harmony/standard/site/trunk/docs/index.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/index.ru.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/index.ru.html (original)
+++ harmony/standard/site/trunk/docs/index.ru.html Wed Nov 3 11:58:03 2010
@@ -203,7 +203,7 @@ limitations under the License.
<!-- MAIN CONTENT -->
<div id="top">
<h1>
- <a name="ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmony!">ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmony!</a>
+ <a name="ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmonyâ¢!">ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmonyâ¢!</a>
</h1>
<p style="text-align: right">RU | <a href="index.html">EN</a></p>
<P><strong>Ðнимание</strong>: ÐÐ°Ð½Ð½Ð°Ñ ÑÑÑаниÑа ÑвлÑеÑÑÑ Ð¿ÐµÑеводом английÑкой
@@ -300,7 +300,7 @@ limitations under the License.
на вÑеÑ
поддеÑживаемÑÑ
плаÑÑоÑмаÑ
</li>
<li>
РнаÑей ÑеализаÑии ÑÑÐµÐ´Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ JRE ÑÑпеÑно ÑабоÑаÑÑ Ñакие попÑлÑÑнÑе пÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ðº
- Apache Tomcat, Eclipse, Maven, Derby, и Ant
+ Apache Tomcat, Eclipseâ¢, Apache Maven, Apache Derby, и Apache Ant
</li>
<li>Реализовано более 99% инÑеÑÑейÑа Java 5 (завеÑÑено но не ÑеÑÑиÑиÑиÑовано на ÑовмеÑÑимоÑÑÑ)
</li>
Modified: harmony/standard/site/trunk/docs/newshistory.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/newshistory.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/newshistory.html (original)
+++ harmony/standard/site/trunk/docs/newshistory.html Wed Nov 3 11:58:03 2010
@@ -521,7 +521,7 @@ limitations under the License.
<dd> Our <a href="download.cgi">latest snapshots</a> have
lots of new fixes and features. The VM has a new GC,
almost complete JVMTI, and now can co-exist with
- <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the IBM VME</a> in
+ <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the IBM® VME</a> in
the Harmony JRE structure. Our classlibrary continues to grow with new
classes, notably CORBA, thanks to <a href="http://incubator.apache.org/yoko">
Apache Yoko</a>.
Modified: harmony/standard/site/trunk/docs/newshistory.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/newshistory.ru.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/newshistory.ru.html (original)
+++ harmony/standard/site/trunk/docs/newshistory.ru.html Wed Nov 3 11:58:03 2010
@@ -477,7 +477,7 @@ limitations under the License.
<dt>ÐоÑÑÑÐ¿Ð½Ñ Ð½Ð¾Ð²Ñе ÑбоÑки кода</dt>
<dd> Ð <a href="download.cgi">новÑе ÑбоÑки кода</a> воÑел ÑелÑй ÑÑд иÑпÑавлений и добавлений,
вклÑÑÐ°Ñ Ð½Ð¾Ð²Ñй коллекÑÐ¾Ñ Ð¸ пÑакÑиÑеÑки полнÑÑ ÑеализаÑÐ¸Ñ Ð¸Ð½ÑеÑÑейÑа JVMTI. ÐÑоме Ñого,
- виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM VME</a>
+ виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM® VME</a>
ÑепеÑÑ Ð¼Ð¾Ð¶ÐµÑ ÑÑнкÑиониÑоваÑÑ Ð² ÑÑÑÑкÑÑÑе ÑÑÐµÐ´Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ JRE. ÐÐ°Ð±Ð¾Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñек пÑодолжаеÑ
пополнÑÑÑÑÑ Ð½Ð¾Ð²Ñми клаÑÑами, в Ñом ÑиÑле CORBA, за ÑÑо Ð¼Ñ Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñим пÑоекÑ<a href="http://incubator.apache.org/yoko">
Apache Yoko</a>. Ð ÑÑой веÑÑии ÑбоÑки вÑполнено множеÑÑво иÑпÑавлений и попÑавок
Modified: harmony/standard/site/trunk/docs/quickhelp_contributors.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/quickhelp_contributors.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/quickhelp_contributors.html (original)
+++ harmony/standard/site/trunk/docs/quickhelp_contributors.html Wed Nov 3 11:58:03 2010
@@ -274,7 +274,7 @@ limitations under the License.
the version of the tool you use. For example, edit <code>~/.subversion/servers</code>
file for console version of <code>svn</code>.
</p>
- <p>Optional (but recommended) prerequisite is an Eclipse Java Compiler (ECJ), version 3.2 or higher.
+ <p>Optional (but recommended) prerequisite is an Eclipse⢠Java Compiler (ECJ), version 3.2 or higher.
You need to <a href="http://download.eclipse.org/eclipse/downloads/">download</a>
standalone ecj.jar and put it to <code>ANT_HOME/lib</code> directory.
Alternatively, you can switch to any other Java 1.5 compiler supported by Ant
@@ -580,7 +580,7 @@ $ ant</pre>
<b>Class library developers</b> can work with DRLVM or install
another compatible VM. For example, you can use the
<a href="http://www.ibm.com/developerworks/java/jdk/harmony/index.html">
- IBM virtual machine
+ IBM® virtual machine
</a> that has been generously made available for the project's
development needs by IBM under a non-open source, binary evaluation license.
To install the VM, follow the instructions that accompany that VM.
Modified: harmony/standard/site/trunk/docs/quickhelp_contributors.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/quickhelp_contributors.ru.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/quickhelp_contributors.ru.html (original)
+++ harmony/standard/site/trunk/docs/quickhelp_contributors.ru.html Wed Nov 3 11:58:03 2010
@@ -250,7 +250,7 @@ limitations under the License.
-Dhttp.proxyPort=<proxy></pre>
</li>
</ul>
- <p>ÐеобÑзаÑелÑнÑм (но ÑекомендкемÑм) ÐÐ ÑвлÑеÑÑÑ Eclipse Java Compiler (ECJ),
+ <p>ÐеобÑзаÑелÑнÑм (но ÑекомендкемÑм) ÐÐ ÑвлÑеÑÑÑ Eclipse⢠Java Compiler (ECJ),
веÑÑÐ¸Ñ 3.2 или более позднÑÑ.
ÐÑ Ð¼Ð¾Ð¶ÐµÑе <a href="http://download.eclipse.org/eclipse/downloads/">ÑкаÑаÑÑ</a>
ecj.jar как оÑделÑнÑй Ñайл и помеÑÑиÑÑ ÐµÐ³Ð¾ в Ð¿Ð°Ð¿ÐºÑ <code>ANT_HOME/lib</code>.
@@ -458,7 +458,7 @@ $ ant</pre>
<a id="assemble-jdk" />
<p>РазÑабоÑÑики библиоÑек клаÑÑов могÑÑ Ð¸ÑполÑзоваÑÑ Ð²Ð¸ÑÑÑалÑнÑÑ Ð¼Ð°ÑÐ¸Ð½Ñ DRLVM
- или ÑÑÑановиÑÑ Ð´ÑÑгÑÑ ÑовмеÑÑимÑÑ ÐÐ. ÐапÑимеÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе иÑполÑзоваÑÑ IBM
+ или ÑÑÑановиÑÑ Ð´ÑÑгÑÑ ÑовмеÑÑимÑÑ ÐÐ. ÐапÑимеÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе иÑполÑзоваÑÑ IBM®
virtual machine коÑоÑÐ°Ñ Ð±Ñла пÑедоÑÑавлена компанией IBM Ð´Ð»Ñ Ð½Ñжд ÑазÑабоÑÑиков
пÑоекÑа на ÑÑловиÑÑ
пÑобной, не оÑкÑÑÑой лиÑензии на вÑполнÑемÑй код.
ÐÐ»Ñ ÑÑÑановки ÐÐ ÑледÑйÑе пÑилагаÑÑейÑÑ Ð´Ð¾ÐºÑменÑаÑии. ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑазвеÑнÑÑÑ
Modified: harmony/standard/site/trunk/docs/sitemap.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/sitemap.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/sitemap.html (original)
+++ harmony/standard/site/trunk/docs/sitemap.html Wed Nov 3 11:58:03 2010
@@ -385,7 +385,7 @@ limitations under the License.
<p>
<a href="documentation/dev_eclipse.html">
- Getting Started with Eclipse</a>
+ Getting Started with Eclipseâ¢</a>
to develop Java code in Apache Harmony, featuring
<a href="documentation/dev_eclipse_movie.html">
a
Modified: harmony/standard/site/trunk/docs/subcomponents/classlibrary/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/subcomponents/classlibrary/index.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/subcomponents/classlibrary/index.html (original)
+++ harmony/standard/site/trunk/docs/subcomponents/classlibrary/index.html Wed Nov 3 11:58:03 2010
@@ -234,7 +234,7 @@ limitations under the License.
</li>
<li>
- <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse IDE</a>
+ <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse⢠IDE</a>
<br />
Describes how to set up Eclipse to develop the class library code.
Modified: harmony/standard/site/trunk/docs/subcomponents/classlibrary/pkgnaming.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/subcomponents/classlibrary/pkgnaming.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/subcomponents/classlibrary/pkgnaming.html (original)
+++ harmony/standard/site/trunk/docs/subcomponents/classlibrary/pkgnaming.html Wed Nov 3 11:58:03 2010
@@ -209,7 +209,7 @@ limitations under the License.
<small>
<em>
This section is inspired by, and derived from,
- <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the Eclipse package naming convention</a>
+ <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the Eclipse⢠package naming convention</a>
documentation.
</em>
</small>
Modified: harmony/standard/site/trunk/docs/subcomponents/drlvm/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/docs/subcomponents/drlvm/index.html?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/docs/subcomponents/drlvm/index.html (original)
+++ harmony/standard/site/trunk/docs/subcomponents/drlvm/index.html Wed Nov 3 11:58:03 2010
@@ -241,7 +241,7 @@ limitations under the License.
Getting Started with DRLVM
</a>
<br />
- Basic usage scenarios of VM: starting an application, working in Eclipse
+ Basic usage scenarios of VM: starting an application, working in Eclipseâ¢
</li>
<li> <a href="debugging_VM_and_JIT.html">Debugging VM and JIT</a>
<br />
Modified: harmony/standard/site/trunk/xdocs/bundles.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/bundles.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/bundles.xml (original)
+++ harmony/standard/site/trunk/xdocs/bundles.xml Wed Nov 3 11:58:03 2010
@@ -34,7 +34,7 @@
</p>
<ul>
<li>
- <a href="#eclipse-harmony">In Harmony with Eclipse</a>
+ <a href="#eclipse-harmony">In Harmony with Eclipse™</a>
</li>
<li>
<a href="#Tomcat">Apache Tomcat</a>
Modified: harmony/standard/site/trunk/xdocs/documentation/dev_eclipse.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/documentation/dev_eclipse.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/documentation/dev_eclipse.xml (original)
+++ harmony/standard/site/trunk/xdocs/documentation/dev_eclipse.xml Wed Nov 3 11:58:03 2010
@@ -21,7 +21,7 @@
<document>
<properties>
- <title>Apache Harmony Development Using Eclipse</title>
+ <title>Apache Harmony Development Using Eclipse™</title>
<author email="dev@harmony.apache.org">Harmony Documentation Team</author>
</properties>
@@ -72,7 +72,7 @@
<subsection name="Getting the Code">
<p>
Next you will need the code to work with. <i>For class library development</i>,
- you will need a compatible VM, such as DRLVM or IBM virtual machine (the latter
+ you will need a compatible VM, such as DRLVM or IBM® virtual machine (the latter
available under a non-open source, binary evaluation license). Install the VM following the
instructions that accompany that VM in the same location as the class libraries build (or the
location you will be building to if you are building the class libraries yourself).
Modified: harmony/standard/site/trunk/xdocs/documentation/eclipse_update.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/documentation/eclipse_update.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/documentation/eclipse_update.xml (original)
+++ harmony/standard/site/trunk/xdocs/documentation/eclipse_update.xml Wed Nov 3 11:58:03 2010
@@ -21,7 +21,7 @@
<document>
<properties>
- <title>Apache Harmony Eclipse Plug-in</title>
+ <title>Apache Harmony Eclipse™ Plug-in</title>
<author email="dev@harmony.apache.org">Harmony Documentation Team</author>
</properties>
Modified: harmony/standard/site/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/download.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/download.xml (original)
+++ harmony/standard/site/trunk/xdocs/download.xml Wed Nov 3 11:58:03 2010
@@ -126,7 +126,7 @@
</ul>
</li>
<li>
- <a href="documentation/eclipse_update.html">Eclipse plug-in for Apache Harmony VM</a>
+ <a href="documentation/eclipse_update.html">Eclipse™ plug-in for Apache Harmony VM</a>
</li>
</ul>
</p>
Modified: harmony/standard/site/trunk/xdocs/index.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/index.ru.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/index.ru.xml (original)
+++ harmony/standard/site/trunk/xdocs/index.ru.xml Wed Nov 3 11:58:03 2010
@@ -26,7 +26,7 @@
<body>
- <section name="ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmony!">
+ <section name="ÐобÑо пожаловаÑÑ Ð² пÑÐ¾ÐµÐºÑ Apache Harmony™!">
<p style="text-align: right">RU | <a href="index.html">EN</a></p>
<P><strong>Ðнимание</strong>: ÐÐ°Ð½Ð½Ð°Ñ ÑÑÑаниÑа ÑвлÑеÑÑÑ Ð¿ÐµÑеводом английÑкой
веÑÑии на ÑайÑе и наÑ
одиÑÑÑ Ð² ÑÑадии ÑазÑабоÑки.</P>
@@ -121,7 +121,7 @@
на вÑеÑ
поддеÑживаемÑÑ
плаÑÑоÑмаÑ
</li>
<li>
РнаÑей ÑеализаÑии ÑÑÐµÐ´Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ JRE ÑÑпеÑно ÑабоÑаÑÑ Ñакие попÑлÑÑнÑе пÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ðº
- Apache Tomcat, Eclipse, Maven, Derby, и Ant
+ Apache Tomcat, Eclipse™, Apache Maven, Apache Derby, и Apache Ant
</li>
<li>Реализовано более 99% инÑеÑÑейÑа Java 5 (завеÑÑено но не ÑеÑÑиÑиÑиÑовано на ÑовмеÑÑимоÑÑÑ)
</li>
Modified: harmony/standard/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/index.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/index.xml (original)
+++ harmony/standard/site/trunk/xdocs/index.xml Wed Nov 3 11:58:03 2010
@@ -204,7 +204,7 @@
Regular milestone builds.
</li>
<li>
- JRE can run popular programs like Apache Tomcat, Eclipse, Maven, Derby, Ant
+ JRE can run popular programs like Apache Tomcat, Eclipse™, Apache Maven, Apache Derby, Apache Ant
</li>
<li>
More than
Modified: harmony/standard/site/trunk/xdocs/newshistory.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/newshistory.ru.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/newshistory.ru.xml (original)
+++ harmony/standard/site/trunk/xdocs/newshistory.ru.xml Wed Nov 3 11:58:03 2010
@@ -296,7 +296,7 @@
<dt>ÐоÑÑÑÐ¿Ð½Ñ Ð½Ð¾Ð²Ñе ÑбоÑки кода</dt>
<dd> Ð <a href="download.cgi">новÑе ÑбоÑки кода</a> воÑел ÑелÑй ÑÑд иÑпÑавлений и добавлений,
вклÑÑÐ°Ñ Ð½Ð¾Ð²Ñй коллекÑÐ¾Ñ Ð¸ пÑакÑиÑеÑки полнÑÑ ÑеализаÑÐ¸Ñ Ð¸Ð½ÑеÑÑейÑа JVMTI. ÐÑоме Ñого,
- виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM VME</a>
+ виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM® VME</a>
ÑепеÑÑ Ð¼Ð¾Ð¶ÐµÑ ÑÑнкÑиониÑоваÑÑ Ð² ÑÑÑÑкÑÑÑе ÑÑÐµÐ´Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ JRE. ÐÐ°Ð±Ð¾Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñек пÑодолжаеÑ
пополнÑÑÑÑÑ Ð½Ð¾Ð²Ñми клаÑÑами, в Ñом ÑиÑле CORBA, за ÑÑо Ð¼Ñ Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñим пÑоекÑ<a href="http://incubator.apache.org/yoko">
Apache Yoko</a>. Ð ÑÑой веÑÑии ÑбоÑки вÑполнено множеÑÑво иÑпÑавлений и попÑавок
Modified: harmony/standard/site/trunk/xdocs/newshistory.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/newshistory.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/newshistory.xml (original)
+++ harmony/standard/site/trunk/xdocs/newshistory.xml Wed Nov 3 11:58:03 2010
@@ -340,7 +340,7 @@
<dd> Our <a href="download.cgi">latest snapshots</a> have
lots of new fixes and features. The VM has a new GC,
almost complete JVMTI, and now can co-exist with
- <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the IBM VME</a> in
+ <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the IBM® VME</a> in
the Harmony JRE structure. Our classlibrary continues to grow with new
classes, notably CORBA, thanks to <a href="http://incubator.apache.org/yoko">
Apache Yoko</a>.
Modified: harmony/standard/site/trunk/xdocs/quickhelp_contributors.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/quickhelp_contributors.ru.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/quickhelp_contributors.ru.xml (original)
+++ harmony/standard/site/trunk/xdocs/quickhelp_contributors.ru.xml Wed Nov 3 11:58:03 2010
@@ -71,7 +71,7 @@
-Dhttp.proxyPort=<proxy></pre>
</li>
</ul>
- <p>ÐеобÑзаÑелÑнÑм (но ÑекомендкемÑм) ÐÐ ÑвлÑеÑÑÑ Eclipse Java Compiler (ECJ),
+ <p>ÐеобÑзаÑелÑнÑм (но ÑекомендкемÑм) ÐÐ ÑвлÑеÑÑÑ Eclipse™ Java Compiler (ECJ),
веÑÑÐ¸Ñ 3.2 или более позднÑÑ.
ÐÑ Ð¼Ð¾Ð¶ÐµÑе <a href="http://download.eclipse.org/eclipse/downloads/">ÑкаÑаÑÑ</a>
ecj.jar как оÑделÑнÑй Ñайл и помеÑÑиÑÑ ÐµÐ³Ð¾ в Ð¿Ð°Ð¿ÐºÑ <code>ANT_HOME/lib</code>.
@@ -272,7 +272,7 @@ $ ant</pre>
<subsection name="3. ÐонÑÑÑÑиÑование ÑÑÐµÐ´Ñ Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸Ð· ÑкомпилиÑованнÑÑ
компоненÑ">
<a id="assemble-jdk"/>
<p>РазÑабоÑÑики библиоÑек клаÑÑов могÑÑ Ð¸ÑполÑзоваÑÑ Ð²Ð¸ÑÑÑалÑнÑÑ Ð¼Ð°ÑÐ¸Ð½Ñ DRLVM
- или ÑÑÑановиÑÑ Ð´ÑÑгÑÑ ÑовмеÑÑимÑÑ ÐÐ. ÐапÑимеÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе иÑполÑзоваÑÑ IBM
+ или ÑÑÑановиÑÑ Ð´ÑÑгÑÑ ÑовмеÑÑимÑÑ ÐÐ. ÐапÑимеÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе иÑполÑзоваÑÑ IBM®
virtual machine коÑоÑÐ°Ñ Ð±Ñла пÑедоÑÑавлена компанией IBM Ð´Ð»Ñ Ð½Ñжд ÑазÑабоÑÑиков
пÑоекÑа на ÑÑловиÑÑ
пÑобной, не оÑкÑÑÑой лиÑензии на вÑполнÑемÑй код.
ÐÐ»Ñ ÑÑÑановки ÐÐ ÑледÑйÑе пÑилагаÑÑейÑÑ Ð´Ð¾ÐºÑменÑаÑии. ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑазвеÑнÑÑÑ
Modified: harmony/standard/site/trunk/xdocs/quickhelp_contributors.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/quickhelp_contributors.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/quickhelp_contributors.xml (original)
+++ harmony/standard/site/trunk/xdocs/quickhelp_contributors.xml Wed Nov 3 11:58:03 2010
@@ -95,7 +95,7 @@
the version of the tool you use. For example, edit <code>~/.subversion/servers</code>
file for console version of <code>svn</code>.
</p>
- <p>Optional (but recommended) prerequisite is an Eclipse Java Compiler (ECJ), version 3.2 or higher.
+ <p>Optional (but recommended) prerequisite is an Eclipse™ Java Compiler (ECJ), version 3.2 or higher.
You need to <a href="http://download.eclipse.org/eclipse/downloads/">download</a>
standalone ecj.jar and put it to <code>ANT_HOME/lib</code> directory.
Alternatively, you can switch to any other Java 1.5 compiler supported by Ant
@@ -378,7 +378,7 @@ $ ant</source>
<b>Class library developers</b> can work with DRLVM or install
another compatible VM. For example, you can use the
<a href="http://www.ibm.com/developerworks/java/jdk/harmony/index.html">
- IBM virtual machine
+ IBM® virtual machine
</a> that has been generously made available for the project's
development needs by IBM under a non-open source, binary evaluation license.
To install the VM, follow the instructions that accompany that VM.
Modified: harmony/standard/site/trunk/xdocs/sitemap.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/sitemap.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/sitemap.xml (original)
+++ harmony/standard/site/trunk/xdocs/sitemap.xml Wed Nov 3 11:58:03 2010
@@ -197,7 +197,7 @@ limitations under the License.
<p>
<a href="documentation/dev_eclipse.html">
- Getting Started with Eclipse</a>
+ Getting Started with Eclipse™</a>
to develop Java code in Apache Harmony, featuring
<a href="documentation/dev_eclipse_movie.html">
a
Modified: harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/index.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/index.xml (original)
+++ harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/index.xml Wed Nov 3 11:58:03 2010
@@ -53,7 +53,7 @@
</li>
<li>
- <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse IDE</a>
+ <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse™ IDE</a>
<br />
Describes how to set up Eclipse to develop the class library code.
Modified: harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/pkgnaming.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/pkgnaming.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/pkgnaming.xml (original)
+++ harmony/standard/site/trunk/xdocs/subcomponents/classlibrary/pkgnaming.xml Wed Nov 3 11:58:03 2010
@@ -31,7 +31,7 @@
<small>
<em>
This section is inspired by, and derived from,
- <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the Eclipse package naming convention</a>
+ <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the Eclipse™ package naming convention</a>
documentation.
</em>
</small>
Modified: harmony/standard/site/trunk/xdocs/subcomponents/drlvm/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/trunk/xdocs/subcomponents/drlvm/index.xml?rev=1030424&r1=1030423&r2=1030424&view=diff
==============================================================================
--- harmony/standard/site/trunk/xdocs/subcomponents/drlvm/index.xml (original)
+++ harmony/standard/site/trunk/xdocs/subcomponents/drlvm/index.xml Wed Nov 3 11:58:03 2010
@@ -60,7 +60,7 @@
Getting Started with DRLVM
</a>
<br />
- Basic usage scenarios of VM: starting an application, working in Eclipse
+ Basic usage scenarios of VM: starting an application, working in Eclipse™
</li>
<li> <a href="debugging_VM_and_JIT.html">Debugging VM and JIT</a>
<br />