aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r960276 [2/8] - in /websites/staging/aries/trunk/content: ./ community/ development/ documentation/ documentation/tools/ documentation/tutorials/ downloads/ downloads/archived-releases/0.1-incubating/ downloads/archived-releases/0.2-incubat...
Date Fri, 31 Jul 2015 10:22:00 GMT
Modified: websites/staging/aries/trunk/content/development/releasingaries.html
==============================================================================
--- websites/staging/aries/trunk/content/development/releasingaries.html (original)
+++ websites/staging/aries/trunk/content/development/releasingaries.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,8 +274,19 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><p><a name="ReleasingAries-HowtodoanAriesRelease"></a></p>
-<h1 id="how-to-do-an-aries-release">How to do an Aries Release</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><a name="ReleasingAries-HowtodoanAriesRelease"></a></p>
+<h1 id="how-to-do-an-aries-release">How to do an Aries Release<a class="headerlink" href="#how-to-do-an-aries-release" title="Permanent link">&para;</a></h1>
 <p>There are three types of Aries release:</p>
 <ol>
 <li>Releasing a single Aries bundle (or group of bundles)</li>
@@ -293,15 +297,15 @@
 Apache release process works and how to get set up to run it, read those sections first if this is 
 your first release. If you are already familiar with the Apache process just use the high level descriptions in the
 next few paragraphs to perform releases.</p>
-<h2 id="releasing-a-single-bundle-or-group-of-bundles">Releasing a single bundle or group of bundles.</h2>
-<h3 id="what-to-release-make-a-list">What to release? Make a list</h3>
+<h2 id="releasing-a-single-bundle-or-group-of-bundles">Releasing a single bundle or group of bundles.<a class="headerlink" href="#releasing-a-single-bundle-or-group-of-bundles" title="Permanent link">&para;</a></h2>
+<h3 id="what-to-release-make-a-list">What to release? Make a list<a class="headerlink" href="#what-to-release-make-a-list" title="Permanent link">&para;</a></h3>
 <p>The Apache release process will not release any bundle that has dependencies on -SNAPSHOTS. If, for example,
 a release of the blueprint API bundle is required the first step is to find and release any of
 its -SNAPSHOT dependencies. Because Aries bundles are quite interdependent (see <a href="moduledependencies">here</a> 
 for an idea
 of how the modules relate to each other, it may be necessary to release quite a large number of bundles. So,
 step one is to make a list.  </p>
-<h3 id="choosing-a-strategy-for-the-release">Choosing a strategy for the release</h3>
+<h3 id="choosing-a-strategy-for-the-release">Choosing a strategy for the release<a class="headerlink" href="#choosing-a-strategy-for-the-release" title="Permanent link">&para;</a></h3>
 <p>Even when releasing a large number of bundles, in Aries we release bundles individually. If there are dependencies
 between the bundles you want to release, you have four strategies for how to release them.</p>
 <ul>
@@ -339,13 +343,13 @@ projects, then close the staging repo an
 </li>
 </ul>
 <p>In many cases with semantically versioned bundles there won't be dependencies on the latest and greatest snapshots, which makes everything much easier. </p>
-<h3 id="how-to-deal-with-jira">How to deal with JIRA</h3>
+<h3 id="how-to-deal-with-jira">How to deal with JIRA<a class="headerlink" href="#how-to-deal-with-jira" title="Permanent link">&para;</a></h3>
 <p>Before actually doing any releasing work through the list of bundles and understand what defects have been fixed
 (add more about JIRA versions here)</p>
-<h3 id="what-version-will-be-released">What version will be released?</h3>
+<h3 id="what-version-will-be-released">What version will be released?<a class="headerlink" href="#what-version-will-be-released" title="Permanent link">&para;</a></h3>
 <p>For each bundle on the list check how its package versions have changed since the last release.
 Based on this, use the <a href="versionpolicy">versioning policy</a> to determine the version of the bundle that should be released.</p>
-<h3 id="releasing-bundles">Releasing bundles</h3>
+<h3 id="releasing-bundles">Releasing bundles<a class="headerlink" href="#releasing-bundles" title="Permanent link">&para;</a></h3>
 <p>For each bundle:</p>
 <ul>
 <li>Deploy a SNAPSHOT to the maven snapshot repository (mvn deploy)</li>
@@ -353,10 +357,10 @@ Based on this, use the <a href="versionp
 <li>Create the release artifacts (mvn release:prepare)</li>
 <li>Upload release artifacts to a staging repository (mvn release:perform)</li>
 </ul>
-<h3 id="complete-the-process">Complete the process</h3>
+<h3 id="complete-the-process">Complete the process<a class="headerlink" href="#complete-the-process" title="Permanent link">&para;</a></h3>
 <p>Once the bundles are in the staging repository, start a vote on the release. After 72 hours close the vote. To complete
 the release process it is necessary to copy the new bundles to the dist dir and update table on the web pages.</p>
-<h2 id="releasing-a-distribution">Releasing a distribution</h2>
+<h2 id="releasing-a-distribution">Releasing a distribution<a class="headerlink" href="#releasing-a-distribution" title="Permanent link">&para;</a></h2>
 <p>A distribution is just a collection of Aries bundles which have already been released.
 The distribution is just a convenient way for consumers to download aries bundles and all
 of the Aries bundles that they depend on.
@@ -369,7 +373,7 @@ There are three distributions:</p>
 <p>The release process is just the same as for everything else, again, the right time to release these is
 immediately after a bundle(s) release when you have a collection of artifacts that 
 work together.</p>
-<h2 id="releasing-the-samples">Releasing the samples</h2>
+<h2 id="releasing-the-samples">Releasing the samples<a class="headerlink" href="#releasing-the-samples" title="Permanent link">&para;</a></h2>
 <p>The Aries samples are designed to work across all the Aries modules. Samples are released as a single
 module. All of the Aries dependencies are listed in the top level samples pom. 
 <em>It is very important the versions are set <strong>only</strong> in the top level 
@@ -381,7 +385,7 @@ one place is the only way to avoid a mes
 but others (blueprint) are only tested manually. In fact it's wise to run through
 a quick manual check for the blog and aries trader samples as the itests do not catch everything.</p>
 
-<h1 id="background-information-on-the-apache-release-process">Background information on the Apache Release process</h1>
+<h1 id="background-information-on-the-apache-release-process">Background information on the Apache Release process<a class="headerlink" href="#background-information-on-the-apache-release-process" title="Permanent link">&para;</a></h1>
 <p>To create a release you will need to create the release artifacts and move
 then to various places (ultimately the Maven central repository). The Maven
 commands and general outline of the process looks like this:</p>
@@ -412,21 +416,21 @@ release:perform)</li>
 these pages we will only add things which are specific to the Apache Aries
 release.</p>
 <p><a name="ReleasingAries-Discussionofthereleaseandit'scontentontheAriesmailinglist"></a></p>
