aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r783595 - in /websites/production/aries: ./ content/development/releasingaries.html content/documentation/application-dependencies.html content/documentation/ariesprogrammingmodel.html
Date Wed, 19 Jan 2011 10:14:36 GMT
Author: zoe
Date: Wed Jan 19 10:14:36 2011
New Revision: 783595

Log:
Publishing merge to aries site by zoe

Added:
    websites/production/aries/content/documentation/application-dependencies.html
      - copied unchanged from r783594, websites/staging/aries/trunk/content/documentation/application-dependencies.html
Modified:
    websites/production/aries/   (props changed)
    websites/production/aries/content/development/releasingaries.html
    websites/production/aries/content/documentation/ariesprogrammingmodel.html

Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 10:14:36 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-783420
+/websites/staging/aries/trunk:782169-783594

Modified: websites/production/aries/content/development/releasingaries.html
==============================================================================
--- websites/production/aries/content/development/releasingaries.html (original)
+++ websites/production/aries/content/development/releasingaries.html Wed Jan 19 10:14:36
2011
@@ -305,7 +305,7 @@ committing code.</p>
 
 <p><em>IMPORTANT</em> If you are using a branch to release you <em>must</em>
edit the top
 level pom.xml for each module to change the SCM references to point to the
-branch and to to trunk. For example:</p>
+branch and not to trunk. For example:</p>
 <div class="codehilite"><pre><span class="nt">&lt;connection&gt;</span>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx/parent<span
class="nt">&lt;/connection&gt;</span>
 
 <span class="nt">&lt;developerConnection&gt;</span>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/branches/0.2-incubating-RCx/parent<span
class="nt">&lt;/developerConnection&gt;</span>

Modified: websites/production/aries/content/documentation/ariesprogrammingmodel.html
==============================================================================
--- websites/production/aries/content/documentation/ariesprogrammingmodel.html (original)
+++ websites/production/aries/content/documentation/ariesprogrammingmodel.html Wed Jan 19
10:14:36 2011
@@ -237,9 +237,15 @@
             <div class="wiki-content"><p><a name="AriesProgrammingModel-AriesProgrammingModel"></a></p>
 <h1 id="aries_programming_model">Aries Programming Model</h1>
 <p>The programming model use in Apache Aries is described in sections under each module,
here are links:</p>
-<ul>
+<ol>
 <li>
-<p><a href="/modules/applications.html">Applications</a></p>
+<p>Application </p>
+</li>
+<li>
+<p><a href="/modules/applications.html">Application introduction</a></p>
+</li>
+<li>
+<p><a href="documentation/application-dependencies.html">Application module overview</a></p>
 </li>
 <li>
 <p><a href="/modules/blueprint.html">Blueprint</a></p>
@@ -247,7 +253,7 @@
 <li>
 <p><a href="/modules/transactionsproject.html">Transactions</a></p>
 </li>
-</ul></div>
+</ol></div>
             <!-- Content -->
           </td>
         </tr>



Mime
View raw message