ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r953946 - in /websites/staging/ace/trunk/content: ./ docs/ docs/design/ docs/use-cases/ get-involved/
Date Fri, 05 Jun 2015 20:17:02 GMT
Author: buildbot
Date: Fri Jun  5 20:17:01 2015
New Revision: 953946

Log:
Staging update by buildbot for ace

Modified:
    websites/staging/ace/trunk/content/   (props changed)
    websites/staging/ace/trunk/content/docs/ace-deployment-strategies.html
    websites/staging/ace/trunk/content/docs/ace-roles.html
    websites/staging/ace/trunk/content/docs/adding-custom-artifact-types.html
    websites/staging/ace/trunk/content/docs/architecture.html
    websites/staging/ace/trunk/content/docs/coding-standards.html
    websites/staging/ace/trunk/content/docs/configuring-relay-servers.html
    websites/staging/ace/trunk/content/docs/design/auditlog-analysis.html
    websites/staging/ace/trunk/content/docs/design/auditlog-protocol.html
    websites/staging/ace/trunk/content/docs/design/authentication-design.html
    websites/staging/ace/trunk/content/docs/design/bundlerepository-analysis.html
    websites/staging/ace/trunk/content/docs/design/index.html
    websites/staging/ace/trunk/content/docs/design/remote-interfaces.html
    websites/staging/ace/trunk/content/docs/design/security-analysis.html
    websites/staging/ace/trunk/content/docs/design/template-mechanism.html
    websites/staging/ace/trunk/content/docs/getting-started-5-mins.html
    websites/staging/ace/trunk/content/docs/history-and-background.html
    websites/staging/ace/trunk/content/docs/index.html
    websites/staging/ace/trunk/content/docs/release-guide.html
    websites/staging/ace/trunk/content/docs/rest-api.html
    websites/staging/ace/trunk/content/docs/setup-dev-environment.html
    websites/staging/ace/trunk/content/docs/shell-api.html
    websites/staging/ace/trunk/content/docs/test-script.html
    websites/staging/ace/trunk/content/docs/use-cases/index.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-01.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-02.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-03.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-04.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-05.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-06.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-07.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-08.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-09.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-10.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-11.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-12.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-13.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-14.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-15.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-16.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-17.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-18.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-19.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-20.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-21.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-22.html
    websites/staging/ace/trunk/content/docs/use-cases/uc-23.html
    websites/staging/ace/trunk/content/docs/user-guide.html
    websites/staging/ace/trunk/content/docs/user-management-guide.html
    websites/staging/ace/trunk/content/docs/using-basic-auth.html
    websites/staging/ace/trunk/content/docs/using-client-certificates.html
    websites/staging/ace/trunk/content/docs/writing-tests.html
    websites/staging/ace/trunk/content/downloads.html
    websites/staging/ace/trunk/content/get-involved/continuous-integration.html
    websites/staging/ace/trunk/content/get-involved/issue-tracking.html
    websites/staging/ace/trunk/content/get-involved/mailing-lists.html
    websites/staging/ace/trunk/content/get-involved/project-team.html
    websites/staging/ace/trunk/content/get-involved/source-code.html
    websites/staging/ace/trunk/content/index.html
    websites/staging/ace/trunk/content/news.html
    websites/staging/ace/trunk/content/on-the-web.html
    websites/staging/ace/trunk/content/sitemap.html

Propchange: websites/staging/ace/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun  5 20:17:01 2015
@@ -1 +1 @@
-1653537
+1683856

Modified: websites/staging/ace/trunk/content/docs/ace-deployment-strategies.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/ace-deployment-strategies.html (original)
+++ websites/staging/ace/trunk/content/docs/ace-deployment-strategies.html Fri Jun  5 20:17:01 2015
@@ -409,7 +409,7 @@ Aside the actual installation of the dep
 </ol></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/ace-roles.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/ace-roles.html (original)
+++ websites/staging/ace/trunk/content/docs/ace-roles.html Fri Jun  5 20:17:01 2015
@@ -132,7 +132,7 @@ only contain a subset of the metadata to
 <p>The software developer provides artifacts that will be added to the OBR.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/adding-custom-artifact-types.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/adding-custom-artifact-types.html (original)
+++ websites/staging/ace/trunk/content/docs/adding-custom-artifact-types.html Fri Jun  5 20:17:01 2015
@@ -325,7 +325,7 @@ simply upload a newer one. Just make sur
 everybody gets this latest version.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/architecture.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/architecture.html (original)
+++ websites/staging/ace/trunk/content/docs/architecture.html Fri Jun  5 20:17:01 2015
@@ -209,7 +209,7 @@
 <h3 id="use-case-view">Use Case View</h3></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/coding-standards.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/coding-standards.html (original)