-<h3 id="discussion-of-the-release-and-its-content-on-the-aries-mailing-list">Discussion of the release and its content on the Aries mailing list</h3>
+<h3 id="discussion-of-the-release-and-its-content-on-the-aries-mailing-list">Discussion of the release and its content on the Aries mailing list<a class="headerlink" href="#discussion-of-the-release-and-its-content-on-the-aries-mailing-list" title="Permanent link">&para;</a></h3>
 <p>Before starting off the release process it is essential to gain consensus
 on the dev@aries list that this is the right time for a release and to
 agree its content. Allow at least a week for this discussion. </p>
 <p><a name="ReleasingAries-CreatingandstoringGPGkeys"></a></p>
-<h3 id="creating-and-storing-gpg-keys">Creating and storing GPG keys</h3>
+<h3 id="creating-and-storing-gpg-keys">Creating and storing GPG keys<a class="headerlink" href="#creating-and-storing-gpg-keys" title="Permanent link">&para;</a></h3>
 <p>For Aries your GPG key will need to be in this file:
 https://svn.apache.org/repos/asf/aries/KEYS (follow the
 instructions in the file) and checkin. Then ensure the file is mirrored to
 http://www.apache.org/dist/aries/KEYS by following the instructions <a href="http://www.apache.org/dev/release.html#upload-scp">here</a>.</p>
 <p><a name="ReleasingAries-Settingupyourenvironment"></a></p>
-<h3 id="setting-up-your-environment">Setting up your environment</h3>
+<h3 id="setting-up-your-environment">Setting up your environment<a class="headerlink" href="#setting-up-your-environment" title="Permanent link">&para;</a></h3>
 <p>Follow the general instructions linked to above. </p>
 <p><a name="ReleasingAries-Creatingabranchtoreleasefrom"></a></p>
-<h3 id="creating-a-branch-to-release-from-if-needed">Creating a branch to release from (if needed)</h3>
+<h3 id="creating-a-branch-to-release-from-if-needed">Creating a branch to release from (if needed)<a class="headerlink" href="#creating-a-branch-to-release-from-if-needed" title="Permanent link">&para;</a></h3>
 <p>It is strongly recomended that releases are made from trunk and NEVER from a branch. But, if you have to release from a branch this is what 
 you will need to do:</p>
 <div class="codehilite"><pre><span class="n">svn</span> <span class="n">copy</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">aries</span><span class="o">/</span><span class="n">trunk</span> <span class="o">\</span>
@@ -461,7 +465,7 @@ repository :-/.</p>
 <p>After taking the branch, change the pom versions in trunk to, say,
 0.3-incubating or whatever you want to call the next development version.</p>
 <p><a name="ReleasingAries-Checkingbundleversion"></a></p>
-<h3 id="checking-which-version-of-the-bundle-to-release">Checking which version of the bundle to release</h3>
+<h3 id="checking-which-version-of-the-bundle-to-release">Checking which version of the bundle to release<a class="headerlink" href="#checking-which-version-of-the-bundle-to-release" title="Permanent link">&para;</a></h3>
 <p>If the Maven version of the bundle ends -SNAPSHOT then some change has been made which may require a release.
 To get a summary of the changes, use svn to compare with the most recently released tag, 
 for example:</p>
@@ -473,7 +477,7 @@ for example:</p>
 code has changed it is important to check the packageinfo files to see whether package versions have changed. If so
 these might lead to the requirement to increment the major or minor versions the bundle.</p>
 <p><a name="ReleasingAries-Checkingreleaseartifacts"></a></p>
-<h3 id="checking-release-artifacts">Checking release artifacts</h3>
+<h3 id="checking-release-artifacts">Checking release artifacts<a class="headerlink" href="#checking-release-artifacts" title="Permanent link">&para;</a></h3>
 <p>Delete everything under ...org/apache/aries in your local
 Maven repo. For linux/Mac users you will find this under ~/.m2/repository/.</p>
 <p>Check that the code builds using the usual <a href="buildingaries.html">sequence</a>
@@ -502,20 +506,20 @@ failures, use:</p>
 do not require an Apache license, eg MANIFEST.MF, but any <em>.java or </em>.js
 file does need one. As an alternative you can use 'mvn -Prat install'.</p>
 <p><a name="ReleasingAries-Creatingasnapshotrelease"></a></p>
-<h3 id="creating-a-snapshot-release">Creating a snapshot release</h3>
+<h3 id="creating-a-snapshot-release">Creating a snapshot release<a class="headerlink" href="#creating-a-snapshot-release" title="Permanent link">&para;</a></h3>
 <p>This is important to do when releasing from trunk as other bundles may want
 to continue to depend on the -SNAPSHOT version while the release is voted through.</p>
 <p>mvn deploy (check exact format)</p>
-<h3 id="jira-preparation">JIRA preparation</h3>
+<h3 id="jira-preparation">JIRA preparation<a class="headerlink" href="#jira-preparation" title="Permanent link">&para;</a></h3>
 <ul>
 <li>After initial release discussion on the mailing list you should have a list of JIRA issues that are required in the release. If not, the default assumption is 'everything that has been fixed since the last release'.</li>
 <li>Make sure that there is a JIRA version that matches the name of the release, if not, create one.</li>
 <li>Check through defects, make sure that anything that is included in the release has been closed. If there are open issues move them to the next release.</li>
 </ul>
 <p><a name="ReleasingAries-Creatingtherelease"></a></p>
-<h3 id="creating-the-release">Creating the release</h3>
+<h3 id="creating-the-release">Creating the release<a class="headerlink" href="#creating-the-release" title="Permanent link">&para;</a></h3>
 <p><a name="ReleasingAries-Creatingthereleaseartifactsinastagingrepository"></a></p>
