From f3e064c8241e9e4ceb57b0395d5342f439ac8c39 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sun, 4 Mar 2012 00:14:20 -0800
Subject: [PATCH] Use 3 columns instead of 2 + wall of text

 * update titles to be unique per page
 * three sections: Software Manuals, API Developer Manuals, Developer Documentation
 * moved the "related resources" to either API or Developer sections
 * removed domain (docs.openstack.org) from paths (like CSS/images/links) - makes it easier to developer
 * Update titles and headings of columns

Change-Id: I1be0c0f95cec637303778b80d4f61c8cba933ec5
---
 www/api/index.html          |  52 +++++-----
 www/bexar/index.html        |  10 +-
 www/cactus/index.html       |  16 +--
 www/common/css/docblitz.css |   8 +-
 www/developer/index.html    | 192 ++++++++++++++++++++++++++++++++++++
 www/diablo/index.html       |  51 ++++------
 www/incubation/index.html   |   8 +-
 www/index.html              |  58 +++++------
 www/trunk/index.html        |  90 +++++++----------
 9 files changed, 317 insertions(+), 168 deletions(-)
 create mode 100644 www/developer/index.html
diff --git a/www/api/index.html b/www/api/index.html
index 4a67e08a43..be6656b3d8 100644
--- a/www/api/index.html
+++ b/www/api/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Documentation - API</title>
+    <title>OpenStack Docs: APIs</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css">
+    <link rel="stylesheet" type="text/css" href="/common/css/docblitz.css">
        
     <script type="text/javascript">
     
@@ -109,30 +109,38 @@
       					  }, true);
       					</script>
       	      </div> -->
-	<div id="manuals" class="span-16">
+	<div id="manuals" class="span-24 last">
 	    	<h3 class="subhead">OpenStack Manuals</h3>
 	    	<div class="span-8">
-	    		<div id="SoftwareManuals"  >
-		    		<h2><a href="/diablo/">Software Manuals</a></h2>
-		    		<p>A great starting point for users and admins</p>
+	    		<div id="SoftwareManuals">
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
 	    		</div>    			    		
 	    	</div>
-	    	<div class="span-8 last">
-				<div id="ApiManuals" class="Selected" >
-					<h2><a href="/api/">API Developer Manuals</a></h2>
-					<p>A great starting point for developers and integrators.</p>
+	    	<div class="span-8">
+				<div id="ApiManuals" class="Selected">
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
 				</div>    			    		
 	    	</div>
-	    	
+			<div class="span-8 last">
+				<div id="DeveloperDocs">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
+
 	    	<hr />
 	    	
-	    	<div class="span-16 last">
+	    	<div class="span-24 last">
 	    	
 	    		<table class="manualTable">
 	    			
 		    		<th colspan="2"><strong>API Documentation</strong></th>
 		    		
-		    		
+            <tr>
+              <td><a href="http://api.openstack.org/">API Developer Reference</a><p>Online reference for the OpenStack APIs</p></td>
+            </tr>
 		    		
 		    		<tr>
 		    			<td><a href="/api/openstack-compute/2/content/">OpenStack Compute Developer Guide API 2</a></td>
@@ -157,20 +165,6 @@
 	    		</table>
 	    	</div>
 	 </div>
-    <div id="latest" class="span-8 last">
-	    <h3 class="subhead">Related Resources</h3>
-	    <ul>
-			<li><h4><a href="http://api.openstack.org/">API Developer Reference</a></h4><p>Online reference for the OpenStack APIs</p></li>
-	    <li><h4><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a></h4><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></li>
-			<li><h4><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a></h4><p>Online developer documentation for OpenStack Compute (Nova)</p></li>
-			<li><h4><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a></h4><p>Online developer documentation for OpenStack Object Storage (Swift)</p></li>
-			<li><h4><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a></h4><p>Online developer documentation for OpenStack Image Service (Glance)</p></li>
-			<li><h4><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a></h4><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></li>
-			<li><h4><a href="http://horizon.openstack.org/">Dashboard Contributor Documentation <span class="tag">Horizon</span></a></h4><p>Online contributor documentation for OpenStack Dashboard (Horizon)</p></li>
-			<li><h4><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a></h4><p>The OpenStack developer wiki</p></li>
-		</ul>
-	    
-    </div>
     	
 </div>
 
