diff --git a/doc/src/docbkx/openstack-api-programming/pom.xml b/doc/src/docbkx/openstack-api-programming/pom.xml
index 5cb23c8a01..062156a5ff 100644
--- a/doc/src/docbkx/openstack-api-programming/pom.xml
+++ b/doc/src/docbkx/openstack-api-programming/pom.xml
@@ -50,7 +50,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.0.10</version>
+                <version>1.2.0</version>
                 <executions>
                     <execution>
                         <id>goal1</id>
@@ -96,7 +96,7 @@
                             <postProcess>
                                 <!-- Copies the figures to the correct location for webhelp -->
                                 
-                                <!--<copy todir="${basedir}/target/docbkx/webhelp/trunk/openstack-compute/install/content/figures">
+                                <!--<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/install/content/figures">
                                     <fileset dir="${basedir}/figures">
                                         <include name="**/*.*" />
                                     </fileset>
diff --git a/doc/src/docbkx/openstack-compute-admin/bk-compute-adminguide.xml b/doc/src/docbkx/openstack-compute-admin/bk-compute-adminguide.xml
index 0469b6f435..87f023c3ab 100644
--- a/doc/src/docbkx/openstack-compute-admin/bk-compute-adminguide.xml
+++ b/doc/src/docbkx/openstack-compute-admin/bk-compute-adminguide.xml
@@ -6,7 +6,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     version="5.0"
     xml:id="openstack-compute-admin-manual">
-    <?rax pdf.url="../bk-compute-adminguide-trunk.pdf"?>
+    <?rax pdf.url="../bk-compute-adminguide-essex.pdf"?>
     <title>OpenStack Compute Administration Manual</title>
     <info>
         <author>
@@ -24,9 +24,9 @@
             <year>2012</year>
             <holder>OpenStack LLC</holder>
         </copyright>
-        <releaseinfo>trunk</releaseinfo>
+        <releaseinfo>Essex (2012.1)</releaseinfo>
         <productname>OpenStack Compute</productname>
-        <pubdate>2012-05-01</pubdate>
+        <pubdate>2012-05-02</pubdate>
         <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the template.</remark>
@@ -43,6 +43,16 @@
                 managing, and understanding the software that runs OpenStack Compute. </para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2012-05-02</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Essex release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2012-05-01</date>
                 <revdescription>
diff --git a/doc/src/docbkx/openstack-compute-admin/pom.xml b/doc/src/docbkx/openstack-compute-admin/pom.xml
index 62fe0228b2..44c1dd251f 100644
--- a/doc/src/docbkx/openstack-compute-admin/pom.xml
+++ b/doc/src/docbkx/openstack-compute-admin/pom.xml
@@ -128,7 +128,7 @@
                                
                                 <move failonerror="false"
                                     file="${basedir}/target/docbkx/pdf/bk-compute-adminguide.pdf"
-                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/admin/bk-compute-adminguide-trunk.pdf"/>                
+                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/admin/bk-compute-adminguide-${release.path.name}.pdf"/>                
                                                        
                                 <!--Deletes leftover uneeded directories -->
                                 
diff --git a/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml b/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
index b093814f96..695479c755 100644
--- a/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
+++ b/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
@@ -7,7 +7,7 @@
     version="5.0"
     status="draft"
     xml:id="openstack-compute-admin-manual">
-    <?rax pdf.url="../openstack-install-guide-trunk.pdf"?>
+    <?rax pdf.url="../openstack-install-guide-essex.pdf"?>
     <title>OpenStack Install and Deploy Manual</title>
     <info>
         <author>
@@ -23,9 +23,9 @@
             <year>2012</year>
             <holder>OpenStack LLC</holder>
         </copyright>
-        <releaseinfo>trunk</releaseinfo>
+        <releaseinfo>Essex</releaseinfo>
         <productname>OpenStack</productname>
-        <pubdate>2012-05-01</pubdate>
+        <pubdate>2012-05-02</pubdate>
         <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the template.</remark>
@@ -45,6 +45,16 @@
                 files. </para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2012-05-02</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Essex release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2012-05-01</date>
                 <revdescription>
diff --git a/doc/src/docbkx/openstack-install/pom.xml b/doc/src/docbkx/openstack-install/pom.xml
index 3cd7c66e4e..229f0370bc 100644
--- a/doc/src/docbkx/openstack-install/pom.xml
+++ b/doc/src/docbkx/openstack-install/pom.xml
@@ -122,7 +122,7 @@
                                
                                 <move failonerror="false"
                                     file="${basedir}/target/docbkx/pdf/bk_openstackinstallguide.pdf"