+++ websites/staging/ace/trunk/content/docs/coding-standards.html Fri Jun  5 20:17:01 2015
@@ -646,7 +646,7 @@ Example:<br/>
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/configuring-relay-servers.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/configuring-relay-servers.html (original)
+++ websites/staging/ace/trunk/content/docs/configuring-relay-servers.html Fri Jun  5 20:17:01 2015
@@ -338,7 +338,7 @@ its content from another (master) reposi
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/auditlog-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/auditlog-analysis.html (original)
+++ websites/staging/ace/trunk/content/docs/design/auditlog-analysis.html Fri Jun  5 20:17:01 2015
@@ -194,7 +194,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/auditlog-protocol.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/auditlog-protocol.html (original)
+++ websites/staging/ace/trunk/content/docs/design/auditlog-protocol.html Fri Jun  5 20:17:01 2015
@@ -139,7 +139,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/authentication-design.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/authentication-design.html (original)
+++ websites/staging/ace/trunk/content/docs/design/authentication-design.html Fri Jun  5 20:17:01 2015
@@ -429,7 +429,7 @@ authentication processor as well.</dd>
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/bundlerepository-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/bundlerepository-analysis.html (original)
+++ websites/staging/ace/trunk/content/docs/design/bundlerepository-analysis.html Fri Jun  5 20:17:01 2015
@@ -129,7 +129,7 @@
 <p>At the same time, adding these editing capabilities should not mean we cannot still generate static files that can be deployed on an external HTTP server. We do want to add an API for editing, but we don't want to make the whole repository depend on the capability to run code on that server, since we might want to do all maintenance on some client that simply uploads files to a server.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/index.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/index.html (original)
+++ websites/staging/ace/trunk/content/docs/design/index.html Fri Jun  5 20:17:01 2015
@@ -116,7 +116,7 @@ contain "old" terminology that is no lon
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/remote-interfaces.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/remote-interfaces.html (original)
+++ websites/staging/ace/trunk/content/docs/design/remote-interfaces.html Fri Jun  5 20:17:01 2015
@@ -166,7 +166,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/security-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/security-analysis.html (original)
+++ websites/staging/ace/trunk/content/docs/design/security-analysis.html Fri Jun  5 20:17:01 2015
@@ -148,7 +148,7 @@
 <p>The set-up takes aforementioned countermeasure to the identified threat into account. The https connection ensures the confidentiality via encryption. Due to the server and client certificate connection authentication and authorization are addressed. The requirement of separately signed content provides integrity and non repudiation in the absence of compromised certificate private keys. Certificates with known exploited keys can be revoked by adding them to the CRLs. Authority derives from the chain of trust relation to the server and target certificate authority.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/design/template-mechanism.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/design/template-mechanism.html (original)
+++ websites/staging/ace/trunk/content/docs/design/template-mechanism.html Fri Jun  5 20:17:01 2015
@@ -126,7 +126,7 @@
 So, in stead of this rigid semantics, the 'needsApprove' state will become more of a 'tainted' state, which becomes true when something happens that could have an impact on this StatefulTargetObject. We can quite easily determine what targets are affected by a given change in the model by following the associations from that object to the targets.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/getting-started-5-mins.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/getting-started-5-mins.html (original)
+++ websites/staging/ace/trunk/content/docs/getting-started-5-mins.html Fri Jun  5 20:17:01 2015
@@ -244,7 +244,7 @@ detailed <a href="user-guide.html">user
 documentation</a> to check out any other topic that might be of interest.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/history-and-background.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/history-and-background.html (original)
+++ websites/staging/ace/trunk/content/docs/history-and-background.html Fri Jun  5 20:17:01 2015
@@ -141,7 +141,7 @@ using the Deployment Admin specifiction,
 version in case the installation fails.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/index.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/index.html (original)
+++ websites/staging/ace/trunk/content/docs/index.html Fri Jun  5 20:17:01 2015
@@ -165,7 +165,7 @@ background</a>.</p>
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/release-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/release-guide.html (original)
+++ websites/staging/ace/trunk/content/docs/release-guide.html Fri Jun  5 20:17:01 2015
@@ -236,7 +236,7 @@ the KEYS file in place.</p>
 <p>We keep the tag in subversion for reference.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/rest-api.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/rest-api.html (original)
+++ websites/staging/ace/trunk/content/docs/rest-api.html Fri Jun  5 20:17:01 2015
@@ -234,7 +234,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/setup-dev-environment.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/setup-dev-environment.html (original)
+++ websites/staging/ace/trunk/content/docs/setup-dev-environment.html Fri Jun  5 20:17:01 2015
@@ -323,7 +323,7 @@ enter the following commands:</p>
 </ol></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/shell-api.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/shell-api.html (original)