-<h5 id="creating-the-release-artifacts-in-a-staging-repository">Creating the release artifacts in a staging repository</h5>
+<h5 id="creating-the-release-artifacts-in-a-staging-repository">Creating the release artifacts in a staging repository<a class="headerlink" href="#creating-the-release-artifacts-in-a-staging-repository" title="Permanent link">&para;</a></h5>
 <p>The release is
 created by releasing each bundle separately and in a specific order. It is
 also desirable to maintain the same IP address for the entire process (the
@@ -567,12 +571,12 @@ commands make and commit changes to the
 create a tag in SVN. To revert the changes you will need to revert the
 pom.xml files and delete the tag from svn.</p>
 <p><a name="ReleasingAries-Closingthestagingrepository"></a></p>
-<h5 id="closing-the-staging-repository">Closing the staging repository</h5>
+<h5 id="closing-the-staging-repository">Closing the staging repository<a class="headerlink" href="#closing-the-staging-repository" title="Permanent link">&para;</a></h5>
 <p>After checking that the staging repository contains the artifacts that you
 expect you should close the staging repository. This will make it available
 so that people can check the release.</p>
 <p><a name="ReleasingAries-Runningthevote(s)"></a></p>
-<h3 id="running-the-vote">Running the vote.</h3>
+<h3 id="running-the-vote">Running the vote.<a class="headerlink" href="#running-the-vote" title="Permanent link">&para;</a></h3>
 <p>At this
 point you should write two notes to the dev@aries.apache.org mailing list. You may wish to ensure they have slightly different subjects, since googlemail seems to ignore anything in brackets when threading. </p>
 <ul>
@@ -594,13 +598,13 @@ the Aries release.</p>
 the dev@aries vote can be summarised and closed. Note that at least three
 +1 votes from Aries PMC members are required. </p>
 <p><a name="ReleasingAries-Promotingthereleaseartifacts"></a></p>
-<h3 id="promoting-the-release-artifacts">Promoting the release artifacts</h3>
+<h3 id="promoting-the-release-artifacts">Promoting the release artifacts<a class="headerlink" href="#promoting-the-release-artifacts" title="Permanent link">&para;</a></h3>
 <p>From the <a href="https://repository.apache.org/index.html#stagingRepositories">Nexus pages</a>
 , select the staging repository and select 'release' from the top menu.
 This moves the release artifacts into an Apache releases repository, from
 there they will be automatically moved to the Maven repository.</p>
 <p><a name="ReleasingAries-MakingthereleaseartifactsavailablefromtheArieswebpages."></a></p>
-<h3 id="making-the-release-artifacts-available-from-the-aries-web-pages">Making the release artifacts available from the Aries web pages.</h3>
+<h3 id="making-the-release-artifacts-available-from-the-aries-web-pages">Making the release artifacts available from the Aries web pages.<a class="headerlink" href="#making-the-release-artifacts-available-from-the-aries-web-pages" title="Permanent link">&para;</a></h3>
 <p>Anything that is to be downloaded must be put in
 /www/www.apache.org/dist/aries on minotaur. Don't forget to changes the file permissions to '664' so that other 
 members of the group can access them. The distributions are
@@ -609,17 +613,17 @@ archived here /www/archive.apache.org/di
 <p>Then, put new release artifacts in the distribution directory. This is best done using a script, the script can be generated using
 the perl script <a href="http://svn.apache.org/repos/asf/aries/scripts/download_release_artifacts.pl">download_release_artifacts.pl</a>. </p>
 <p>Next, update the Aries Downloads pages to refer to the new artifacts. The the perl script <a href="http://svn.apache.org/repos/asf/aries/scripts/create_modules_table.pl">create_modules_table.pl</a> can do this automatically.</p>
-<h3 id="updating-dependencies">Updating dependencies</h3>
+<h3 id="updating-dependencies">Updating dependencies<a class="headerlink" href="#updating-dependencies" title="Permanent link">&para;</a></h3>
 <p>Once the release is promoted, change all the bundles which depend on the SNAPSHOT to depend on the released version. Deployed snapshots get regularly cleaned from the repositories if there's a released version available, so building against them isn't reliable. </p>
 <p>Don't move bundles which depend on earlier releases to depend on the new release, or they won't be able to run in an environment with the older bundles. </p>
-<h3 id="tidying-up-tasks">Tidying up tasks</h3>
+<h3 id="tidying-up-tasks">Tidying up tasks<a class="headerlink" href="#tidying-up-tasks" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Get the <a href="http://aries.apache.org/development/compliancetesting.html">compliance tests</a> run</li>
 <li>Release notes</li>
 <li>Release the component in JIRA (manage components), check the JIRA release notes.</li>
 </ul>
 <p><a name="ReleasingAries-Whattodowhenpeoplefindproblemswiththerelease"></a></p>
-<h3 id="what-to-do-when-people-find-problems-with-the-release">What to do when people find problems with the release</h3>
+<h3 id="what-to-do-when-people-find-problems-with-the-release">What to do when people find problems with the release<a class="headerlink" href="#what-to-do-when-people-find-problems-with-the-release" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Cancel the vote [CANCELLED] [VOTE]</li>
 <li>Clean up, fix and re-release.

Modified: websites/staging/aries/trunk/content/development/releasingaries2.html
==============================================================================
--- websites/staging/aries/trunk/content/development/releasingaries2.html (original)
+++ websites/staging/aries/trunk/content/development/releasingaries2.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,8 +274,19 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><p><a name="ReleasingAries-HowtodoanAriesRelease"></a></p>
-<h1 id="how-to-do-an-aries-release">How to do an Aries Release</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><a name="ReleasingAries-HowtodoanAriesRelease"></a></p>
+<h1 id="how-to-do-an-aries-release">How to do an Aries Release<a class="headerlink" href="#how-to-do-an-aries-release" title="Permanent link">&para;</a></h1>
 <p>There are three types of Aries release:</p>
 <ol>
 <li>Releasing a single Aries bundle (or group of bundles)</li>
@@ -293,8 +297,8 @@
 Apache release process works and how to get set up to run it, read those sections first if this is 
 your first release. If you are already familiar with the Apache process just use the high level descriptions in the
 next few paragraphs to perform releases.</p>
-<h2 id="releasing-a-single-bundle-or-group-of-bundles">Releasing a single bundle or group of bundles.</h2>
-<h3 id="what-to-release-make-a-list">What to release? Make a list</h3>
+<h2 id="releasing-a-single-bundle-or-group-of-bundles">Releasing a single bundle or group of bundles.<a class="headerlink" href="#releasing-a-single-bundle-or-group-of-bundles" title="Permanent link">&para;</a></h2>
+<h3 id="what-to-release-make-a-list">What to release? Make a list<a class="headerlink" href="#what-to-release-make-a-list" title="Permanent link">&para;</a></h3>
 <p>The Apache release process will not release any bundle that has dependencies on -SNAPSHOTS. If, for example,
 a release of the blueprint API bundle is required the first step is to find and release any of
 its -SNAPSHOT dependencies. Because Aries bundles are quite interdependent (see <a href="moduledependencies">here</a> 
@@ -308,13 +312,13 @@ using the perl script list_bundles_in_ar
 is used for later steps in the release process, so by the end of the process it will have been updated to have
 a complete list
 of all Aries modules and their most recent version numbers after the release.</p></p>
-<h3 id="how-to-deal-with-jira">How to deal with JIRA</h3>
+<h3 id="how-to-deal-with-jira">How to deal with JIRA<a class="headerlink" href="#how-to-deal-with-jira" title="Permanent link">&para;</a></h3>
 <p>Before actually doing any releasing work through the list of bundles and understand what defects have been fixed
 (add more about JIRA versions here)</p>
-<h3 id="what-version-will-be-released">What version will be released?</h3>
+<h3 id="what-version-will-be-released">What version will be released?<a class="headerlink" href="#what-version-will-be-released" title="Permanent link">&para;</a></h3>
 <p>For each bundle on the list check how its package versions have changed since the last release.
 Based on this, use the <a href="versionpolicy">versioning policy</a> to determine the version of the bundle that should be released.</p>
-<h3 id="releasing-bundles">Releasing bundles</h3>
+<h3 id="releasing-bundles">Releasing bundles<a class="headerlink" href="#releasing-bundles" title="Permanent link">&para;</a></h3>
 <p>For each bundle:</p>
 <ul>
 <li>Deploy a SNAPSHOT to the maven snapshot repository (mvn deploy)</li>
@@ -322,10 +326,10 @@ Based on this, use the <a href="versionp
 <li>Create the release artifacts (mvn release:prepare)</li>
 <li>Upload release artifacts to a staging repository (mvn release:perform)</li>
 </ul>
-<h3 id="complete-the-process">Complete the process</h3>
+<h3 id="complete-the-process">Complete the process<a class="headerlink" href="#complete-the-process" title="Permanent link">&para;</a></h3>
 <p>Once the bundles are in the staging repository, start a vote on the release. After 72 hours close the vote. To complete
 the release process it is necessary to copy the new bundles to the dist dir and update table on the web pages.</p>
-<h2 id="releasing-a-distribution">Releasing a distribution</h2>
+<h2 id="releasing-a-distribution">Releasing a distribution<a class="headerlink" href="#releasing-a-distribution" title="Permanent link">&para;</a></h2>
 <p>A distribution is just a collection of Aries bundles which have already been released.
 The distribution is just a convenient way for consumers to download aries bundles and all
 of the Aries bundles that they depend on.
@@ -338,7 +342,7 @@ There are three distributions:</p>
 <p>The release process is just the same as for everything else, again, the right time to release these is
 immediately after a bundle(s) release when you have a collection of artifacts that 
 work together.</p>
-<h2 id="releasing-the-samples">Releasing the samples</h2>
+<h2 id="releasing-the-samples">Releasing the samples<a class="headerlink" href="#releasing-the-samples" title="Permanent link">&para;</a></h2>
 <p>The Aries samples are designed to work across all the Aries modules. Samples are released as a single
 module. All of the Aries dependencies are listed in the top level samples pom. In 
 trunk, the version of all the dependencies should always point the SNAPSHOT versions 
@@ -353,7 +357,7 @@ all of the bundle version information is
 but others (blueprint) are only tested manually. In fact it's wise to run through
 a quick manual check for the blog and aries trader samples as the itests do not catch everything.</p>
 
-<h1 id="background-information-on-the-apache-release-process">Background information on the Apache Release process</h1>
+<h1 id="background-information-on-the-apache-release-process">Background information on the Apache Release process<a class="headerlink" href="#background-information-on-the-apache-release-process" title="Permanent link">&para;</a></h1>
 <p>To create a release you will need to create the release artifacts and move
 then to various places (ultimately the Maven central repository). The Maven
 commands and general outline of the process looks like this:</p>
@@ -384,20 +388,20 @@ release:perform)</li>
 these pages we will only add things which are specific to the Apache Aries
 release.</p>
 <p><a name="ReleasingAries-Discussionofthereleaseandit'scontentontheAriesmailinglist"></a></p>
-<h3 id="discussion-of-the-release-and-its-content-on-the-aries-mailing-list">Discussion of the release and its content on the Aries mailing list</h3>
+<h3 id="discussion-of-the-release-and-its-content-on-the-aries-mailing-list">Discussion of the release and its content on the Aries mailing list<a class="headerlink" href="#discussion-of-the-release-and-its-content-on-the-aries-mailing-list" title="Permanent link">&para;</a></h3>
 <p>Before starting off the release process it is essential to gain consensus
 on the dev@aries list that this is the right time for a release and to
 agree its content. Allow at least a week for this discussion. </p>
 <p><a name="ReleasingAries-CreatingandstoringGPGkeys"></a></p>
-<h3 id="creating-and-storing-gpg-keys">Creating and storing GPG keys</h3>
+<h3 id="creating-and-storing-gpg-keys">Creating and storing GPG keys<a class="headerlink" href="#creating-and-storing-gpg-keys" title="Permanent link">&para;</a></h3>
 <p>For Aries your GPG key will need to be in this file:
 https://svn.apache.org/repos/asf/aries/KEYS (follow the
 instructions in the file) and checkin</p>
 <p><a name="ReleasingAries-Settingupyourenvironment"></a></p>