@@ -183,7 +177,7 @@
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
 
-<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
+<script src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
 </script>
 
 
@@ -219,4 +213,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/www/bexar/index.html b/www/bexar/index.html
index de7b3370ef..620725fe77 100644
--- a/www/bexar/index.html
+++ b/www/bexar/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Open Source Cloud Computing Software</title>
+    <title>OpenStack Docs: Bexar</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/new-homepage.css">    
+    <link rel="stylesheet" type="text/css" href="/common/css/new-homepage.css">    
     
     <link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css">    
     
@@ -95,7 +95,7 @@
 	    		<p class="instructions">2. Choose from the manuals below.</p>
 	    		<h1>OpenStack Compute Manuals</h1>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/openstack-compute/admin/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/openstack-compute/admin/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/openstack-compute/admin/content/">OpenStack Compute Administration Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/openstack-compute/admin/content/" class="roundedButton">Browser View</a></li>
@@ -105,7 +105,7 @@
 	    		
 	    		<h1>OpenStack Object Storage Manuals</h1>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/openstack-object-storage/admin/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/openstack-object-storage/admin/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/openstack-object-storage/admin/content/">OpenStack Object Storage Administration Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a></li>
@@ -113,7 +113,7 @@
 	    			</ul>
 	    		</div>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/openstack-object-storage/developer/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/openstack-object-storage/developer/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/openstack-object-storage/developer/content/">OpenStack Object Storage Developer Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/openstack-object-storage/developer/content/" class="roundedButton">Browser View</a></li>
diff --git a/www/cactus/index.html b/www/cactus/index.html
index 65fb966937..3cb5adea65 100644
--- a/www/cactus/index.html
+++ b/www/cactus/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Open Source Cloud Computing Software</title>
+    <title>OpenStack Docs: Cactus</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/new-homepage.css">    
+    <link rel="stylesheet" type="text/css" href="/common/css/new-homepage.css">    
     
     <link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css">    
     
@@ -96,7 +96,7 @@
 	    		<p class="instructions">2. Choose from the manuals below.</p>
 	    		<h1>OpenStack Compute Manuals</h1>
 	    		<div class="bookBox">
-	    		<a href="http://docs.openstack.org/cactus/openstack-compute/starter/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    		<a href="http://docs.openstack.org/cactus/openstack-compute/starter/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    		<h2>
 	    		<a href="http://docs.openstack.org/cactus/openstack-compute/starter/content/">OpenStack Compute Starter Guide</a></h2>
 		    			<ul>
@@ -104,7 +104,7 @@
 		    			<li><a href="/cactus/openstack-compute/starter/openstack-starter-guide-cactus.pdf" class="roundedButton">PDF</a></li>
 		    			</div>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/cactus/openstack-compute/admin/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/cactus/openstack-compute/admin/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/cactus/openstack-compute/admin/content/">OpenStack Compute Administration Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/cactus/openstack-compute/admin/content/" class="roundedButton">Browser View</a></li>
@@ -113,7 +113,7 @@
 	    		</div>
 	    		
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.1/content/index.html"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.1/content/index.html"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.1/content/index.html">OpenStack Compute Developer Guide API 1.1</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.1/content/index.html" class="roundedButton">Browser View</a></li>
@@ -122,7 +122,7 @@
 	    		</div>
 	    		
 				<div class="bookBox">
-					<a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.0/content/index.html"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+					<a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.0/content/index.html"><img src="/common/images/openstack-manual.png"/></a>
 					<h2><a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.0/content/index.html">OpenStack Compute Developer Guide API 1.0</a></h2>
 					<ul>
 						<li class="adminGuide"><a href="http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.0/content/index.html" class="roundedButton">Browser View</a></li>
@@ -133,7 +133,7 @@
 	    		
 	    		<h1>OpenStack Object Storage Manuals</h1>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/cactus/openstack-object-storage/admin/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/cactus/openstack-object-storage/admin/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/cactus/openstack-object-storage/admin/content/">OpenStack Object Storage Administration Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/cactus/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a></li>