+++ websites/staging/ace/trunk/content/docs/shell-api.html Fri Jun  5 20:17:01 2015
@@ -189,7 +189,7 @@ $<span class="n">w</span> <span class="n
 <p>Fetches the first and only target in the list and assigns it to a variable called "t1". Subsequently deletes the target from the workspace. Deleting other entities is done in a similar way.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/test-script.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/test-script.html (original)
+++ websites/staging/ace/trunk/content/docs/test-script.html Fri Jun  5 20:17:01 2015
@@ -129,7 +129,7 @@
 </pre></div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/index.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/index.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/index.html Fri Jun  5 20:17:01 2015
@@ -133,7 +133,7 @@ a use case.</p>
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-01.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-01.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-01.html Fri Jun  5 20:17:01 2015
@@ -117,7 +117,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-02.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-02.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-02.html Fri Jun  5 20:17:01 2015
@@ -119,7 +119,7 @@
 <p>When a commit fails because of a merge conflict, the client is expected to check out the newly added version and (with or without interaction from a user) merge all changes and then try again. This is explained in <a href="uc-03.html">UC-03 Resolve merge conflict</a>.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-03.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-03.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-03.html Fri Jun  5 20:17:01 2015
@@ -119,7 +119,7 @@
 <p>This use case interacts with the commit use case and the user can go back and forward between the two as long as new merge conflicts pop up.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-04.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-04.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-04.html Fri Jun  5 20:17:01 2015
@@ -122,7 +122,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-05.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-05.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-05.html Fri Jun  5 20:17:01 2015
@@ -116,7 +116,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-06.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-06.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-06.html Fri Jun  5 20:17:01 2015
@@ -117,7 +117,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-07.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-07.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-07.html Fri Jun  5 20:17:01 2015
@@ -117,7 +117,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-08.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-08.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-08.html Fri Jun  5 20:17:01 2015
@@ -117,7 +117,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-09.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-09.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-09.html Fri Jun  5 20:17:01 2015
@@ -116,7 +116,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-10.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-10.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-10.html Fri Jun  5 20:17:01 2015
@@ -112,7 +112,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-11.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-11.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-11.html Fri Jun  5 20:17:01 2015
@@ -112,7 +112,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-12.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-12.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-12.html Fri Jun  5 20:17:01 2015
@@ -115,7 +115,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-13.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-13.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-13.html Fri Jun  5 20:17:01 2015
@@ -114,7 +114,7 @@
 <p>Our current implementation has artifacts, features and licenses. The theory remains the same.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-14.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-14.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-14.html Fri Jun  5 20:17:01 2015
@@ -112,7 +112,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-15.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-15.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-15.html Fri Jun  5 20:17:01 2015
@@ -114,7 +114,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-16.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-16.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-16.html Fri Jun  5 20:17:01 2015
@@ -111,7 +111,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-17.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-17.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-17.html Fri Jun  5 20:17:01 2015
@@ -111,7 +111,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-18.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-18.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-18.html Fri Jun  5 20:17:01 2015
@@ -114,7 +114,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-19.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-19.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-19.html Fri Jun  5 20:17:01 2015
@@ -125,7 +125,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-20.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-20.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-20.html Fri Jun  5 20:17:01 2015
@@ -104,7 +104,7 @@
       <div id="content"><p>Manages user accounts and their roles.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-21.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-21.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-21.html Fri Jun  5 20:17:01 2015
@@ -104,7 +104,7 @@
       <div id="content"><p>Manages the rights associated with the different roles in the system.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-22.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-22.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-22.html Fri Jun  5 20:17:01 2015
@@ -104,7 +104,7 @@
       <div id="content"><p>Manages certificates for the system, acting as a certificate authority for the whole eco-system.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/use-cases/uc-23.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-23.html (original)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-23.html Fri Jun  5 20:17:01 2015
@@ -104,7 +104,7 @@
       <div id="content"><p>Manage the topology of the provisioning system. Apache ACE supports many different topologies with servers, relay servers, repositories, clients and targets.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/user-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/user-guide.html (original)
+++ websites/staging/ace/trunk/content/docs/user-guide.html Fri Jun  5 20:17:01 2015
@@ -601,7 +601,7 @@ website</a>.&#160;<a class="footnote-bac
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/user-management-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/user-management-guide.html (original)
+++ websites/staging/ace/trunk/content/docs/user-management-guide.html Fri Jun  5 20:17:01 2015
@@ -179,7 +179,7 @@ password can then be inserted into the p
 button saves the change.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/using-basic-auth.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/using-basic-auth.html (original)
+++ websites/staging/ace/trunk/content/docs/using-basic-auth.html Fri Jun  5 20:17:01 2015
@@ -327,7 +327,7 @@ otherwise the new configuration files wi
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/using-client-certificates.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/using-client-certificates.html (original)
+++ websites/staging/ace/trunk/content/docs/using-client-certificates.html Fri Jun  5 20:17:01 2015
@@ -297,7 +297,7 @@ certificate of the other side.&#160;<a c
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/docs/writing-tests.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/writing-tests.html (original)
+++ websites/staging/ace/trunk/content/docs/writing-tests.html Fri Jun  5 20:17:01 2015
@@ -238,7 +238,7 @@ For our simple integration test, however
 </div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/downloads.html
