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 14:49:32 UTC
svn commit: r1030467 - in /harmony/standard/site/branches/live: ./ docs/
docs/documentation/ docs/subcomponents/buildtest/ xdocs/
xdocs/documentation/ xdocs/subcomponents/buildtest/
Author: sjanuary
Date: Wed Nov 3 13:49:31 2010
New Revision: 1030467
URL: http://svn.apache.org/viewvc?rev=1030467&view=rev
Log:
Merge addition of more trademark symbols
Modified:
harmony/standard/site/branches/live/ (props changed)
harmony/standard/site/branches/live/docs/contribution_policy.html
harmony/standard/site/branches/live/docs/documentation/build_website.html
harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
harmony/standard/site/branches/live/docs/get-involved.html
harmony/standard/site/branches/live/docs/quickhelp_contributors.html
harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html
harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html
harmony/standard/site/branches/live/docs/svn.html
harmony/standard/site/branches/live/xdocs/contribution_policy.xml
harmony/standard/site/branches/live/xdocs/documentation/build_website.xml
harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml
harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml
harmony/standard/site/branches/live/xdocs/get-involved.xml
harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml
harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml
harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/index.xml
harmony/standard/site/branches/live/xdocs/svn.xml
Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 3 13:49:31 2010
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-1030434
+/harmony/standard/site/trunk:822221-1030457
Modified: harmony/standard/site/branches/live/docs/contribution_policy.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/contribution_policy.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/contribution_policy.html (original)
+++ harmony/standard/site/branches/live/docs/contribution_policy.html Wed Nov 3 13:49:31 2010
@@ -245,7 +245,7 @@ limitations under the License.
<p>
We have divided <a href="http://harmony.apache.org/svn.html">
- our Subversion(SVN) repository</a> into sections. There are two main sections, the "standard"
+ our Subversion® (SVN) repository</a> into sections. There are two main sections, the "standard"
section, for which the standard Apache process applies (namely, the standard
<a href="http://www.apache.org/licenses/icla.txt">Apache ICLA</a>
is all that is required) and the "enhanced" section, which requires any
Modified: harmony/standard/site/branches/live/docs/documentation/build_website.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/build_website.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/build_website.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/build_website.html Wed Nov 3 13:49:31 2010
@@ -215,7 +215,7 @@ limitations under the License.
<ul>
<li>
- <a href="http://subversion.tigris.org/">Subversion</a>
+ <a href="http://subversion.tigris.org/">Subversion®</a>
</li>
<li>
<a href="http://ant.apache.org/">Apache Ant</a>
Modified: harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html Wed Nov 3 13:49:31 2010
@@ -206,14 +206,14 @@ limitations under the License.
<a name="Introduction">Introduction</a>
</h1>
<p>
- The current page provides instructions on how to set up Eclipse to develop Java code
+ The current page provides instructions on how to set up Eclipse⢠to develop Java code
in Apache Harmony, with sections for both DRLVM and class library development.
</p>
<p>
DRLVM specific instructions are only emerging, while class library specific
instructions are in two sets: the <a href="#fastpath">fast path</a>
for people familiar with Eclipse and the source code layout in Harmony's
- Subversion repository; and the
+ Subversion® repository; and the
<a href="#step_guide">step-by-step guide</a>
for novices who want to follow the details of a setup and see a brief
development example.
Modified: harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/eclipse_update.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/eclipse_update.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/eclipse_update.html Wed Nov 3 13:49:31 2010
@@ -206,7 +206,7 @@ limitations under the License.
<a name="Introduction">Introduction</a>
</h1>
<p>
- To use Apache Harmony as an installed JRE in Eclipse requires an
+ To use Apache Harmony as an installed JRE in Eclipse⢠requires an
additional plug-in. The following instructions show the installation
process using screen shots from Eclipse 3.3 running on Windows XP.
</p>
Modified: harmony/standard/site/branches/live/docs/get-involved.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/get-involved.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/get-involved.html (original)
+++ harmony/standard/site/branches/live/docs/get-involved.html Wed Nov 3 13:49:31 2010
@@ -318,7 +318,7 @@ limitations under the License.
provide details, such as how to re-create if a bug, why the
change or enhancement is useful, etc.
</li>
- <li>Use the subversion <code>diff</code> utility to create a patch as follows:
+ <li>Use the Subversion® <code>diff</code> utility to create a patch as follows:
<pre>svn diff file.java > file.patch</pre>
where <code>file</code> is the filename that you have changed. This will produce a
nice patch file that can be added to the <a href="http://issues.apache.org/jira/browse/HARMONY">
Modified: harmony/standard/site/branches/live/docs/quickhelp_contributors.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/quickhelp_contributors.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.html Wed Nov 3 13:49:31 2010
@@ -254,7 +254,7 @@ limitations under the License.
<a href="http://ant.apache.org/">Apache Ant</a> version 1.7.0 or higher
</li>
<li>
- <a href="http://subversion.tigris.org/">Subversion</a> version 1.3 or higher
+ <a href="http://subversion.tigris.org/">Subversion®</a> version 1.3 or higher
</li>
<li>
<a href="">Java SE 5 JDK</a>
Modified: harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html Wed Nov 3 13:49:31 2010
@@ -235,7 +235,7 @@ limitations under the License.
<ul>
<li> Apache Ant веÑÑÐ¸Ñ 1.7.0
</li>
- <li> Subversion веÑÑÐ¸Ñ 1.3 или более позднÑÑ
+ <li> Subversion® веÑÑÐ¸Ñ 1.3 или более позднÑÑ
</li>
<li> Java SE 5 JDK
<p><strong>ÐÑимеÑание:</strong> еÑли Ñ Ð²Ð°Ñ Ð²ÐºÐ»ÑÑен бÑандмаÑÑÑ,
Modified: harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html Wed Nov 3 13:49:31 2010
@@ -315,7 +315,7 @@ limitations under the License.
<a name="Setup">Setup</a>
</h2>
- <p> Get the infrastructure by checking it out from the project Subversion repository:</p>
+ <p> Get the infrastructure by checking it out from the project Subversion® repository:</p>
<pre>svn co http://svn.apache.org/repos/asf/harmony/enhanced/buildtest/trunk/infra</pre>
<p>
With Java, Ant and SVN installed, change into the <code>infra</code>
Modified: harmony/standard/site/branches/live/docs/svn.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/svn.html?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/svn.html (original)
+++ harmony/standard/site/branches/live/docs/svn.html Wed Nov 3 13:49:31 2010
@@ -214,7 +214,7 @@ limitations under the License.
<p>
And if you want to be on the bleeding-edge of the development effort, access repository.
The Harmony project uses the
- <a href="http://subversion.tigris.org/">Subversion</a> version control
+ <a href="http://subversion.tigris.org/">Subversion®</a> version control
system. If you're new to Subversion, you can check out the
<a href="http://svnbook.red-bean.com/">online book</a> about Subversion.</p>
<p class="note">Note</p>
Modified: harmony/standard/site/branches/live/xdocs/contribution_policy.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/contribution_policy.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/contribution_policy.xml (original)
+++ harmony/standard/site/branches/live/xdocs/contribution_policy.xml Wed Nov 3 13:49:31 2010
@@ -61,7 +61,7 @@
<subsection name="Division of Repository">
<p>
We have divided <a href="http://harmony.apache.org/svn.html">
- our Subversion(SVN) repository</a> into sections. There are two main sections, the "standard"
+ our Subversion® (SVN) repository</a> into sections. There are two main sections, the "standard"
section, for which the standard Apache process applies (namely, the standard
<a href="http://www.apache.org/licenses/icla.txt">Apache ICLA</a>
is all that is required) and the "enhanced" section, which requires any
Modified: harmony/standard/site/branches/live/xdocs/documentation/build_website.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/build_website.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/build_website.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/build_website.xml Wed Nov 3 13:49:31 2010
@@ -35,7 +35,7 @@
<ul>
<li>
- <a href="http://subversion.tigris.org/">Subversion</a>
+ <a href="http://subversion.tigris.org/">Subversion®</a>
</li>
<li>
<a href="http://ant.apache.org/">Apache Ant</a>
Modified: harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml Wed Nov 3 13:49:31 2010
@@ -28,14 +28,14 @@
<body>
<section name="Introduction">
<p>
- The current page provides instructions on how to set up Eclipse to develop Java code
+ The current page provides instructions on how to set up Eclipse™ to develop Java code
in Apache Harmony, with sections for both DRLVM and class library development.
</p>
<p>
DRLVM specific instructions are only emerging, while class library specific
instructions are in two sets: the <a href="#fastpath">fast path</a>
for people familiar with Eclipse and the source code layout in Harmony's
- Subversion repository; and the
+ Subversion® repository; and the
<a href="#step_guide">step-by-step guide</a>
for novices who want to follow the details of a setup and see a brief
development example.
Modified: harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml Wed Nov 3 13:49:31 2010
@@ -28,7 +28,7 @@
<body>
<section name="Introduction">
<p>
- To use Apache Harmony as an installed JRE in Eclipse requires an
+ To use Apache Harmony as an installed JRE in Eclipse™ requires an
additional plug-in. The following instructions show the installation
process using screen shots from Eclipse 3.3 running on Windows XP.
</p>
Modified: harmony/standard/site/branches/live/xdocs/get-involved.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/get-involved.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/get-involved.xml (original)
+++ harmony/standard/site/branches/live/xdocs/get-involved.xml Wed Nov 3 13:49:31 2010
@@ -133,7 +133,7 @@
provide details, such as how to re-create if a bug, why the
change or enhancement is useful, etc.
</li>
- <li>Use the subversion <code>diff</code> utility to create a patch as follows:
+ <li>Use the Subversion® <code>diff</code> utility to create a patch as follows:
<pre>svn diff file.java > file.patch</pre>
where <code>file</code> is the filename that you have changed. This will produce a
nice patch file that can be added to the <a href="http://issues.apache.org/jira/browse/HARMONY">
Modified: harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml Wed Nov 3 13:49:31 2010
@@ -56,7 +56,7 @@
<ul>
<li> Apache Ant веÑÑÐ¸Ñ 1.7.0
</li>
- <li> Subversion веÑÑÐ¸Ñ 1.3 или более позднÑÑ
+ <li> Subversion® веÑÑÐ¸Ñ 1.3 или более позднÑÑ
</li>
<li> Java SE 5 JDK
<p><strong>ÐÑимеÑание:</strong> еÑли Ñ Ð²Ð°Ñ Ð²ÐºÐ»ÑÑен бÑандмаÑÑÑ,
Modified: harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml Wed Nov 3 13:49:31 2010
@@ -75,7 +75,7 @@
<a href="http://ant.apache.org/">Apache Ant</a> version 1.7.0 or higher
</li>
<li>
- <a href="http://subversion.tigris.org/">Subversion</a> version 1.3 or higher
+ <a href="http://subversion.tigris.org/">Subversion®</a> version 1.3 or higher
</li>
<li>
<a href="">Java SE 5 JDK</a>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/index.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/index.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/index.xml Wed Nov 3 13:49:31 2010
@@ -128,7 +128,7 @@
</subsection>
<subsection name="Setup">
- <p> Get the infrastructure by checking it out from the project Subversion repository:</p>
+ <p> Get the infrastructure by checking it out from the project Subversion® repository:</p>
<pre>svn co http://svn.apache.org/repos/asf/harmony/enhanced/buildtest/trunk/infra</pre>
Modified: harmony/standard/site/branches/live/xdocs/svn.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/svn.xml?rev=1030467&r1=1030466&r2=1030467&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/svn.xml (original)
+++ harmony/standard/site/branches/live/xdocs/svn.xml Wed Nov 3 13:49:31 2010
@@ -33,7 +33,7 @@
<p>
And if you want to be on the bleeding-edge of the development effort, access repository.
The Harmony project uses the
- <a href="http://subversion.tigris.org/">Subversion</a> version control
+ <a href="http://subversion.tigris.org/">Subversion®</a> version control
system. If you're new to Subversion, you can check out the
<a href="http://svnbook.red-bean.com/">online book</a> about Subversion.</p>
<p class="note">Note</p>