-<h3 id="setting-up-your-environment">Setting up your environment</h3>
+<h3 id="setting-up-your-environment">Setting up your environment<a class="headerlink" href="#setting-up-your-environment" title="Permanent link">&para;</a></h3>
 <p>Follow the general instructions linked to above. </p>
 <p><a name="ReleasingAries-Creatingabranchtoreleasefrom"></a></p>
-<h3 id="creating-a-branch-to-release-from">Creating a branch to release from</h3>
+<h3 id="creating-a-branch-to-release-from">Creating a branch to release from<a class="headerlink" href="#creating-a-branch-to-release-from" title="Permanent link">&para;</a></h3>
 <p>It is strongly recomended that releases are made from trunk and NEVER from a branch. But, if you have to release from a branch this is what 
 you will need to do:</p>
 <div class="codehilite"><pre><span class="n">svn</span> <span class="n">copy</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">aries</span><span class="o">/</span><span class="n">trunk</span> <span class="o">\</span>
@@ -432,7 +436,7 @@ repository :-/.</p>
 <p>After taking the branch, change the pom versions in trunk to, say,
 0.3-incubating or whatever you want to call the next development version.</p>
 <p><a name="ReleasingAries-Checkingbundleversion"></a></p>
-<h3 id="checking-which-version-of-the-bundle-to-release">Checking which version of the bundle to release</h3>
+<h3 id="checking-which-version-of-the-bundle-to-release">Checking which version of the bundle to release<a class="headerlink" href="#checking-which-version-of-the-bundle-to-release" title="Permanent link">&para;</a></h3>
 <p>If the Maven version of the bundle ends -SNAPSHOT then some change has been made which may require a release.
 To get a summary of the changes, use svn to compare with the most recently released tag, 
 for example:</p>