-                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/install/openstack-install-guide-trunk.pdf"/>                
+                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/install/openstack-install-guide-${release.path.name}.pdf"/>                
                                                        
                                 <!--Deletes leftover uneeded directories -->
                                
diff --git a/doc/src/docbkx/openstack-object-storage-admin/bk-objectstorage-adminguide.xml b/doc/src/docbkx/openstack-object-storage-admin/bk-objectstorage-adminguide.xml
index 43452b1b4b..0da0436f4a 100644
--- a/doc/src/docbkx/openstack-object-storage-admin/bk-objectstorage-adminguide.xml
+++ b/doc/src/docbkx/openstack-object-storage-admin/bk-objectstorage-adminguide.xml
@@ -6,7 +6,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     version="5.0"
     xml:id="openstack-object-storage-admin-manual">
-    <?rax pdf.url="../os-objectstorage-adminguide-trunk.pdf"?>
+    <?rax pdf.url="../os-objectstorage-adminguide-essex.pdf"?>
     <title>OpenStack Object Storage Admin Manual</title>
     <info>
         <author>
@@ -24,9 +24,9 @@
             <year>2012</year>
             <holder>OpenStack LLC</holder>
         </copyright>
-        <releaseinfo>trunk</releaseinfo>
+        <releaseinfo>Essex (1.4.8)</releaseinfo>
         <productname>OpenStack Object Storage</productname>
-        <pubdate>2012-05-01</pubdate>
+        <pubdate>2012-05-02</pubdate>
         <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the template.</remark>
@@ -37,6 +37,38 @@
                 storage for any organization. This manual provides guidance for installing,
                 managing, and understanding the software that runs OpenStack Object Storage. </para>
         </abstract>
+        <revhistory>
+            <revision>
+                <date>2012-05-02</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Essex release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+            <revision>
+                <date>2012-04-27</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Adds ring copy example.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+            <revision>
+                <date>2012-01-01</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Formatting updates.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+        </revhistory>
     </info>
     <!-- Chapters are referred from the book file through these include statements. You can add additional chapters using these types of statements. -->
     <xi:include href="../common/getstart.xml"/>
diff --git a/doc/src/docbkx/openstack-object-storage-admin/pom.xml b/doc/src/docbkx/openstack-object-storage-admin/pom.xml
index 2639dc5778..c6c15c7f69 100644
--- a/doc/src/docbkx/openstack-object-storage-admin/pom.xml
+++ b/doc/src/docbkx/openstack-object-storage-admin/pom.xml
@@ -123,7 +123,7 @@
                                
                                 <move failonerror="false"
                                     file="${basedir}/target/docbkx/pdf/bk-objectstorage-adminguide.pdf"
-                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-object-storage/admin/bk-objectstorage-adminguide-trunk.pdf"/>                
+                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-object-storage/admin/bk-objectstorage-adminguide-${release.path.name}.pdf"/>                
                                                        
                                 <!--Deletes leftover uneeded directories -->
                                 
diff --git a/www/api/index.html b/www/api/index.html
index 5be8d0bd80..847304e12b 100644
--- a/www/api/index.html
+++ b/www/api/index.html
@@ -151,7 +151,7 @@
           <div id="DeveloperDocs">
             <h2><a href="/developer/">Developer Documentation</a></h2>
             
-            <p>Details about OpenStack internals for python developers and
+            <p>Details about OpenStack internals for Python developers and
               advanced users.</p>
           </div>
         </div>
@@ -219,6 +219,14 @@
                 class="roundedButton">Read &raquo;</a></td>
             </tr>
             
+            <tr>
+              <td><a href="http://docs.openstack.org/api/openstack-network/1.0/content/">OpenStack Network Connectivity
+                Developer Guide (Quantum) API 1.0</a></td>
+              
+              <td><a href="http://docs.openstack.org/api/openstack-network/1.0/content/" class=
+                "roundedButton">Read &raquo;</a></td>
+            </tr>
+            
             <tr>
               <td><a href=
                 "/api/openstack-identity-service/2.0/content/">OpenStack Identity
diff --git a/www/essex/index.html b/www/essex/index.html
index 9c5a85e036..ca687954ca 100644
--- a/www/essex/index.html
+++ b/www/essex/index.html
@@ -170,9 +170,11 @@
 									<div class="dropDown">
 										<div>
 											<ul>
+												<li class="link"><a href="/trunk/" title=
+													"Go to the &quot;Essex&quot; page">trunk</a></li>
 												
-												<li class="link"><a href="/diablo/" title=
-													"Go to the &quot;Diablo&quot; page">Diablo</a></li>
+												<li class="link"><a href="/essex/" title=
+													"Go to the &quot;Essex&quot; page">Essex</a></li>
 												
 												<li class="link"><a href="/incubation/" title=
 													"Go to the &quot;Incubation&quot; page">Incubation</a></li>