@@ -141,7 +141,7 @@
 	    			</ul>
 	    		</div>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/cactus/openstack-object-storage/developer/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/cactus/openstack-object-storage/developer/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/cactus/openstack-object-storage/developer/content/">OpenStack Object Storage Developer Guide</a></h2>
 	    			<ul>
 	    				<li class="adminGuide"><a href="http://docs.openstack.org/cactus/openstack-object-storage/developer/content/" class="roundedButton">Browser View</a></li>
diff --git a/www/common/css/docblitz.css b/www/common/css/docblitz.css
index b45415649b..ad20341389 100644
--- a/www/common/css/docblitz.css
+++ b/www/common/css/docblitz.css
@@ -334,7 +334,7 @@ div.releaseSwitcher {
 	padding-left: 30px;
 }
 
-#SoftwareManuals, #ApiManuals {
+#SoftwareManuals, #ApiManuals, #DeveloperDocs {
 	background: url(../images/large-manual.png) no-repeat 5px center;
 	padding: 8px;
 	padding-left: 70px;
@@ -343,12 +343,12 @@ div.releaseSwitcher {
 	border: 3px solid white;
 } 
 
-#SoftwareManuals h2, #ApiManuals h2 {
+#SoftwareManuals h2, #ApiManuals h2, #DeveloperDocs h2 {
 	margin-top: 10px;
 	margin-bottom: 2px;
 }
 
-#SoftwareManuals h2 a, #ApiManuals h2 a {
+#SoftwareManuals h2 a, #ApiManuals h2 a, #DeveloperDocs h2 a {
 	color: black;
 }
 