@@ -444,7 +448,7 @@ for example:</p>
 code has changed it is important to check the packageinfo files to see whether package versions have changed. If so
 these might lead to the requirement to increment the major or minor versions the bundle.</p>
 <p><a name="ReleasingAries-Checkingreleaseartifacts"></a></p>
-<h3 id="checking-release-artifacts">Checking release artifacts</h3>
+<h3 id="checking-release-artifacts">Checking release artifacts<a class="headerlink" href="#checking-release-artifacts" title="Permanent link">&para;</a></h3>
 <p>Delete everything under ...org/apache/aries in your local
 Maven repo. For linux/Mac users you will find this under ~/.m2/repository/.</p>
 <p>Check that the code builds using the usual <a href="buildingaries.html">sequence</a>
@@ -473,20 +477,20 @@ failures, use:</p>
 do not require an Apache license, eg MANIFEST.MF, but any <em>.java or </em>.js
 file does need one. As an alternative you can use 'mvn -Prat install'.</p>
 <p><a name="ReleasingAries-Creatingasnapshotrelease"></a></p>
-<h3 id="creating-a-snapshot-release">Creating a snapshot release</h3>
+<h3 id="creating-a-snapshot-release">Creating a snapshot release<a class="headerlink" href="#creating-a-snapshot-release" title="Permanent link">&para;</a></h3>
 <p>This is important to do when releasing from trunk as other bundles may want
 to continue to depend on the -SNAPSHOT version while the release is voted through.</p>
 <p>mvn deploy (check exact format)</p>
-<h3 id="jira-preparation">JIRA preparation</h3>
+<h3 id="jira-preparation">JIRA preparation<a class="headerlink" href="#jira-preparation" title="Permanent link">&para;</a></h3>
 <ul>
 <li>After initial release discussion on the mailing list you should have a list of JIRA issues that are required in the release. If not, the default assumption is 'everything that has been fixed since the last release'.</li>
 <li>Make sure that there is a JIRA version that matches the name of the release, if not, create one.</li>
 <li>Check through defects, make sure that anything that is included in the release has been closed. If there are open issues move them to the next release.</li>
 </ul>
 <p><a name="ReleasingAries-Creatingtherelease"></a></p>
-<h3 id="creating-the-release">Creating the release</h3>
+<h3 id="creating-the-release">Creating the release<a class="headerlink" href="#creating-the-release" title="Permanent link">&para;</a></h3>
 <p><a name="ReleasingAries-Creatingthereleaseartifactsinastagingrepository"></a></p>