@@ -185,11 +187,11 @@
 						
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/admin/content/">OpenStack
+								"http://docs.openstack.org/essex/openstack-compute/admin/content/">OpenStack
 								Compute Administration Guide</a></td>
 							
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/admin/content/"
+								"http://docs.openstack.org/essex/openstack-compute/admin/content/"
 								class="roundedButton">Read &raquo;</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']);"
@@ -198,11 +200,11 @@
 						
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-object-storage/admin/content/">
+								"http://docs.openstack.org/essex/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/"
+								"http://docs.openstack.org/essex/openstack-object-storage/admin/content/"
 								class="roundedButton">Read &raquo;</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']);"
@@ -211,12 +213,12 @@
 											
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/install/content/">
+								"http://docs.openstack.org/essex/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/"
+								"http://docs.openstack.org/essex/openstack-compute/install/content/"
 								class="roundedButton">Read &raquo;</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']);"
diff --git a/www/incubation/index.html b/www/incubation/index.html
index bb0da13c04..8247eba3fd 100644
--- a/www/incubation/index.html
+++ b/www/incubation/index.html
@@ -117,30 +117,13 @@
 	    		<p class="instructions">1. Pick a release.</p>
 	    		<ul>
 	    			<li class="fadeBlue"><a href="/">Diablo</a></li>
-	    			<li class="fadeBlue"><a href="/cactus" >Cactus</a></li>
-	    			<li class="fadeBlue"><a href="/bexar/">Bexar</a></li>
 	    			<li class="fadeBlue"><a href="/trunk/">Trunk</a></li>
 	    			<li class="fadeBlue"><a href="/incubation/"  class="selected">Incubation</a></li>
 	    		</ul>
 	    	</div>
 	    	<div class="span-10 last leftBorder">
-	    		<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="/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>
-	    				<li class="devGuide"><a href="http://docs.openstack.org/incubation/openstack-network/developer/quantum-api-1.0/quantum-api-guide-trunk.pdf" onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-quantum-api-guide-trunk']);" class="roundedButton">PDF</a></li>
-	    			</ul>
-	    		</div>
-	    		<div class="bookBox">
-	    			<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>
-	    				<li class="devGuide"><a href="http://docs.openstack.org/incubation/openstack-network/admin/quantum-admin-guide-trunk.pdf" onClick="javascript: _gaq.push(['_trackPageview', '/downloads/openstack-quantum-admin-guide-trunk']);" class="roundedButton">PDF</a></li>
-	    			</ul>
+	    		<p class="instructions">2. Currently no projects are in incubation.</p>
+	    		
 	    		</div>
 	    	</div>
 	 </div>
diff --git a/www/index.html b/www/index.html
index d880cfb3d7..a565b3eb01 100644
--- a/www/index.html
+++ b/www/index.html
@@ -45,7 +45,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">
@@ -161,7 +161,7 @@
 				<div class="span-24 last">
 					<table class="manualTable">
 						<tr>
-							<th>Release: <strong>Essex</strong></th>
+							<th>Release: <strong>current</strong></th>
 							
 							<th>
 								<div class="dropDownTrigger">
@@ -170,6 +170,8 @@
 									<div class="dropDown">
 										<div>
 											<ul>
+												<li class="link"><a href="/essex/" title=
+													"Go to the &quot;Essex&quot; page">Essex</a></li>
 												
 												<li class="link"><a href="/diablo/" title=
 													"Go to the &quot;Diablo&quot; page">Diablo</a></li>
@@ -185,34 +187,34 @@
 						
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/admin/content/">OpenStack
+								"http://docs.openstack.org/essex/openstack-compute/admin/content/">OpenStack
 								Compute Administration Guide</a></td>
 							
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/admin/content/"
+								"http://docs.openstack.org/essex/openstack-compute/admin/content/"
 								class="roundedButton">Read &raquo;</a> 
 								</td>
 						</tr>
 						
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-object-storage/admin/content/">
+								"http://docs.openstack.org/essex/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/"
+								"http://docs.openstack.org/essex/openstack-object-storage/admin/content/"
 								class="roundedButton">Read &raquo;</a> 
 								</td>
 						</tr>
 											
 						<tr>
 							<td><a href=
-								"http://docs.openstack.org/trunk/openstack-compute/install/content/">
+								"http://docs.openstack.org/essex/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/"
+								"http://docs.openstack.org/essex/openstack-compute/install/content/"
 								class="roundedButton">Read &raquo;</a> 
 								</td>
 						</tr>