You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by bu...@apache.org on 2013/10/18 14:50:20 UTC

svn commit: r883132 [2/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/

Modified: websites/staging/ace/trunk/content/dev-doc/design/using-client-certificates.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/using-client-certificates.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/using-client-certificates.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Using client certificate authentication</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/getting-started.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/getting-started.html (original)
+++ websites/staging/ace/trunk/content/dev-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">

Modified: websites/staging/ace/trunk/content/dev-doc/release-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/release-guide.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/release-guide.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Release Guide</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/index.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/index.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/index.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Requirements</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/roles.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/roles.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/roles.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Roles</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/index.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/index.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/index.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Cases</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-01.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-01.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-01.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 01 - Checkout</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-02.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-02.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-02.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 02 - Commit</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-03.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-03.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-03.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 03 - Resolve merge conflict</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-04.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-04.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-04.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 04 - Check for update</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-05.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-05.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-05.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 05 - Send audit log data</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-06.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-06.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-06.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 06 - Synchronize</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-07.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-07.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-07.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 07 - Add artifact</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-08.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-08.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-08.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 08 - Add artifact from external location</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-09.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-09.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-09.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 09 - Add artifact from managed location</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-10.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-10.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-10.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 10 - Add artifact from filesystem</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-11.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-11.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-11.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 11 - Add artifact from OBR</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-12.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-12.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-12.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 12 - Associate</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-13.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-13.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-13.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 13 - Associate artifact to distribution</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-14.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-14.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-14.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 14 - Associate distribution to target</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-15.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-15.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-15.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 15 - Create</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-16.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-16.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-16.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 16 - Create distribution</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-17.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-17.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-17.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Use Case 17 - Create target</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">