@@ -358,7 +358,7 @@ div.releaseSwitcher {
 }
 
 .Selected:after {
-    content: url('/common/images/selection-arrow.png');
+    content: url('../images/selection-arrow.png');
     display: block;
     text-align: center;
     margin-top: 10px;
diff --git a/www/developer/index.html b/www/developer/index.html
new file mode 100644
index 0000000000..d07bb71e16
--- /dev/null
+++ b/www/developer/index.html
@@ -0,0 +1,192 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
+    <title>OpenStack Docs: Developers</title>
+
+    <!-- Google Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
+
+    <!-- Framework CSS -->
+    <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
+    <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
+    <!--[if lt IE 8]><link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
+
+    <!-- OpenStack Specific CSS -->
+    <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
+    <link rel="stylesheet" type="text/css" href="../common/css/docblitz.css">
+    <link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css">
+
+    <!--<script type="text/javascript">
+
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-17511903-6']);
+      _gaq.push(['_setDomainName', '.openstack.org']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+
+    </script>-->
+</head>
+<body class="docshome" id="docshome">
+
+    <div class="container">
+        <div id="header">
+            <div class="span-5">
+                <h1 id="logo"><a href="http://www.openstack.org/">Open Stack</a></h1>
+            </div>
+            <div class="span-19 last">
+                <div id="navigation">
+                    <ul id="Menu1">
+                        <li><a href="http://www.openstack.org/" title="Go to the Home page" class="link">Home</a></li>
+                        <li><a href="http://www.openstack.org/projects/" title="Go to the OpenStack Projects page">Projects</a></li>
+                        <li><a href="http://www.openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
+                        <li><a href="http://www.openstack.org/community/" title="Go to the Community page" class="link">Community</a></li>
+                        <li><a href="http://www.openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
+                        <li><a href="http://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
+                        <li><a href="http://docs.openstack.org/" title="Go to OpenStack Documentation" class="current">Documentation</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Page Content -->
+    <div class="container">
+        <div class="searchArea span-16 prepend-4">
+            <div id="cse" style="width: 100%;">Loading</div>
+            <script src="http://www.google.com/jsapi" type="text/javascript"></script>
+            <script type="text/javascript">
+                google.load('search', '1', {language : 'en'});
+                google.setOnLoadCallback(function() {
+                    var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
+                    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+                    customSearchControl.draw('cse');
+                }, true);
+            </script>
+        </div>
+        <div id="manuals" class="span-24 last">
+            <h3 class="subhead">OpenStack Manuals</h3>
+	    	<div class="span-8">
+	    		<div id="SoftwareManuals">
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
+	    		</div>    			    		
+	    	</div>
+	    	<div class="span-8">
+				<div id="ApiManuals"  >
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
+				</div>    			    		
+	    	</div>
+			<div class="span-8 last">
+				<div id="DeveloperDocs" class="Selected">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
+            <hr />
+
+            <div class="span-24 last">
+                <table class="manualTable">
+                    <tr>
+                        <th><h3>OpenStack Project Developer Details</h3></th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a><p>Online developer documentation for OpenStack Compute (Nova)</p></td>
+                        <td><a href="http://nova.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://horizon.openstack.org/">Dashboard Developer Documentation <span class="tag">Horizon</span></a><p>Online developer documentation for OpenStack Dashboard (Horizon)</p></td>
+                        <td><a href="http://horizon.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></td>
+                        <td><a href="http://keystone.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a><p>Online developer documentation for OpenStack Image Service (Glance)</p></td>
+                        <td><a href="http://glance.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a><p>Online developer documentation for OpenStack Object Storage (Swift)</p></td>
+                        <td><a href="http://swift.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+
+                    <tr>
+                        <th><h3>Project Wide</h3></th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a><p>The OpenStack developer wiki</p></td>
+                        <td><a href="http://wiki.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></td>
+                        <td><a href="http://ci.openstack.org/" class="roundedButton">Browser View</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-api-extensions/content/">OpenStack API Extensions: An Overview</a></td>
+                        <td><a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-api-extensions/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-api-extensions/apix-intro-proposal-trunk.pdf" onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-starter-guide-diablo-pdf']);" class="roundedButton">PDF</a></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <div class="container">
+        <div id="footer">
+            <hr>
+            <p>The OpenStack project is provided under the Apache 2.0 license. Openstack.org is powered by <a href="http://www.rackspacecloud.com/">Rackspace Cloud Computing</a>.</p>
+        </div>
+    </div>
+
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
+    <script type="text/javascript" src="/scripts/jquery.jparallax.min.js"></script>
+    <script type="text/javascript" src="/scripts/jquery.ticker.js"></script>
+    <script type="text/javascript">
+    var disqus_shortname = 'openstackblog';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.src = 'http://disqus.com/forums/openstackblog/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+    </script>
+    <script type="text/javascript">
+    $(document).ready(function(){
+        // Add transitions for quotes
+        $('#quotes').list_ticker({
+            speed:8000,
+            effect:'fade'
+        });
+
+        // Declare parallax on layers
+        jQuery('.parallax-layer').parallax({
+            mouseport: jQuery("#port")
+        });
+
+        //hide job descriptions
+        $('.jobDescription').hide();
+
+        // toggles the job descriptions
+        $('a.jobTitle').click(function() {
+            $(this).closest('div.jobPosting').find('div.jobDescription').slideToggle(400);
+            return false;
+        });
+    })
+    </script>
+    <script type="text/javascript" src="/shadowbox/shadowbox.js"></script>
+    <script type="text/javascript">
+        Shadowbox.init();
+    </script>
+
+</body>
+</html>
diff --git a/www/diablo/index.html b/www/diablo/index.html
index 1f0f5060f5..b9b603b040 100644
--- a/www/diablo/index.html
+++ b/www/diablo/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Documentation - Diablo</title>
+    <title>OpenStack Docs: Diablo</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css">
+    <link rel="stylesheet" type="text/css" href="/common/css/docblitz.css">
        
     <script type="text/javascript">
     
@@ -109,24 +109,29 @@
       					  }, true);
       					</script>
       	      </div> -->
-	<div id="manuals" class="span-16">
+	<div id="manuals" class="span-24 last">
 	    	<h3 class="subhead">OpenStack Manuals</h3>
 	    	<div class="span-8">
 	    		<div id="SoftwareManuals" class="Selected" >
-		    		<h2><a href="/diablo/">Software Manuals</a></h2>
-		    		<p>A great starting point for deployers and cloud administrators. </p>
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
 	    		</div>    			    		
 	    	</div>
