You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/06 16:46:30 UTC
svn commit: r822298 - in /harmony/standard/site/branches/live: ./ .project
README.txt build.xml docs/ docs/newshistory.html docs/related.html lib/
packageversioning.xml velocity.properties xdocs/ xdocs/newshistory.xml
xdocs/related.xml
Author: hindessm
Date: Tue Oct 6 14:46:29 2009
New Revision: 822298
URL: http://svn.apache.org/viewvc?rev=822298&view=rev
Log:
Merging from trunk.
Modified:
harmony/standard/site/branches/live/ (props changed)
harmony/standard/site/branches/live/.project (props changed)
harmony/standard/site/branches/live/README.txt (props changed)
harmony/standard/site/branches/live/build.xml (props changed)
harmony/standard/site/branches/live/docs/ (props changed)
harmony/standard/site/branches/live/docs/newshistory.html
harmony/standard/site/branches/live/docs/related.html
harmony/standard/site/branches/live/lib/ (props changed)
harmony/standard/site/branches/live/packageversioning.xml (props changed)
harmony/standard/site/branches/live/velocity.properties (props changed)
harmony/standard/site/branches/live/xdocs/ (props changed)
harmony/standard/site/branches/live/xdocs/newshistory.xml
harmony/standard/site/branches/live/xdocs/related.xml
Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 6 14:46:29 2009
@@ -0,0 +1 @@
+/harmony/standard/site/trunk:822221-822295
Propchange: harmony/standard/site/branches/live/.project
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/README.txt
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/build.xml
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/docs/
('svn:mergeinfo' removed)
Modified: harmony/standard/site/branches/live/docs/newshistory.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/newshistory.html?rev=822298&r1=822297&r2=822298&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/newshistory.html (original)
+++ harmony/standard/site/branches/live/docs/newshistory.html Tue Oct 6 14:46:29 2009
@@ -31,11 +31,8 @@
<meta name="email" content="dev@harmony.apache.org">
-
-
-
-
-
+
+
<title>Apache Harmony - Older Harmony News</title>
@@ -420,7 +417,7 @@
<dt>First Milestone Available Now</dt>
<dd>
- Apache Harmony are pleased to announce the the first stable build "5.0 M1". The code,
+ Apache Harmony are pleased to announce the first stable build "5.0 M1". The code,
which was previously made available as "snapshot r533500", underwent additional testing
after a period of stabalization in the ongoing development of a full release. Apache Harmony
5.0 M1 represents our best build so far, and we encourage users to
Modified: harmony/standard/site/branches/live/docs/related.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/related.html?rev=822298&r1=822297&r2=822298&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/related.html (original)
+++ harmony/standard/site/branches/live/docs/related.html Tue Oct 6 14:46:29 2009
@@ -31,11 +31,8 @@
<meta name="email" content="dev@harmony.apache.org">
-
-
-
-
-
+
+
<title>Apache Harmony - Other Projects</title>
@@ -226,7 +223,7 @@
</p>
<p>
We believe that open source is valuable because of the communities behind the code -
- and in the case of Apache Harmony, the the collaboration and interaction with
+ and in the case of Apache Harmony, the collaboration and interaction with
these other projects brings additional
health and diversity that go beyond a single project.
</p>
Propchange: harmony/standard/site/branches/live/lib/
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/packageversioning.xml
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/velocity.properties
('svn:mergeinfo' removed)
Propchange: harmony/standard/site/branches/live/xdocs/
('svn:mergeinfo' removed)
Modified: harmony/standard/site/branches/live/xdocs/newshistory.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/newshistory.xml?rev=822298&r1=822297&r2=822298&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/newshistory.xml (original)
+++ harmony/standard/site/branches/live/xdocs/newshistory.xml Tue Oct 6 14:46:29 2009
@@ -244,7 +244,7 @@
<dt>First Milestone Available Now</dt>
<dd>
- Apache Harmony are pleased to announce the the first stable build "5.0 M1". The code,
+ Apache Harmony are pleased to announce the first stable build "5.0 M1". The code,
which was previously made available as "snapshot r533500", underwent additional testing
after a period of stabalization in the ongoing development of a full release. Apache Harmony
5.0 M1 represents our best build so far, and we encourage users to
Modified: harmony/standard/site/branches/live/xdocs/related.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/related.xml?rev=822298&r1=822297&r2=822298&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/related.xml (original)
+++ harmony/standard/site/branches/live/xdocs/related.xml Tue Oct 6 14:46:29 2009
@@ -54,7 +54,7 @@
<p>
We believe that open source is valuable because of the communities behind the code -
- and in the case of Apache Harmony, the the collaboration and interaction with
+ and in the case of Apache Harmony, the collaboration and interaction with
these other projects brings additional
health and diversity that go beyond a single project.
</p>