diff --git a/www/developer/index.html b/www/developer/index.html
index d07bb71e16..395d967f7a 100644
--- a/www/developer/index.html
+++ b/www/developer/index.html
@@ -61,6 +61,7 @@
<!-- Page Content -->
<div class="container">
<div class="searchArea span-16 prepend-4">
+ <h1>Search All OpenStack Manuals</h1>
<div id="cse" style="width: 100%;">Loading</div>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">
diff --git a/www/diablo/index.html b/www/diablo/index.html
index b9b603b040..afa018366a 100644
--- a/www/diablo/index.html
+++ b/www/diablo/index.html
@@ -42,7 +42,7 @@
<div class="container">
<div id="header">
<div class="span-5">
- <h1 id="logo"><a href="http://www.openstack.org/">Open Stack</a></h1>
+ <h1 id="logo"><a href="http://www.openstack.org/">OpenStack</a></h1>
</div>
<div class="span-19 last">
@@ -157,30 +157,30 @@
<tr>
<td><a href="http://docs.openstack.org/diablo/openstack-compute/admin/content/">OpenStack Compute Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/admin/os-compute-adminguide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
+ <td><a href="http://docs.openstack.org/diablo/openstack-compute/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/admin/os-compute-adminguide-diablo.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-diablo-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
<td><a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/content/">OpenStack Object Storage Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-trunk-pdf']);"
+ <td><a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/os-objectstorage-adminguide-diablo.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-diablo-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
<td><a href="http://docs.openstack.org/diablo/openstack-image-service/admin/content/">OpenStack Image Service Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-image-service/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-image-service/admin/os-image-adminguide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-image-adminguide-trunk-pdf']);"
+ <td><a href="http://docs.openstack.org/diablo/openstack-image-service/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-image-service/admin/os-image-adminguide-diablo.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-image-adminguide-diablo-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
<td><a href="http://docs.openstack.org/diablo/openstack-identity/admin/content/">OpenStack Identity Service Starter Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-identity/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-identity/admin/os-identity-starter-guide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-identity-starter-guide-trunk-pdf']);"
+ <td><a href="http://docs.openstack.org/diablo/openstack-identity/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-identity/admin/os-identity-starter-guide-diablo.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-identity-starter-guide-diablo-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
diff --git a/www/index.html b/www/index.html
index a040a5e663..543731ad15 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 Docs: Diablo</title>
+ <title>OpenStack Docs</title>
<!-- Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -42,7 +42,7 @@
<div class="container">
<div id="header">
<div class="span-5">
- <h1 id="logo"><a href="http://www.openstack.org/">Open Stack</a></h1>
+ <h1 id="logo"><a href="http://www.openstack.org/">OpenStack</a></h1>
</div>
<div class="span-19 last">
@@ -137,15 +137,17 @@
<table class="manualTable">
- <th>Release: <strong>Diablo</strong></th>
+ <th>Release: <strong>Current</strong></th>
<th>
<div class="dropDownTrigger">
<a href="#">Other Releases...</a>
<div class="dropDown">
<div>
-
+ <li class="link"><a href="/diablo/" title="Go to the "Diablo" page">Diablo</a></li>
+
<li class="link"><a href="/cactus/" title="Go to the "Cactus" page">Cactus</a></li>
+
<li class="link"><a href="/bexar/" title="Go to the "Bexar" page">Bexar</a></li>
<li class="link"><a href="/trunk/" title="Go to the "Trunk" page">Trunk</a></li>
@@ -158,45 +160,34 @@
</th>
<tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/admin/content/">OpenStack Compute Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/admin/os-compute-adminguide-trunk.pdf"
+ <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">Browser View</a>
+ <a href="http://docs.openstack.org/trunk/openstack-compute/admin/os-compute-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-compute-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/content/">OpenStack Object Storage Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
+ <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">Browser View</a>
+ <a href="http://docs.openstack.org/trunk/openstack-object-storage/admin/os-objectstorage-adminguide-trunk.pdf"
onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-objectstorage-adminguide-trunk-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-image-service/admin/content/">OpenStack Image Service Administration Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-image-service/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-image-service/admin/os-image-adminguide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-image-adminguide-trunk-pdf']);"
- class="roundedButton">PDF</a></td>
- </tr>
-
- <tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-identity/admin/content/">OpenStack Identity Service Starter Guide</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-identity/admin/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-identity/admin/os-identity-starter-guide-trunk.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/os-identity-starter-guide-trunk-pdf']);"
- class="roundedButton">PDF</a></td>
- </tr>
-
- <tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/">OpenStack Starter Guide - Compute, Image, and Object Storage services</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/starter/openstack-starter-guide-diablo.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-starter-guide-diablo-pdf']);"
+ <td><a href="http://docs.openstack.org/trunk/openstack-compute/starter/content/">OpenStack Starter Guide - Compute, Image, and Object Storage services</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-trunk.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-starter-guide-trunk-pdf']);"
class="roundedButton">PDF</a></td>
</tr>
<tr>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/install/content/">OpenStack Install and Deploy Guide - Compute, Image, and Identity services plus Dashboard</a></td>
- <td><a href="http://docs.openstack.org/diablo/openstack-compute/install/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/install/openstack-install-guide-diablo.pdf"
- onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-diablo-pdf']);"
+ <td><a href="http://docs.openstack.org/trunk/openstack-compute/install/content/">OpenStack Install and Deploy Guide - Compute, Image, and Identity services plus Dashboard</a></td>
+ <td><a href="http://docs.openstack.org/trunk/openstack-compute/install/content/" class="roundedButton">Browser View</a> <a href="http://docs.openstack.org/diablo/openstack-compute/install/openstack-install-guide-diablo.pdf"
+ onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-install-guide-trunk-pdf']);"
class="roundedButton">PDF</a></td>
</tr>