-	    	<div class="span-8 last">
+	    	<div class="span-8">
 				<div id="ApiManuals"  >
-					<h2><a href="/api/">API Developer Manuals</a></h2>
-					<p>A great starting point for developers and integrators.</p>
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
 				</div>    			    		
 	    	</div>
-	    	
+			<div class="span-8 last">
+				<div id="DeveloperDocs">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
 	    	<hr />
 	    	
-	    	<div class="span-16 last">
+	    	<div class="span-24 last">
 	    	
 	    		<table class="manualTable">
 	    			
@@ -137,13 +142,13 @@
 			    			<div class="dropDown">
 			    				<div>
 			    				
-			    					  <li class="link"><a href="http://docs.openstack.org/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
+			    					  <li class="link"><a href="/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
+			    					  <li class="link"><a href="/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/trunk/" title="Go to the &quot;Trunk&quot; page">Trunk</a></li>
+			    					  <li class="link"><a href="/trunk/" title="Go to the &quot;Trunk&quot; page">Trunk</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
+			    					  <li class="link"><a href="/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
 			    				
 			    				</div>
 			    			</div>
@@ -196,20 +201,6 @@
 	    		</table>
 	    	</div>
 	 </div>
-    <div id="latest" class="span-8 last">
-	    <h3 class="subhead">Related Resources</h3>
-	    <ul>
-	    <li><h4><a href="http://api.openstack.org/">API Developer Reference</a></h4><p>Online reference for the OpenStack APIs</p></li>
-	    <li><h4><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a></h4><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></li>
-			<li><h4><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a></h4><p>Online developer documentation for OpenStack Compute (Nova)</p></li>
-			<li><h4><a href="http://horizon.openstack.org/">Dashboard Developer Documentation <span class="tag">Horizon</span></a></h4><p>Online developer documentation for OpenStack Dashboard (Horizon)</p></li>
-			<li><h4><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a></h4><p>Online developer documentation for OpenStack Object Storage (Swift)</p></li>
-			<li><h4><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a></h4><p>Online developer documentation for OpenStack Image Service (Glance)</p></li>
-			<li><h4><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a></h4><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></li>
-			<li><h4><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a></h4><p>The OpenStack developer wiki</p></li>
-		</ul>
-	    
-    </div>
     	
 </div>
 
@@ -222,7 +213,7 @@
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
 
-<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
+<script src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
 </script>
 
 
@@ -258,4 +249,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/www/incubation/index.html b/www/incubation/index.html
index 8f21394fd1..bb0da13c04 100644
--- a/www/incubation/index.html
+++ b/www/incubation/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Open Source Cloud Computing Software - Incubated Projects</title>
+    <title>OpenStack Docs: Incubated Projects</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/new-homepage.css">    
+    <link rel="stylesheet" type="text/css" href="/common/css/new-homepage.css">    
     
     <link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css">    
     
@@ -127,7 +127,7 @@
 	    		<p class="instructions">2. Choose from the manuals below.</p>
 	    		<h1>OpenStack Network Connectivity Manuals (Quantum)</h1>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/incubation/openstack-network/developer/quantum-api-1.0/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/incubation/openstack-network/developer/quantum-api-1.0/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/incubation/openstack-network/developer/quantum-api-1.0/content/">OpenStack Quantum Developer Guide API 1.0</a></h2>
 	    			<ul>
 	    				<li class="devGuide"><a href="http://docs.openstack.org/incubation/openstack-network/developer/quantum-api-1.0/content/" class="roundedButton">Browser View</a></li>
@@ -135,7 +135,7 @@
 	    			</ul>
 	    		</div>
 	    		<div class="bookBox">
-	    			<a href="http://docs.openstack.org/incubation/openstack-network/admin/content/"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
+	    			<a href="http://docs.openstack.org/incubation/openstack-network/admin/content/"><img src="/common/images/openstack-manual.png"/></a>
 	    			<h2><a href="http://docs.openstack.org/incubation/openstack-network/admin/content/">OpenStack Quantum Admin Guide</a></h2>
 	    			<ul>
 	    				<li class="devGuide"><a href="http://docs.openstack.org/incubation/openstack-network/admin/content/" class="roundedButton">Browser View</a></li>