-<h5 id="creating-the-release-artifacts-in-a-staging-repository">Creating the release artifacts in a staging repository</h5>
+<h5 id="creating-the-release-artifacts-in-a-staging-repository">Creating the release artifacts in a staging repository<a class="headerlink" href="#creating-the-release-artifacts-in-a-staging-repository" title="Permanent link">&para;</a></h5>
 <p>The release is
 created by releasing each bundle separately and in a specific order. It is
 also desirable to maintain the same IP address for the entire process (the
@@ -554,12 +558,12 @@ the US. When you make a commit, it isn't
 svn up to. Just wait 10 secs and repeat the mvn release:prepare command for
 it to restart where it left off.</p>
 <p><a name="ReleasingAries-Closingthestagingrepository"></a></p>
-<h5 id="closing-the-staging-repository">Closing the staging repository</h5>
+<h5 id="closing-the-staging-repository">Closing the staging repository<a class="headerlink" href="#closing-the-staging-repository" title="Permanent link">&para;</a></h5>
 <p>After checking that the staging repository contains the artifacts that you
 expect you should close the staging repository. This will make it available
 so that people can check the release.</p>
 <p><a name="ReleasingAries-Runningthevote(s)"></a></p>
-<h3 id="running-the-vote">Running the vote.</h3>
+<h3 id="running-the-vote">Running the vote.<a class="headerlink" href="#running-the-vote" title="Permanent link">&para;</a></h3>
 <p>At this
 point you should write two notes to the dev@aries.apache.org mailing list.</p>
 <ul>
@@ -583,13 +587,13 @@ the dev@aries vote can be summarised and
 <p>Finally - ensure that the file aries_release_version.txt is completely up to date and accurate. 
 You will use this file in the following steps to help build the release web pages.</p>
 <p><a name="ReleasingAries-Promotingthereleaseartifacts"></a></p>
-<h3 id="promoting-the-release-artifacts">Promoting the release artifacts</h3>
+<h3 id="promoting-the-release-artifacts">Promoting the release artifacts<a class="headerlink" href="#promoting-the-release-artifacts" title="Permanent link">&para;</a></h3>
 <p>From the <a href="https://repository.apache.org/index.html#stagingRepositories">Nexus pages</a>
 , select the staging repository and select 'release' from the top menu.
 This moves the release artifacts into an Apache releases repository, from
 there they will be automatically moved to the Maven repository.</p>
 <p><a name="ReleasingAries-MakingthereleaseartifactsavailablefromtheArieswebpages."></a></p>
-<h3 id="making-the-release-artifacts-available-from-the-aries-web-pages">Making the release artifacts available from the Aries web pages.</h3>
+<h3 id="making-the-release-artifacts-available-from-the-aries-web-pages">Making the release artifacts available from the Aries web pages.<a class="headerlink" href="#making-the-release-artifacts-available-from-the-aries-web-pages" title="Permanent link">&para;</a></h3>
 <p>Anything that is to be downloaded must be put in
 /www/www.apache.org/dist/aries on minotaur. Don't forget to changes the file permissions to '664' so that other 
 members of the group can access them. The distributions are
@@ -598,14 +602,14 @@ archived here /www/archive.apache.org/di
 <p>Then, put new release artifacts in the distribution directory. This is best done using a script, the script can be generated uing
 the perl script <a href="http://svn.apache.org/repos/asf/aries/scripts/download_release_artifacts.pl">download_release_artifacts.pl</a>. </p>
 <p>Next, update the Aries Downloads pages to refer to the new artifacts.</p>
-<h3 id="tidying-up-tasks">Tidying up tasks</h3>
+<h3 id="tidying-up-tasks">Tidying up tasks<a class="headerlink" href="#tidying-up-tasks" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Get the compliance tests run</li>
 <li>Release notes</li>
 <li>Release the component in JIRA (manage components), check the JIRA release notes.</li>
 </ul>
 <p><a name="ReleasingAries-Whattodowhenpeoplefindproblemswiththerelease"></a></p>
-<h3 id="what-to-do-when-people-find-problems-with-the-release">What to do when people find problems with the release</h3>
+<h3 id="what-to-do-when-people-find-problems-with-the-release">What to do when people find problems with the release<a class="headerlink" href="#what-to-do-when-people-find-problems-with-the-release" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Cancel the vote [CANCELLED] [VOTE]</li>
 <li>Clean up, fix and re-release.

Modified: websites/staging/aries/trunk/content/development/resources.html
==============================================================================
--- websites/staging/aries/trunk/content/development/resources.html (original)
+++ websites/staging/aries/trunk/content/development/resources.html Fri Jul 31 10:21:58 2015
@@ -164,7 +164,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -172,9 +172,6 @@ h2:hover > .headerlink, h3:hover > .head
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -184,38 +181,23 @@ h2:hover > .headerlink, h3:hover > .head
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>

Modified: websites/staging/aries/trunk/content/development/verifyingrelease.html
==============================================================================
--- websites/staging/aries/trunk/content/development/verifyingrelease.html (original)
+++ websites/staging/aries/trunk/content/development/verifyingrelease.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,7 +274,18 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><h1 id="verifying-release-artifacts">Verifying Release Artifacts</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="verifying-release-artifacts">Verifying Release Artifacts<a class="headerlink" href="#verifying-release-artifacts" title="Permanent link">&para;</a></h1>
 <p>This page provides some help for anyone who wants to verify release candidate artifacts so they feel they can genuinely vote on the related vote thread on the dev list. It is not intended to be exhaustive instructions. It's a list of things people have generally found to be useful to do when checking the artifacts.</p>
 <p>It is essential that the signatures and hashsums are good. Please do read <a href="http://httpd.apache.org/dev/verification.html">Verifying Apache HTTP Server Releases</a> for information on why you should verify releases.. </p>
 <p>These instructions have been rolled up into a script, which you can run instead. Cut and paste the following:</p>
@@ -293,7 +297,7 @@
 </pre></div>
 
 
-<h2 id="have-i-got-the-keys">Have I got the KEYS?</h2>
+<h2 id="have-i-got-the-keys">Have I got the KEYS?<a class="headerlink" href="#have-i-got-the-keys" title="Permanent link">&para;</a></h2>
 <p>To verify Aries release artifacts you need the public keys for the Aries committers.
 The master KEYS file is in Subversion. The easiest way of getting it from the command line is to non-recursively check-out the files in the top level of the Aries location using:</p>
 <div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="o">-</span><span class="n">N</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">aries</span>
@@ -305,7 +309,7 @@ The master KEYS file is in Subversion. T
 </pre></div>
 
 
-<h2 id="download-artifacts">Download artifacts</h2>
+<h2 id="download-artifacts">Download artifacts<a class="headerlink" href="#download-artifacts" title="Permanent link">&para;</a></h2>
 <p>For each 'useful' file there are several others created to help you determine whether it's genuine. The PGP signature .asc file shows who created the 'useful' file. Then there are checksum files (.md5 and .sha1) for both the 'useful' file and the .asc file. To download the content for the repository you're verifying try this:</p>
 <div class="codehilite"><pre><span class="n">wget</span> <span class="o">-</span><span class="n">e</span> <span class="n">robots</span><span class="p">=</span><span class="n">off</span> <span class="o">--</span><span class="n">no</span><span class="o">-</span><span class="n">check</span><span class="o">-</span><span class="n">certificate</span> <span class="o">-</span><span class="n">np</span> <span class="o">-</span><span class="n">r</span> <span class="o">-</span><span class="n">nH</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">repository</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">repositories</span><span class="o">/</span><span class="n">orgapachearies</span><span class="o">-</span><span class="n">xxx</span><span class="o">/</span><span class="n">org</span><span class="o
 ">/</span><span class="n">apache</span><span class="o">/</span><span class="n">aries</span><span class="o">/</span>
 </pre></div>
@@ -313,7 +317,7 @@ The master KEYS file is in Subversion. T
 
 <p>where xxx is the number of the repository you're verifying.</p>
 <p>wget will download the files into a directory called content. The following use of the 'find' command assumes the downloads are in the 'content' directory.</p>
-<h2 id="verify-the-artifacts">Verify the artifacts</h2>
+<h2 id="verify-the-artifacts">Verify the artifacts<a class="headerlink" href="#verify-the-artifacts" title="Permanent link">&para;</a></h2>
 <p>Ensure the checksums are right for the released files. Copy/paste this into the command line:</p>
 <div class="codehilite"><pre><span class="k">for</span> <span class="nb">i</span> <span class="n">in</span> `<span class="nb">find</span> <span class="n">content</span> <span class="o">-</span><span class="n">type</span> <span class="n">f</span> <span class="o">|</span> <span class="n">egrep</span> <span class="o">-</span><span class="n">v</span> <span class="s">&#39;.md5$|.sha1$|index.html|maven-metadata.xml&#39;</span>`
 <span class="n">do</span>
@@ -355,7 +359,7 @@ The master KEYS file is in Subversion. T
 
 
 <p>You shouldn't get any errors.</p>
-<h2 id="build-the-code">Build the code</h2>
+<h2 id="build-the-code">Build the code<a class="headerlink" href="#build-the-code" title="Permanent link">&para;</a></h2>
 <p>It's a good idea to check the source release zip builds. Unzip it first:</p>
 <div class="codehilite"><pre><span class="nb">find</span> <span class="p">.</span> <span class="o">-</span><span class="n">name</span> <span class="o">*-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">zip</span> <span class="o">|</span><span class="n">xargs</span> <span class="o">-</span><span class="n">n</span> 1 <span class="n">unzip</span>
 </pre></div>
@@ -366,7 +370,7 @@ The master KEYS file is in Subversion. T
 </pre></div>
 
 
-<h2 id="rat-check">RAT check</h2>
+<h2 id="rat-check">RAT check<a class="headerlink" href="#rat-check" title="Permanent link">&para;</a></h2>
 <p>It's also a good idea to run the <a href="http://incubator.apache.org/rat/">Apache RAT (Release Audit Tool)</a>. The Aries POMs are set up so you can do:</p>
 <div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">fn</span> <span class="o">-</span><span class="n">Prat</span>
 </pre></div>

Modified: websites/staging/aries/trunk/content/development/versionpolicy.html
==============================================================================
--- websites/staging/aries/trunk/content/development/versionpolicy.html (original)
+++ websites/staging/aries/trunk/content/development/versionpolicy.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,12 +274,23 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><h1 id="aries-versioning-policy">Aries versioning policy</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="aries-versioning-policy">Aries versioning policy<a class="headerlink" href="#aries-versioning-policy" title="Permanent link">&para;</a></h1>
 <p>The Aries  project aims to implement OSGi semantic versioning as described <a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">here</a>.</p>
 <p>The implementation of semantic versioning has a number of practical implications for managing a project. These are
 outlined in this section. </p>
-<h2 id="package-versions">Package versions</h2>
-<h3 id="exported-packages">Exported packages</h3>
+<h2 id="package-versions">Package versions<a class="headerlink" href="#package-versions" title="Permanent link">&para;</a></h2>
+<h3 id="exported-packages">Exported packages<a class="headerlink" href="#exported-packages" title="Permanent link">&para;</a></h3>
 <p>Versions are usually specified in packageinfo files with the source code. The default-parent pom is 
 configures (in the build resources section) to expect packageinfo files. If your pom has a build
 resources section it replaces what is inherited from the default-parent, so you may need to reproduce 
@@ -294,29 +298,29 @@ the section which specifies where packag
 <p>Developers <strong>must</strong> increment the versions in packageinfo files in strict accordance with OSGi
 semantic versioning when they make changes to a package. The version should relate to the <strong>most
 recent release of the package</strong> and not to the version found in trunk. For example:</p>
-<h4 id="scenario-1-making-changes-to-a-package-with-released-version-abc">Scenario 1, making changes to a package with released version a.b.c</h4>
+<h4 id="scenario-1-making-changes-to-a-package-with-released-version-abc">Scenario 1, making changes to a package with released version a.b.c<a class="headerlink" href="#scenario-1-making-changes-to-a-package-with-released-version-abc" title="Permanent link">&para;</a></h4>
 <ul>
 <li>Developer A fixes a bug in the package and increments it's version to a.b.c+1</li>
 <li>Developer B fixes another bug in the package but leaves the version at a.b.c+1 </li>
 </ul>
-<h4 id="scenario-2-making-changes-to-a-package-with-released-version-abc">Scenario 2, making changes to a package with released version a.b.c</h4>
+<h4 id="scenario-2-making-changes-to-a-package-with-released-version-abc">Scenario 2, making changes to a package with released version a.b.c<a class="headerlink" href="#scenario-2-making-changes-to-a-package-with-released-version-abc" title="Permanent link">&para;</a></h4>
 <ul>
 <li>Developer A adds a method to an interface in the package and increments it's version to a.b+1.0</li>
 <li>Developer B fixes a bug in the package, leaves its version at a.b+1.0</li>
 </ul>
-<h4 id="scenario-3-making-changes-to-a-package-with-released-version-abc">Scenario 3, making changes to a package with released version a.b.c</h4>
+<h4 id="scenario-3-making-changes-to-a-package-with-released-version-abc">Scenario 3, making changes to a package with released version a.b.c<a class="headerlink" href="#scenario-3-making-changes-to-a-package-with-released-version-abc" title="Permanent link">&para;</a></h4>
 <ul>
 <li>Developer A fixes a bug in the package, and increments its version to a.b.c+1</li>
 <li>Developer B deletes a method from an interface and increases the package version to a+1.0.0. Note the final '0' here, developer B's change is more significant
 so there is no need to reflect Developer A's change with a micro version of '1'. Indeed, a version of a+1.0.1 would imply a bug fix to version a+1.0.0.</li>
 </ul>
-<h3 id="importing-packages">Importing packages</h3>
+<h3 id="importing-packages">Importing packages<a class="headerlink" href="#importing-packages" title="Permanent link">&para;</a></h3>
 <p>The bnd default version range policy for imports is the consumer policy (==, +). Implementers of interfaces will need to 
 override this. For example as an implementer of an interface the version range 
 would be the provider policy (==,=+).
 The policy can be set by using the Maven property <aries.osgi.version.policy>, see the default-parent
 pom for an example.</p>
-<h2 id="bundle-versions">Bundle versions</h2>
+<h2 id="bundle-versions">Bundle versions<a class="headerlink" href="#bundle-versions" title="Permanent link">&para;</a></h2>
 <p><strong>Note: Bundle versions are changed at release time and only by the release manager. Bundle versions are not updated during development.</strong></p>
 <p>OSGi semantic versioning applies to bundles as well as packages. When releasing a new version of a bundle
 the change in the bundle version should give some indication of nature of the changes to the bundle.
@@ -335,7 +339,7 @@ to allow for loose coupling supported by
 <p>For example, bundles which depend on proxy (e.g. blueprint) will be set to depend on the released version of proxy. Immediately after 
 a release of proxy at say 1.0.0 and a release of blueprint at 1.2.0, the development version of blueprint in trunk will be 1.2.1-SNAPSHOT
 but the version of proxy that it depends on will be 1.0.0.</p>
-<h3 id="assigning-a-bundle-version-number-at-release-time">Assigning a bundle version number at release time</h3>
+<h3 id="assigning-a-bundle-version-number-at-release-time">Assigning a bundle version number at release time<a class="headerlink" href="#assigning-a-bundle-version-number-at-release-time" title="Permanent link">&para;</a></h3>
 <p>At release time the release version of the bundle must be assigned by the release manager after reviewing
 the changes to the bundle's package versions since the last release. This is not a particularly time consuming task as long as 
 packageinfo files are used for versioning packages.</p>

Modified: websites/staging/aries/trunk/content/documentation/application-dependencies.html
==============================================================================
--- websites/staging/aries/trunk/content/documentation/application-dependencies.html (original)
+++ websites/staging/aries/trunk/content/documentation/application-dependencies.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,11 +274,22 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><p><a name="Applications-AriesApplicationModules"></a></p>
-<h1 id="aries-application-modules">Aries Application Modules</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><a name="Applications-AriesApplicationModules"></a></p>
+<h1 id="aries-application-modules">Aries Application Modules<a class="headerlink" href="#aries-application-modules" title="Permanent link">&para;</a></h1>
 <p>Below are the list of bundles in the format of mavenBundle(groupId, artifactId) required if using Apache Aries application module.</p>
 <p><a name="Applications-CoreBundles"></a></p>
-<h2 id="core-runtime-bundles">Core Runtime bundles</h2>
+<h2 id="core-runtime-bundles">Core Runtime bundles<a class="headerlink" href="#core-runtime-bundles" title="Permanent link">&para;</a></h2>
 <p>mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),<br/>
 mavenBundle("org.apache.aries", "org.apache.aries.util" ),<br/>
 mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),<br/>