==============================================================================
--- websites/staging/ace/trunk/content/downloads.html (original)
+++ websites/staging/ace/trunk/content/downloads.html Fri Jun  5 20:17:01 2015
@@ -137,7 +137,7 @@
 <p>If you are looking for previous releases of Apache ACE, take a look in <a href="http://archive.apache.org/dist/ace/">the archives</a> and <a href="http://archive.apache.org/dist/incubator/ace/">the incubator archives</a>.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/get-involved/continuous-integration.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/continuous-integration.html (original)
+++ websites/staging/ace/trunk/content/get-involved/continuous-integration.html Fri Jun  5 20:17:01 2015
@@ -107,7 +107,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/get-involved/issue-tracking.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/issue-tracking.html (original)
+++ websites/staging/ace/trunk/content/get-involved/issue-tracking.html Fri Jun  5 20:17:01 2015
@@ -108,7 +108,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/get-involved/mailing-lists.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/mailing-lists.html (original)
+++ websites/staging/ace/trunk/content/get-involved/mailing-lists.html Fri Jun  5 20:17:01 2015
@@ -124,7 +124,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/get-involved/project-team.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/project-team.html (original)
+++ websites/staging/ace/trunk/content/get-involved/project-team.html Fri Jun  5 20:17:01 2015
@@ -167,7 +167,7 @@
 </table></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/get-involved/source-code.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/source-code.html (original)
+++ websites/staging/ace/trunk/content/get-involved/source-code.html Fri Jun  5 20:17:01 2015
@@ -111,7 +111,7 @@
 <p>Git support will probably come to Apache in the future. However, the current mirrors at Github are outdated and should not be used until further notice.</p></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/index.html
==============================================================================
--- websites/staging/ace/trunk/content/index.html (original)
+++ websites/staging/ace/trunk/content/index.html Fri Jun  5 20:17:01 2015
@@ -110,11 +110,12 @@
 <h1 id="background">Background</h1>
 <p>When assembling software out of reusable components, the task of deploying software onto an ever increasing number of targets is not trivial to solve. This becomes even harder when these targets require different components based on who's using them.</p>
 <p>Apache ACE allows you to group those components and assign them to a managed set of targets. This allows you to distribute updates and new components easily, while keeping a full history of what was installed where during what period. It also helps you setup an automated development, QA/testing, staging and production environment.</p>
-<p>If you want to learn more about how to use Apache ACE, go to the User Documentation and start with <a href="/user-doc/introduction.html">A brief introduction</a>. If you are interested in becoming involved, check out our <a href="/get-involved/mailing-lists.html">Mailing Lists</a> and finally, to gain a deeper understanding of the software, read the available <a href="/dev-doc/getting-started.html">Developer Documentation</a> which explains how to build the software and the overall <a href="/dev-doc/architecture.html">Software Architecture</a>.</p>
-<iframe src="//player.vimeo.com/video/117383826" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div>
+<p>If you want to learn more about how to use Apache ACE, go to the Documentation and start with <a href="/docs/getting-started-5-mins.html">getting started in 5 minutes</a>. If you are interested in becoming involved, check out our <a href="/get-involved/mailing-lists.html">Mailing Lists</a> and finally, to gain a deeper understanding of the software, read the available <a href="/docs/setup-dev-environment.html">Developer Documentation</a> which explains how to build the software and the overall <a href="/docs/architecture.html">Software Architecture</a>.</p>
+<h1 id="introduction">Introduction</h1>
+<div align="center"><iframe src="//player.vimeo.com/video/117383826" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/news.html
==============================================================================
--- websites/staging/ace/trunk/content/news.html (original)
+++ websites/staging/ace/trunk/content/news.html Fri Jun  5 20:17:01 2015
@@ -112,7 +112,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/on-the-web.html
==============================================================================
--- websites/staging/ace/trunk/content/on-the-web.html (original)
+++ websites/staging/ace/trunk/content/on-the-web.html Fri Jun  5 20:17:01 2015
@@ -140,7 +140,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>

Modified: websites/staging/ace/trunk/content/sitemap.html
==============================================================================
--- websites/staging/ace/trunk/content/sitemap.html (original)
+++ websites/staging/ace/trunk/content/sitemap.html Fri Jun  5 20:17:01 2015
@@ -109,7 +109,7 @@
 </ul></div>
       <hr>
       <footer>
-        <p>Copyright &#169; 2012-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+        <p>Copyright &#169; 2012-2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
       </footer>
     </div>
   </body>



Mime
View raw message