diff --git a/www/index.html b/www/index.html
index 39b90fcb59..a040a5e663 100644
--- a/www/index.html
+++ b/www/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Documentation - Diablo</title>
+    <title>OpenStack Docs: Diablo</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css">
+    <link rel="stylesheet" type="text/css" href="/common/css/docblitz.css">
        
     <script type="text/javascript">
     
@@ -51,10 +51,8 @@
 						   		  
   		<li><a href="http://www.openstack.org/" title="Go to the Home page" class="link">Home</a></li> 
    		  
-  		<li><a href="http://www.openstack.org/projects/" title="Go to the OpenStack Projects page">Projects</a></li>
-
-		<li><a href="http://www.openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li> 
-   		  
+  		<li><a href="http://www.openstack.org/projects/" title="Go to the OpenStack Projects page">Projects</a></li> 
+   		<li><a href="http://www.openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>   
   		<li><a href="http://www.openstack.org/community/" title="Go to the Community page" class="link">Community</a></li> 
    	
 						  <li><a href="http://www.openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li> 
@@ -111,24 +109,31 @@
       					  }, true);
       					</script>
       	      </div> -->
-	<div id="manuals" class="span-16">
+	<div id="manuals" class="span-24 last">
 	    	<h3 class="subhead">OpenStack Manuals</h3>
+
 	    	<div class="span-8">
 	    		<div id="SoftwareManuals" class="Selected" >
-		    		<h2><a href="/diablo/">Software Manuals</a></h2>
-		    		<p>A great starting point for deployers and cloud administrators. </p>
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
 	    		</div>    			    		
 	    	</div>
-	    	<div class="span-8 last">
+	    	<div class="span-8">
 				<div id="ApiManuals"  >
-					<h2><a href="/api/">API Developer Manuals</a></h2>
-					<p>A great starting point for developers and integrators.</p>
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
 				</div>    			    		
 	    	</div>
-	    	
+			<div class="span-8 last">
+				<div id="DeveloperDocs">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
+
 	    	<hr />
 	    	
-	    	<div class="span-16 last">
+	    	<div class="span-24 last">
 	    	
 	    		<table class="manualTable">
 	    			
@@ -139,13 +144,13 @@
 			    			<div class="dropDown">
 			    				<div>
 			    				
-			    					  <li class="link"><a href="http://docs.openstack.org/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
+			    					  <li class="link"><a href="/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
+			    					  <li class="link"><a href="/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/trunk/" title="Go to the &quot;Trunk&quot; page">Trunk</a></li>
+			    					  <li class="link"><a href="/trunk/" title="Go to the &quot;Trunk&quot; page">Trunk</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
+			    					  <li class="link"><a href="/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
 			    				
 			    				</div>
 			    			</div>
@@ -194,23 +199,10 @@
 		    			onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-diablo-pdf']);"
 		    			class="roundedButton">PDF</a></td>
 		    		</tr>
+
 	    		</table>
 	    	</div>
 	 </div>
-    <div id="latest" class="span-8 last">
-	    <h3 class="subhead">Related Resources</h3>
-	    <ul>
-	    <li><h4><a href="http://api.openstack.org/">API Developer Reference</a></h4><p>Online reference for the OpenStack APIs</p></li>
-	    <li><h4><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a></h4><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></li>
-			<li><h4><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a></h4><p>Online developer documentation for OpenStack Compute (Nova)</p></li>
-			<li><h4><a href="http://horizon.openstack.org/">Dashboard Developer Documentation <span class="tag">Horizon</span></a></h4><p>Online developer documentation for OpenStack Dashboard (Horizon)</p></li>
-			<li><h4><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a></h4><p>Online developer documentation for OpenStack Object Storage (Swift)</p></li>
-			<li><h4><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a></h4><p>Online developer documentation for OpenStack Image Service (Glance)</p></li>
-			<li><h4><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a></h4><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></li>
-			<li><h4><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a></h4><p>The OpenStack developer wiki</p></li>
-		</ul>
-	    
-    </div>
     	
 </div>
 