@@ -301,24 +305,24 @@ mavenBundle("org.apache.aries.applicatio
 mavenBundle("org.apache.aries.application","org.apache.aries.application.deployment.management"),<br/></p>
 <p>Besides the above bundles, either the non-isolated runtime or isolated runtime is also required.
 <a name="Applications-NonIsoloatedAriesapplication"></a></p>
-<h2 id="non-isolated-runtime">Non-isolated Runtime</h2>
+<h2 id="non-isolated-runtime">Non-isolated Runtime<a class="headerlink" href="#non-isolated-runtime" title="Permanent link">&para;</a></h2>
 <p>mavenBundle("org.apache.aries.application","org.apache.aries.application.runtime" ),<br/>
 <a name="Applications-IsoloatedAriesapplication"></a></p>
-<h2 id="isolated-runtime">Isolated Runtime</h2>
+<h2 id="isolated-runtime">Isolated Runtime<a class="headerlink" href="#isolated-runtime" title="Permanent link">&para;</a></h2>
 <p>mavenBundle("org.apache.aries.application","org.apache.aries.application.runtime.isolated"),<br/>
 mavenBundle("org.apache.aries.application","org.apache.aries.application.runtime.framework"),<br/>
 mavenBundle("org.apache.aries.application","org.apache.aries.application.runtime.framework.management"),<br/>
 mavenBundle("org.apache.aries.application","org.apache.aries.application.runtime.repository"),<br/></p>
 <p><a name="Applications-ReplacableBundles"></a></p>
-<h2 id="replacable-bundles">Replacable bundles</h2>
+<h2 id="replacable-bundles">Replacable bundles<a class="headerlink" href="#replacable-bundles" title="Permanent link">&para;</a></h2>
 <p>If the application modules are used in a application server, the following bundles should/can be replaced and the services should/can be implemented by the application server.</p>
-<h4 id="orgapacheariesapplicationdefaultlocalplatform">org.apache.aries.application.default.local.platform</h4>
+<h4 id="orgapacheariesapplicationdefaultlocalplatform">org.apache.aries.application.default.local.platform<a class="headerlink" href="#orgapacheariesapplicationdefaultlocalplatform" title="Permanent link">&para;</a></h4>
 <p>This bundle should be replaced with an alternative bundle by the application server. This bundle provides the temp directory location.</p>
 <p>Note - The following two bundles no longer exist in 0.3.1-SNAPSHOT</p>
 <p>The following two bundles can be replaced by the application server if necessary. </p>
-<h4 id="orgapacheariesapplicationnoopplatformrepo">org.apache.aries.application.noop.platform.repo</h4>
+<h4 id="orgapacheariesapplicationnoopplatformrepo">org.apache.aries.application.noop.platform.repo<a class="headerlink" href="#orgapacheariesapplicationnoopplatformrepo" title="Permanent link">&para;</a></h4>
 <p>The above bundle provides the URL location for the application server runtime capabilities, which are xml file understood by the Felix OBR resolver.</p>
-<h4 id="orgapacheariesapplicationnooppostresolveprocess">org.apache.aries.application.noop.postresolve.process</h4>
+<h4 id="orgapacheariesapplicationnooppostresolveprocess">org.apache.aries.application.noop.postresolve.process<a class="headerlink" href="#orgapacheariesapplicationnooppostresolveprocess" title="Permanent link">&para;</a></h4>
 <p>The above bundle provides the post resolve process. It can be replaced if the application server need to modify the deployment manifest generated by the application moduels.</p></div>
             <!-- Content -->
           </td>

Modified: websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html
==============================================================================
--- websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html (original)
+++ websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,8 +274,19 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><p><a name="AriesProgrammingModel-AriesProgrammingModel"></a></p>
-<h1 id="aries-programming-model">Aries Programming Model</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><a name="AriesProgrammingModel-AriesProgrammingModel"></a></p>
+<h1 id="aries-programming-model">Aries Programming Model<a class="headerlink" href="#aries-programming-model" title="Permanent link">&para;</a></h1>
 <p>Aries facilitates OSGi and Enterprise OSGi development by providing a variety of tools and programming models that can be
 useful for OSGi bundles and applications. This includes technology that implements or extends Enterprise OSGi specifications
 as well as Apache Aries-specific technology.</p>
@@ -313,7 +317,7 @@ as well as Apache Aries-specific technol
 <li><a href="/modules/ebamavenpluginproject.html">esa-maven-plugin</a></li>
 <li>maven versioning plugin</li>
 </ul>
-<h2 id="obsolete">Obsolete</h2>
+<h2 id="obsolete">Obsolete<a class="headerlink" href="#obsolete" title="Permanent link">&para;</a></h2>
 <p>This section list technology that can be found in Apache Aries but has since been superseded by other technology.</p>
 <ul>
 <li>Application (superseded by Subsystems)<ul>

Modified: websites/staging/aries/trunk/content/documentation/articles.html
==============================================================================
--- websites/staging/aries/trunk/content/documentation/articles.html (original)
+++ websites/staging/aries/trunk/content/documentation/articles.html Fri Jul 31 10:21:58 2015
@@ -98,7 +98,18 @@
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-          <div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
+          <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
@@ -153,7 +164,7 @@
 
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/community/overview.html">Community</a> 
+        <a href="/community/resources.html">Community Resources</a> 
     </div>
     <div class="menuitem">
         <a href="/community/gettinginvolved.html">Getting Involved</a> 
@@ -161,9 +172,6 @@
     <div class="menuitem">
         <a href="/community/people.html">Who we are</a> 
     </div>
-    <div class="menuitem">
-        <a href="/community/mailinglists.html">Mailing lists</a> 
-    </div>
         <div class="menuitem">
                 <a href="/community/logos.html">Logos for Users</a>
         </div>
@@ -173,38 +181,23 @@
 
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
-    </div>
-    <div class="menuitem">
-        <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/guidelines.html">Cording Guidelines</a> 
     </div>
     <div class="menuitem">
-        <a href="/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/architecture.html">Architecture</a> 
     </div>
     <div class="menuitem">
         <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/development/verifyingrelease.html">Verifying Release artifacts</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
-        <a href="https://builds.apache.org/hudson/">Build System</a> 
-    </div>
-    <div class="menuitem">
         <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
-        <div class="menuitem">
-        <a href="/development/versionpolicy.html">OSGi Version Policy </a> 
-    </div>
 </div>
 
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
@@ -281,8 +274,19 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><p><a name="Articles-Articles"></a></p>
-<h1 id="articles">Articles</h1>
+            <div class="wiki-content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><a name="Articles-Articles"></a></p>
+<h1 id="articles">Articles<a class="headerlink" href="#articles" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.ibm.com/developerworks/opensource/library/os-osgiblueprint/index.html">Jarek Gawor's article on Blueprint</a></li>
 </ul></div>



Mime
View raw message