ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r883132 [3/4] - in /websites/staging/ace/trunk/content: ./ dev-doc/ dev-doc/analysis/ dev-doc/design/ dev-doc/requirements/ dev-doc/requirements/use-cases/ get-involved/ user-doc/
Date Fri, 18 Oct 2013 12:50:20 GMT
Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-18.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-18.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-18.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 18 - Review audit log</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-19.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-19.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-19.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 19 - Approve version</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-20.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-20.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-20.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 20 - Manage users</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-21.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-21.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-21.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 21 - Manage rights</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-22.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-22.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-22.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 22 - Manage certificates</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-23.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-23.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-23.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 23 - Manage system topology</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/writing-tests.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/writing-tests.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/writing-tests.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Writing unit/integration tests</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/downloads.html
==============================================================================
--- websites/staging/ace/trunk/content/downloads.html (original)
+++ websites/staging/ace/trunk/content/downloads.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Downloads</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Continuous Integration</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Issue Tracking</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Mailing Lists</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Project Team</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Source Code</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/index.html
==============================================================================
--- websites/staging/ace/trunk/content/index.html (original)
+++ websites/staging/ace/trunk/content/index.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title></title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/news.html
==============================================================================
--- websites/staging/ace/trunk/content/news.html (original)
+++ websites/staging/ace/trunk/content/news.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>News</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

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 Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>On the web</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/sitemap.html
==============================================================================
--- websites/staging/ace/trunk/content/sitemap.html (original)
+++ websites/staging/ace/trunk/content/sitemap.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Sitemap</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/user-doc/faq.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/faq.html (original)
+++ websites/staging/ace/trunk/content/user-doc/faq.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Frequently Asked Questions</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/user-doc/features.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/features.html (original)
+++ websites/staging/ace/trunk/content/user-doc/features.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Features</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/user-doc/getting-started.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/getting-started.html (original)
+++ websites/staging/ace/trunk/content/user-doc/getting-started.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Getting Started</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">
@@ -187,36 +162,17 @@
       <div id="content"><p>This guide shows the core functionality of ACE, organizing bundles and other artifacts into logical features and distributions and associating those with specific targets, all done using a convenient web interface.</p>
 <h2 id="download-the-distribution">Download the distribution</h2>
 <p>To start using ACE, you must first launch a server. If you're a developer, you can do that inside Eclipse, as explained <a href="/dev-doc/getting-started.html">here</a>. Otherwise, you need to download a distribution of the server, unpack it, and start it up:</p>
-<h3 id="version-081">Version 0.8.1</h3>
-<ol>
-<li>Download a binary distribution of the server from the <a href="/downloads.html">download</a> page.</li>
-<li>Unpack the archive somewhere on your filesystem.</li>
-</ol>
-<h3 id="version-10-comming-soon">Version 1.0 (comming soon)</h3>
 <ol>
 <li>Download the binary distribution called <code>apache-ace-&lt;version&gt;-bin.zip</code> from the <a href="/downloads.html">download</a> page.</li>
 <li>Unpack the archive somewhere on your filesystem.</li>
 </ol>
 <h2 id="start-the-ace-server">Start the ACE server</h2>
-<h3 id="version-081_1">Version 0.8.1</h3>
-<ol>
-<li>Open a terminal and navigate into the root of the distribution.</li>
-<li>Start the server using <code>run.sh</code> (on Linux and Mac OS X) or <code>run.bat</code> (on Windows).</li>
-</ol>
-<h3 id="version-10">Version 1.0</h3>
 <ol>
 <li>Open a terminal and navigate nto the root of the distribution.</li>
 <li>Navigate to the sub directory <code>server-allinone</code>.</li>
 <li>Start the server using <code>java -jar server-allinone.jar</code></li>
 </ol>
 <h2 id="start-an-ace-target">Start an ACE target</h2>
-<h3 id="version-081_2">Version 0.8.1</h3>
-<ol>
-<li>Open a terminal and navigate into the root of the distribution.</li>
-<li>Navigate to the sub directory <code>ace-launcher/target</code>.</li>
-<li>Start the agent using <code>java -jar org.apache.ace.launcher*.jar</code></li>
-</ol>
-<h3 id="version-10_1">Version 1.0</h3>
 <ol>
 <li>Open a terminal and navigate into the root of the distribution.</li>
 <li>Navigate to the sub directory <code>target</code>.</li>

Modified: websites/staging/ace/trunk/content/user-doc/introduction.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/introduction.html (original)
+++ websites/staging/ace/trunk/content/user-doc/introduction.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Introduction</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/user-doc/restapi.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/restapi.html (original)
+++ websites/staging/ace/trunk/content/user-doc/restapi.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Client REST API</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">



Mime
View raw message