@@ -223,7 +215,7 @@
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
 
-<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
+<script src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
 </script>
 
 
diff --git a/www/trunk/index.html b/www/trunk/index.html
index 935a699510..d3c27b8a10 100644
--- a/www/trunk/index.html
+++ b/www/trunk/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Open Source Cloud Computing Software</title>
+    <title>OpenStack Docs: Trunk</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css">    
+    <link rel="stylesheet" type="text/css" href="../common/css/docblitz.css">    
     
     <link rel="stylesheet" type="text/css" href="/shadowbox/shadowbox.css">    
     
@@ -84,24 +84,30 @@
       					  }, true);
       					</script>-->
       	      </div>
-	<div id="manuals" class="span-16">
+	<div id="manuals" class="span-24 last">
 	    	<h3 class="subhead">OpenStack Manuals</h3>
 	    	<div class="span-8">
 	    		<div id="SoftwareManuals" class="Selected" >
-		    		<h2><a href="/diablo/">Software Manuals</a></h2>
-		    		<p>A great starting point for deployers and cloud administrators. </p>
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
 	    		</div>    			    		
 	    	</div>
-	    	<div class="span-8 last">
+	    	<div class="span-8">
 				<div id="ApiManuals"  >
-					<h2><a href="/api/">API Developer Manuals</a></h2>
-					<p>A great starting point for developers and integrators.</p>
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
 				</div>    			    		
 	    	</div>
+			<div class="span-8 last">
+				<div id="DeveloperDocs">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
 	    	
 	    	<hr />
 	    	
-	    	<div class="span-16 last">
+	    	<div class="span-24 last">
 	    	
 	    		<table class="manualTable">
 	    			
@@ -112,13 +118,13 @@
 			    			<div class="dropDown">
 			    				<div>
 			    				
-			    					  <li class="link"><a href="http://docs.openstack.org/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
+			    					  <li class="link"><a href="/cactus/" title="Go to the &quot;Cactus&quot; page">Cactus</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
+			    					  <li class="link"><a href="/bexar/" title="Go to the &quot;Bexar&quot; page">Bexar</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/diablo/" title="Go to the &quot;Diablo&quot; page">Diablo</a></li>
+			    					  <li class="link"><a href="/diablo/" title="Go to the &quot;Diablo&quot; page">Diablo</a></li>
 			    					
-			    					  <li class="link"><a href="http://docs.openstack.org/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
+			    					  <li class="link"><a href="/incubation/" title="Go to the &quot;Incubation&quot; page">Incubation</a></li>
 			    				
 			    				</div>
 			    			</div>
@@ -126,28 +132,27 @@
 		    		</th>
 		    		
 		    		<tr>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/admin/content/">OpenStack Compute Administration Guide</a></td>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/admin/content/" class="roundedButton">Open</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/admin/content/">Compute Administration Guide</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/admin/content/" class="roundedButton">Browser View</a></td>
 		    		</tr>
 		    		
-		    		
 		    		<tr>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/content/">OpenStack Object Storage Administration Guide</a></td>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/content/" class="roundedButton">Open</a</td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-identity/admin/content/">Identity Service Starter Guide</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-identity/admin/content/" class="roundedButton">Browser View</a></td>
+		    		</tr>
+
+					<tr>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-image-service/admin/content/">Image Service Administration Guide</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-image-service/admin/content/" class="roundedButton">Browser View</a></td>
+		    		</tr>
+		    		
+		    		<tr>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/content/">Object Storage Administration Guide</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a</td>
 		    		</tr>
 		    		
 					<tr>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-image-service/admin/content/">OpenStack Image Service Administration Guide</a></td>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-image-service/admin/content/" class="roundedButton">Open</a></td>
-		    		</tr>
-
-					<tr>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-identity/admin/content/">OpenStack Identity Service Starter Guide</a></td>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-identity/admin/content/" class="roundedButton">Open</a></td>
-		    		</tr>
-
-					<tr>
-		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/starter/content/">OpenStack Starter Guide - Compute, Image, and Object Storage services on Ubuntu Oneiric</a></td>
+		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/starter/content/">Starter Guide - Compute, Image, and Object Storage services on Ubuntu Oneiric</a></td>
 		    			<td><a href="http://docs.openstack.org/trunk/openstack-compute/starter/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/trunk/openstack-compute/starter/openstack-starter-guide-diablo.pdf" 
 		    			onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-starter-guide-diablo-pdf']);"
 		    			class="roundedButton">PDF</a></td>
@@ -157,34 +162,9 @@
 	    		</table>
 	    	</div>
 	 </div>
-    <div id="latest" class="span-8 last">
-	    <h3 class="subhead">Related Resources</h3>
-	    <ul>
-	    <li><h4><a href="http://api.openstack.org/">API Developer Reference</a></h4><p>Online reference for the OpenStack APIs</p></li>
-	    <li><h4><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a></h4><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></li>
-			<li><h4><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a></h4><p>Online developer documentation for OpenStack Compute (Nova)</p></li>
-			<li><h4><a href="http://horizon.openstack.org/">Dashboard Developer Documentation <span class="tag">Horizon</span></a></h4><p>Online developer documentation for OpenStack Dashboard (Horizon)</p></li>
-			<li><h4><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a></h4><p>Online developer documentation for OpenStack Object Storage (Swift)</p></li>
-			<li><h4><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a></h4><p>Online developer documentation for OpenStack Image Service (Glance)</p></li>
-			<li><h4><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a></h4><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></li>
-			<li><h4><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a></h4><p>The OpenStack developer wiki</p></li>
-		</ul>
-	    
-    </div>
     	
 </div>
 
-<h1>OpenStack Related Manuals</h1>
-	    	
-	    	<div class="bookBox">
-	    			<a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-extensions/content/index.html"><img src="http://docs.openstack.org/common/images/openstack-manual.png"/></a>
-	    			<h2><a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-extensions/content/index.html">OpenStack API Extensions: An Overview</a></h2>
-	    			<ul>
-	    				<li class="adminGuide"><a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-api-extensions/content/index.html" class="roundedButton">Browser View</a></li>
-	    				<li class="devGuide"><a href="http://docs.openstack.org/trunk/openstack-compute/developer/openstack-api-extensions/apix-intro-proposal-trunk.pdf" onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-devguide-trunk-pdf']);" class="roundedButton">PDF</a></li>
-	    			</ul>
-	    		</div>
-
 <div class="container">
 	<div id="footer">
 		<hr>
@@ -240,4 +220,4 @@ $(document).ready(function(){
 
 
 </body>
-</html>
\ No newline at end of file
+</html>

API Documentation
API Developer Reference Online reference for the OpenStack APIs
OpenStack Compute Developer Guide API 2
OpenStack Project Developer Details
Compute Developer Documentation Nova Online developer documentation for OpenStack Compute (Nova)	Browser View
Dashboard Developer Documentation Horizon Online developer documentation for OpenStack Dashboard (Horizon)	Browser View
Identity Service Developer Documentation Keystone Online developer documentation for OpenStack Identity Service (Keystone)	Browser View
Image Service Developer Documentation Glance Online developer documentation for OpenStack Image Service (Glance)	Browser View
Object Storage Developer Documentation Swift Online developer documentation for OpenStack Object Storage (Swift)	Browser View
Project Wide
Project Documentation, Specifications, Draft Docs The OpenStack developer wiki	Browser View
Continuous Integration (CI) Developer Documentation Online developer documentation for the Continuous Integration systems used by OpenStack projects	Browser View
OpenStack API Extensions: An Overview	Browser View PDF
OpenStack Compute Administration Guide	Open	Compute Administration Guide	Browser View
OpenStack Object Storage Administration Guide	Open +	Identity Service Starter Guide	Browser View
Image Service Administration Guide	Browser View
Object Storage Administration Guide	Browser View
OpenStack Image Service Administration Guide	Open
OpenStack Identity Service Starter Guide	Open
OpenStack Starter Guide - Compute, Image, and Object Storage services on Ubuntu Oneiric	Starter Guide - Compute, Image, and Object Storage services on Ubuntu Oneiric	Browser View PDF