diff --git a/doc/src/docbkx/openstack-block-storage-admin/bk-block-storage-adminguide.xml b/doc/src/docbkx/openstack-block-storage-admin/bk-block-storage-adminguide.xml
index dea3971217..2bd262631f 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/bk-block-storage-adminguide.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/bk-block-storage-adminguide.xml
@@ -3,11 +3,9 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="bk_block-storage-grizzly">
-    <title>OpenStack Block Storage Service Administration
-        Guide</title>
-    <?rax title.font.size="32px"?>
-    <titleabbrev>OpenStack Block Storage Service Administration
-        Guide</titleabbrev>
+    <title>OpenStack Block Storage Service Administration Guide</title>
+    <?rax title.font.size="28px" subtitle.font.size="28px"?>
+    <titleabbrev>OpenStack Block Storage Service Administration Guide</titleabbrev>
     <info>
         <author>
             <personname>
@@ -25,6 +23,7 @@
         </copyright>
         <releaseinfo>Grizzly, 2013.1</releaseinfo>
         <productname>OpenStack Block Storage Service</productname>
+        <releaseinfo>Grizzly, 2013.1</releaseinfo>
         <pubdate/>
         <legalnotice role="apache2">
             <annotation>
diff --git a/doc/src/docbkx/openstack-block-storage-admin/drivers/emc-volume-driver.xml b/doc/src/docbkx/openstack-block-storage-admin/drivers/emc-volume-driver.xml
index 7f7ac7f2da..79e41dbd6e 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/drivers/emc-volume-driver.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/drivers/emc-volume-driver.xml
@@ -4,12 +4,13 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     version="5.0">
     <title>EMC SMI-S iSCSI Driver</title>
-    <para>The EMCSMISISCSIDriver is based on the existing ISCSIDriver,
-        with the ability to create/delete and attach/detach volumes and
-        create/delete snapshots, etc.</para>
-    <para>The EMCSMISISCSIDriver executes the volume operations by
-        communicating with the backend EMC storage. It uses a CIM client
-        in python called PyWBEM to make CIM operations over HTTP.</para>
+    <para>The EMCISCSIDriver is based on the existing ISCSIDriver,
+        with the ability to create/delete and attach/detach volumes
+        and create/delete snapshots, and so on.</para>
+    <para>The EMCISCSIDriver executes the volume operations by
+        communicating with the backend EMC storage. It uses a CIM
+        client in python called PyWBEM to make CIM operations over
+        HTTP.</para>
     <para>The EMC CIM Object Manager (ECOM) is packaged with the EMC SMI-S
         Provider. It is a CIM server that allows CIM clients to make CIM
         operations over HTTP, using SMI-S in the backend for EMC storage
@@ -17,15 +18,15 @@
     <para>The EMC SMI-S Provider supports the SNIA Storage Management
         Initiative (SMI), an ANSI standard for storage management. It
         supports VMAX and VNX storage systems.</para>
-    <simplesect>
-        <title>Requirements</title>
+    <section xml:id="emc-reqs">
+        <title>System Requirements</title>
         <para>EMC SMI-S Provider V4.5.1 and higher is required. SMI-S
             can be downloaded from <link xlink:href="http://powerlink.emc.com">
                 EMC's Powerlink</link> web site. Refer to the EMC SMI-S Provider
             release notes for installation instructions.</para>
         <para>EMC storage VMAX Family and VNX Series are supported.</para>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="emc-supported-ops">
         <title>Supported Operations</title>
         <para>The following operations will be supported on both VMAX
             and VNX arrays:</para>
@@ -45,8 +46,8 @@
             <listitem><para>Create volume from snapshot</para></listitem>
         </itemizedlist>
         <para>Only thin provisioning is supported.</para>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="emc-prep">
         <title>Preparation</title>
         <itemizedlist>
             <listitem><para>Install python-pywbem package.  For example:</para>
@@ -58,8 +59,8 @@
             <listitem><para>Register with VNX.</para></listitem>
             <listitem><para>Create Masking View on VMAX.</para></listitem>
         </itemizedlist>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="register-emc">
         <title>Register with VNX</title>
         <para>For a VNX volume to be exported to a Compute node, the node needs
             to be registered with VNX first.</para>
@@ -86,10 +87,14 @@
             <screen>
 <prompt>$</prompt> <userinput>sudo iscsiadm -m node -T <literal>iqn.1992-04.com.emc:cx.apm01234567890.a0</literal> -p <literal>10.10.61.35</literal> -l</userinput>
                         </screen></para>
-        <para>
-            Assume <literal>iqn.1993-08.org.debian:01:1a2b3c4d5f6g</literal> is the initiator name of the Compute node.
-            Login to Unisphere, go to <literal>VNX00000</literal>->Hosts->Initiators, Refresh and wait until initiator
-            <literal>iqn.1993-08.org.debian:01:1a2b3c4d5f6g</literal> with SP Port <literal>A-8v0</literal> appears.</para>
+        <para>Assume
+                <literal>iqn.1993-08.org.debian:01:1a2b3c4d5f6g</literal>
+            is the initiator name of the Compute node. Login to
+            Unisphere, go to
+            <literal>VNX00000</literal>->Hosts->Initiators, Refresh
+            and wait until initiator
+                <literal>iqn.1993-08.org.debian:01:1a2b3c4d5f6g</literal>
+            with SP Port <literal>A-8v0</literal> appears.</para>
         <para>Click the "Register" button, select "CLARiiON/VNX" and enter the host name <literal>myhost1</literal>
             and IP address <literal>myhost1</literal>.  Click Register. Now host <literal>1.1.1.1</literal> will appear
             under Hosts->Host List as well.</para>
@@ -106,15 +111,15 @@
         <screen>
 <prompt>$</prompt> <userinput>sudo iscsiadm -m node -u</userinput>
                         </screen>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="create-masking">
         <title>Create Masking View on VMAX</title>
         <para>For VMAX, user needs to do initial setup on the Unisphere for VMAX server first. On the Unisphere for VMAX server,
             create initiator group, storage group, port group, and put them in a masking view.
             Initiator group contains the initiator names of the openstack hosts. Storage group
             should have at least 6 gatekeepers.</para>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="emc-config-file">
         <title>Config file <filename>cinder.conf</filename></title>
         <para>Make the following changes in <filename>/etc/cinder/cinder.conf</filename>.</para>
         <para>For VMAX, we have the following entries where <literal>10.10.61.45</literal> is the IP address of the
@@ -134,8 +139,8 @@ volume_driver = cinder.volume.emc.EMCISCSIDriver
 cinder_emc_config_file = /etc/cinder/cinder_emc_config.xml
                          </programlisting>
         <para>Restart the cinder-volume service.</para>
-    </simplesect>
-    <simplesect>
+    </section>
+    <section xml:id="emc-config-file-2">
         <title>Config file <filename>cinder_emc_config.xml</filename></title>
         <para>Create the file <filename>/etc/cinder/cinder_emc_config.xml</filename>.
             We don't need to restart service for this change.</para>
@@ -172,5 +177,5 @@ cinder_emc_config_file = /etc/cinder/cinder_emc_config.xml
         <para>EcomServerIp and EcomServerPort are the IP address and port number of the
             ECOM server which is packaged with SMI-S. EcomUserName and EcomPassword are
             credentials for the ECOM server.</para>
-    </simplesect>
+    </section>
 </section>
diff --git a/doc/src/docbkx/openstack-block-storage-admin/pom.xml b/doc/src/docbkx/openstack-block-storage-admin/pom.xml
index 6f64058a27..a30084db1c 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/pom.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/pom.xml
@@ -2,15 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.openstack.docs</groupId>
     <artifactId>openstack-guide</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack Guides</name>
-
+    <name>OpenStack Administration Guides</name>
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
         <release.path.name>local</release.path.name>
@@ -41,10 +38,8 @@
             </pluginRepositories>
         </profile>
     </profiles>
-
     <build>
         <plugins>
-
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
@@ -60,6 +55,7 @@
                             <highlightSource>false</highlightSource>
                             <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
                             <sectionAutolabel>0</sectionAutolabel>
+                            <tocSectionDepth>1</tocSectionDepth>
                             <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
                         </configuration>
                     </execution>
@@ -90,16 +86,14 @@
                             </generateToc>
                             <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
                             <sectionAutolabel>0</sectionAutolabel>
+                            <tocSectionDepth>1</tocSectionDepth>
                             <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
                             <targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-block-storage</targetDirectory>
                             <webhelpDirname>admin</webhelpDirname>
                             <pdfFilenameBase>bk-block-storage-adminguide-${release.path.name}</pdfFilenameBase>
                             <postProcess>
-
                                 <!--Deletes leftover uneeded directories -->
-
                                 <!--<delete dir="${basedir}/target/docbkx/webhelp/bk-block-storage-adminguide"/>-->
-
                             </postProcess>
                         </configuration>
                     </execution>
@@ -111,14 +105,12 @@
                     <includes>
                         bk-block-storage-adminguide.xml
                     </includes>
-
                     <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/openstack-block-storage/admin/content/</canonicalUrlBase>
                     <profileSecurity>reviewer</profileSecurity>
                     <branding>openstack</branding>
                     <strictImageValidation>false</strictImageValidation>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>
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 80aaaaebdb..4b67de003a 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,9 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     version="5.0"
     xml:id="openstack-compute-admin-manual-grizzly">
-    <title>OpenStack Compute Administration Manual</title>
+    <title>OpenStack Compute Administration Guide</title>
+    <?rax title.font.size="28px" subtitle.font.size="28px"?>
+    <titleabbrev>OpenStack Compute Administration Guide</titleabbrev>
     <info>
         <author>
             <personname>
@@ -14,7 +16,7 @@
                 <surname/>
             </personname>
             <affiliation>
-                <orgname>OpenStack</orgname>
+                <orgname>OpenStack Foundation</orgname>
             </affiliation>
         </author>
         <copyright>
@@ -26,7 +28,7 @@
         </copyright>
         <releaseinfo>Grizzly, 2013.1</releaseinfo>
         <productname>OpenStack Compute</productname>
-        <pubdate>2013-04-30</pubdate>
+        <pubdate></pubdate>
         <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the template.</remark>
@@ -44,6 +46,16 @@
         </abstract>
         <revhistory>
             <!-- ... continue adding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-05-09</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Updated the book title for consistency.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-04-30</date>
                 <revdescription>
@@ -212,6 +224,7 @@
         </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="preface.xml"/>
     <xi:include href="../common/getstart.xml"/>
     <xi:include href="aboutcompute.xml"/>
     <xi:include href="computeinstall.xml"/>
diff --git a/doc/src/docbkx/openstack-compute-admin/pom.xml b/doc/src/docbkx/openstack-compute-admin/pom.xml
index aadb28ca07..85a373df1f 100644
--- a/doc/src/docbkx/openstack-compute-admin/pom.xml
+++ b/doc/src/docbkx/openstack-compute-admin/pom.xml
@@ -9,7 +9,7 @@
     <artifactId>openstack-guide</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack Guides</name>
+    <name>OpenStack Administration Guides</name>
     
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
@@ -26,7 +26,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.7.2</version>
+                <version>1.8.0</version>
                 <executions>
                     <execution>
                         <id>generate-webhelp</id>
@@ -46,6 +46,7 @@
                                 article   toc,title
                                 book      title,figure,table,example,equation
                                 chapter   toc,title
+                                section   toc
                                 part      toc,title
                                 preface   toc,title
                                 qandadiv  toc
@@ -55,6 +56,7 @@
                             </generateToc>
                             <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
                             <sectionAutolabel>0</sectionAutolabel>
+                            <tocSectionDepth>1</tocSectionDepth>
                             <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
                             <targetDirectory>target/docbkx/webhelp/${release.path.name}/openstack-compute</targetDirectory>
                             <webhelpDirname>admin</webhelpDirname>
diff --git a/doc/src/docbkx/openstack-compute-admin/preface.xml b/doc/src/docbkx/openstack-compute-admin/preface.xml
new file mode 100644
index 0000000000..e93f1ab07c
--- /dev/null
+++ b/doc/src/docbkx/openstack-compute-admin/preface.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preface xmlns="http://docbook.org/ns/docbook"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+    xml:id="ch_preface">
+    <title>Preface</title>
+    <para>OpenStack™ Compute offers open source software for cloud
+        administration and management for any organization. This
+        manual provides guidance for installing, managing, and
+        understanding the software that runs OpenStack Compute. </para>
+    <section xml:id="Document_Change_History-d1e118">
+        <title>Document Change History</title>
+        <para>The most recent changes are described in the table
+            below:</para>
+        <?rax revhistory?>
+    </section>
+</preface>
diff --git a/doc/src/docbkx/openstack-ha/ha-guide-docinfo.xml b/doc/src/docbkx/openstack-ha/ha-guide-docinfo.xml
index 8d2f5d20b8..8cb0099e1f 100644
--- a/doc/src/docbkx/openstack-ha/ha-guide-docinfo.xml
+++ b/doc/src/docbkx/openstack-ha/ha-guide-docinfo.xml
@@ -14,7 +14,7 @@
             <holder>OpenStack Contributors</holder>
         </copyright>
         <releaseinfo>trunk</releaseinfo>
-        <productname>OpenStack</productname>
+        <productname>OpenStack Foundation</productname>
         <pubdate>2012-01-16</pubdate>
         <legalnotice role="apache2">
             <annotation>
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/bk-networking-admin-guide.xml b/doc/src/docbkx/openstack-network-connectivity-admin/bk-networking-admin-guide.xml
index 795abeb5f2..3c970dedf8 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/bk-networking-admin-guide.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/bk-networking-admin-guide.xml
@@ -16,6 +16,8 @@
     xmlns:db="http://docbook.org/ns/docbook" version="5.0"
     status="final" xml:id="Quantum-admin-guide-grizzly">
     <title>OpenStack Networking Administration Guide</title>
+    <?rax title.font.size="28px" subtitle.font.size="28px"?>
+    <titleabbrev>OpenStack Networking Administration Guide</titleabbrev>
     <info>
         <author>
             <personname>
@@ -39,13 +41,22 @@
             </annotation>
         </legalnotice>
         <abstract>
-            <para>This document is intended for administrators
-                interested in running the OpenStack Networking Virtual
-                Network Service. </para>
+            <para>This document is for administrators
+                interested in running the OpenStack Networking Service. </para>
         </abstract>
 
         <revhistory>
             <!-- ... continue adding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-05-09</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Updated the book title for consistency.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-04-30</date>
                 <revdescription>
@@ -112,8 +123,6 @@
                     </itemizedlist>
                 </revdescription>
             </revision>
-
-
         </revhistory>
     </info>
     <xi:include href="ch_preface.xml"/>
@@ -130,6 +139,4 @@
     <xi:include href="app_demo.xml"/>
     <xi:include href="app_core.xml"/>
     <xi:include href="app_pagination_and_sorting_support.xml"/>
-
-
 </book>
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/pom.xml b/doc/src/docbkx/openstack-network-connectivity-admin/pom.xml
index cc47f720db..ff74061d64 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/pom.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/pom.xml
@@ -9,7 +9,7 @@
     <artifactId>openstack-guide</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack Guides</name>
+    <name>OpenStack Administration Guides</name>
 
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
@@ -27,7 +27,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.7.2</version>
+                <version>1.8.0</version>
                 <executions>
                     <execution>
                         <id>networking-admin-webhelp</id>
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 109ea14bc0..dfe4d0d4f6 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
@@ -3,10 +3,12 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:svg="http://www.w3.org/2000/svg"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    version="5.0"
+    xmlns:html="http://www.w3.org/1999/xhtml" version="5.0"
     xml:id="openstack-object-storage-admin-manual-grizzly">
-    <title>OpenStack Object Storage Administration Manual</title>
+    <title>OpenStack Object Storage Administration Guide</title>
+    <?rax title.font.size="28px" subtitle.font.size="28px"?>
+    <titleabbrev>OpenStack Object Storage Administration
+        Guide</titleabbrev>
     <info>
         <author>
             <personname>
@@ -14,7 +16,7 @@
                 <surname/>
             </personname>
             <affiliation>
-                <orgname>OpenStack</orgname>
+                <orgname>OpenStack Foundation</orgname>
             </affiliation>
         </author>
         <copyright>
@@ -24,24 +26,35 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>trunk</releaseinfo>
+        <releaseinfo>Grizzly, 2013.1 with Object Storage 1.8.0</releaseinfo>
         <productname>OpenStack Object Storage</productname>
-        <pubdate>2013-04-30</pubdate>
+        <pubdate/>
         <legalnotice role="apache2">
             <annotation>
-                <remark>Copyright details are filled in by the template.</remark>
+                <remark>Copyright details are filled in by the
+                    template.</remark>
             </annotation>
         </legalnotice>
         <abstract>
-            <para>OpenStack™ Object Storage offers open source software for cloud-based object
-                storage for any organization. This manual provides guidance for installing,
-                managing, and understanding the software that runs OpenStack Object Storage. </para>
+            <para>OpenStack™ Object Storage offers open source
+                software for cloud-based object storage for any
+                organization. This manual provides guidance for
+                installing, managing, and understanding the software
+                that runs OpenStack Object Storage. </para>
         </abstract>
         <revhistory>
             <!-- ... continue adding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-05-09</date>
+                <revdescription>
+                    <para>Updated the book title for
+                        consistency.</para>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-04-30</date>
-                <revdescription><para>Grizzly release.</para>
+                <revdescription>
+                    <para>Grizzly release.</para>
                 </revdescription>
             </revision>
             <revision>
@@ -49,9 +62,14 @@
                 <revdescription>
                     <itemizedlist spacing="compact">
                         <listitem>
-                            <para>Bug fixes and cleanup. Fix <link xlink:href="https://code.launchpad.net/bugs/1034144">bug 1034144</link></para>
-                            <para>Add section about cluster health.</para>
-                            <para>Add a note about the apt-get install for swift3 from Ubuntu Cloud Archive.</para>
+                            <para>Bug fixes and cleanup. Fix <link
+                                   xlink:href="https://code.launchpad.net/bugs/1034144"
+                                   >bug 1034144</link></para>
+                            <para>Add section about cluster
+                                health.</para>
+                            <para>Add a note about the apt-get install
+                                for swift3 from Ubuntu Cloud
+                                Archive.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -61,7 +79,8 @@
                 <revdescription>
                     <itemizedlist spacing="compact">
                         <listitem>
-                            <para>Folsom release of this document.</para>
+                            <para>Folsom release of this
+                                document.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -89,7 +108,9 @@
                 <revdescription>
                     <itemizedlist spacing="compact">
                         <listitem>
-                            <para>Fix <link xlink:href="https://bugs.launchpad.net/openstack-manuals/+bug/1009170">bug 1009170</link>.</para>
+                            <para>Fix <link
+                                   xlink:href="https://bugs.launchpad.net/openstack-manuals/+bug/1009170"
+                                   >bug 1009170</link>.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -139,7 +160,8 @@
     <!-- 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"/>
     <xi:include href="aboutobjectstorage.xml"/>
-    <xi:include href="../openstack-install/ch_installobjectstorage.xml"/>
+    <xi:include
+        href="../openstack-install/ch_installobjectstorage.xml"/>
     <xi:include href="objectstorageadmin.xml"/>
     <xi:include href="objectstoragetutorials.xml"/>
     <xi:include href="objectstoragemonitoring.xml"/>
diff --git a/doc/src/docbkx/openstack-object-storage-admin/pom.xml b/doc/src/docbkx/openstack-object-storage-admin/pom.xml
index a6225e59ce..75e29c1dc2 100644
--- a/doc/src/docbkx/openstack-object-storage-admin/pom.xml
+++ b/doc/src/docbkx/openstack-object-storage-admin/pom.xml
@@ -2,30 +2,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>org.openstack.docs</groupId>
     <artifactId>openstack-guide</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack Guides</name>
+    <name>OpenStack Administration Guides</name>
 
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
-        <release.path.name>unknown</release.path.name>
+        <release.path.name>local</release.path.name>
         <comments.enabled>1</comments.enabled>
     </properties>
     <!-- ################################################ -->
     <!-- USE "mvn clean generate-sources" to run this POM -->
-    <!-- ################################################ -->    
+    <!-- ################################################ -->
     <build>
         <plugins>
-            
+
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.7.2</version>
+                <version>1.8.0</version>
                 <executions>
                     <execution>
                         <id>generate-webhelp</id>
@@ -39,28 +39,26 @@
                             <disqusShortname>openstackdocs</disqusShortname>
                             <enableGoogleAnalytics>1</enableGoogleAnalytics>
                             <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
-                            <generateToc>
-                                appendix  toc,title
-                                article/appendix  nop
-                                article   toc,title
-                                book      title,figure,table,example,equation
-                                chapter   toc,title
-                                part      toc,title
-                                preface   toc,title
-                                qandadiv  toc
-                                qandaset  toc
+                            <generateToc> appendix toc,title
+                                article/appendix nop 
+                                article toc,title
+                                book title,figure,table,example,equation
+                                chapter toc,title 
+                                section toc part
+                                toc,title 
+                                preface toc,title 
+                                qandadiv toc 
+                                qandaset toc 
                                 reference toc,title
-                                set       toc,title
-                            </generateToc>
+                                set toc,title </generateToc>
                             <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
                             <sectionAutolabel>0</sectionAutolabel>
+                            <tocDepthSection>1</tocDepthSection>
                             <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
-
-			    <webhelpDirname>admin</webhelpDirname>
-			    <targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-object-storage</targetDirectory>
-			    <includeDateInPdfFilename>0</includeDateInPdfFilename>
-			    <pdfFilenameBase>os-objectstorage-adminguide-${release.path.name}</pdfFilenameBase>
-
+                            <webhelpDirname>admin</webhelpDirname>
+                            <targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-object-storage</targetDirectory>
+                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
+                            <pdfFilenameBase>os-objectstorage-adminguide-${release.path.name}</pdfFilenameBase>
                         </configuration>
                     </execution>
                     <execution>
@@ -69,35 +67,33 @@
                             <goal>generate-webhelp</goal>
                         </goals>
                         <phase>generate-sources</phase>
-			<configuration>
-			  <includes>dummy.xml</includes>
-			  <postProcess>
-			    <delete includeemptydirs="true" verbose="true">
-			      <fileset dir="${basedir}/target/docbkx/webhelp/${release.path.name}" >
-				<include name="**/*"/>
-				<exclude name="openstack-object-storage/**"/>
-			      </fileset>
-			    </delete>
-			  </postProcess>
-			</configuration>
-		    </execution>
+                        <configuration>
+                            <includes>dummy.xml</includes>
+                            <postProcess>
+                                <delete includeemptydirs="true"
+                                   verbose="true">
+                                   <fileset
+                                   dir="${basedir}/target/docbkx/webhelp/${release.path.name}">
+                                   <include name="**/*"/>
+                                   <exclude name="openstack-object-storage/**"/>
+                                   </fileset>
+                                </delete>
+                            </postProcess>
+                        </configuration>
+                    </execution>
                 </executions>
                 <configuration>
                     <!-- These parameters apply to pdf and webhelp -->
                     <xincludeSupported>true</xincludeSupported>
                     <sourceDirectory>.</sourceDirectory>
-                    <includes>
-                       bk-objectstorage-adminguide.xml
-                    </includes>
+                    <includes> bk-objectstorage-adminguide.xml </includes>
                     <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/openstack-object-storage/admin/content/</canonicalUrlBase>
                     <profileSecurity>reviewer</profileSecurity>
                     <branding>openstack</branding>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
-
     <profiles>
         <profile>
             <id>Rackspace Research Repositories</id>
@@ -120,5 +116,4 @@
             </pluginRepositories>
         </profile>
     </profiles>
-
 </project>
diff --git a/www/run/index.html b/www/run/index.html
index 9e74b30d47..69de44955b 100644
--- a/www/run/index.html
+++ b/www/run/index.html
@@ -3,27 +3,32 @@
 
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<head>
-		<meta name="generator" content=
-			"HTML Tidy for Linux/x86 (vers 11 February 2007), see www.w3.org" />
-		<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-		<meta name="google-site-verification" content=
-			"Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-		
-		<title>OpenStack Docs: current</title><!-- Google Fonts -->
-		<link href='http://fonts.googleapis.com/css?family=PT+Sans&amp;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" />
+		<meta name="generator"
+			content="HTML Tidy for Linux/x86 (vers 11 February 2007), see www.w3.org" />
+		<meta http-equiv="Content-Type"
+			content="text/html; charset=us-ascii" />
+		<meta name="google-site-verification"
+			content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
+
+		<title>OpenStack Docs: current</title>
+		<!-- Google Fonts -->
+		<link
+			href="http://fonts.googleapis.com/css?family=PT+Sans&amp;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="http://docs.openstack.org/common/css/docblitz.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" />
 		<!--<script type="text/javascript">
 			
 			var _gaq = _gaq || [];
@@ -39,158 +44,192 @@
 			
 			</script>-->
 	</head>
-	
-	<body class="docshome" id="docshome">
-		
-		<div class="container">
-		<div id="header">
-			<div class="span-5">
-				<h1 id="logo"><a href="/">OpenStack</a></h1>
-			</div>
-			<div class="span-19 last blueLine">
-				
-				<div id="navigation" class="span-19">
-					<ul id="Menu1">
-						   		  
-  		<li><a href="http://www.openstack.org/" title="Go to the Home page">Home</a></li>
-   		  
-  		<li><a href="http://www.openstack.org/software/" title="Go to the Software page" class="link">Software</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/profile/" title="Go to the Profile page" class="link">Profile</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>
-								
 
+	<body class="docshome" id="docshome">
+
+		<div class="container">
+			<div id="header">
+				<div class="span-5">
+					<h1 id="logo"><a href="/">OpenStack</a></h1>
+				</div>
+				<div class="span-19 last blueLine">
+					<div id="navigation" class="span-19">
+						<ul id="Menu1">
+
+							<li><a href="http://www.openstack.org/"
+								title="Go to the Home page"
+								>Home</a></li>
+
+							<li><a
+								href="http://www.openstack.org/software/"
+								title="Go to the Software page"
+								class="link">Software</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/profile/"
+								title="Go to the Profile page"
+								class="link">Profile</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>
-	</div>
-		
+		</div>
+
 		<!-- Page Content -->
 
-	<div class="container">
-	<div class="span-12">
-			<h3 class="subhead"><a href="http://docs.openstack.org/">Documentation</a> > Run </h3>
-	</div>
-	<div class="searchArea span-10 last">
-					<div id="cse" style="width: 100%;">
-						Loading
-					</div>
-		
-		<script src="http://www.google.com/jsapi" type="text/javascript">
-		</script> 
-		<script type="text/javascript">
-//<![CDATA[
-
-      google.load('search', '1', {language : 'en'});
-      var _gaq = _gaq || [];
-      _gaq.push(["_setAccount", "UA-17511903-6"]);
-      function _trackQuery(control, searcher, query) {
-      var gaQueryParamName = "q";
-      var loc = document.location;
-      var url = [
-      loc.pathname,
-      loc.search,
-      loc.search ? '&' : '?',
-      gaQueryParamName == '' ? 'q' : encodeURIComponent(gaQueryParamName),
-      '=',
-      encodeURIComponent(query)
-      ].join('');
-      _gaq.push(["_trackPageview", url]);
-      }
-      google.setOnLoadCallback(function() {
-      var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
-      customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
-      customSearchControl.setSearchStartingCallback(null, _trackQuery);
-      customSearchControl.draw('cse');
-      }, true);
-      //]]>
-		</script>
-	</div>
-	</div>
 		<div class="container">
-		<div class="span-12">
-<h2><a href="http://docs.openstack.org/grizzly/openstack-block-storage/admin/content/">Block Storage Administration Guide</a>
-                </h2>
-                        <p>For deployers and operators, offers information for OpenStack Block Storage (cinder).
-                        </p>	
-		<h2><a href="http://docs.openstack.org/grizzly/openstack-compute/admin/content/">Compute Administration Guide</a>
-		</h2>
-			<p>For deployers and operators, offers configuration information for OpenStack Compute (nova), Image (glance), and Identity (keystone).
-			</p>
-		<h2><a href="http://docs.openstack.org/grizzly/openstack-network/admin/content/">Network Administration Guide
-</a>
-		</h2>	
-		<p>Provides network administrators and cloud deployers configuration information about Networking (quantum).
-		</p>
-		<h2><a href="http://docs.openstack.org/grizzly/openstack-object-storage/admin/content/">Object Storage Administration Guide</a>
-		</h2>
-			<p>Describes configuration settings and operations information for Object Storage (swift) and Identity (keystone). 
-			</p>
+			<div class="span-12">
+				<h3 class="subhead"><a
+						href="http://docs.openstack.org/"
+						>Documentation</a> > Configure and Run </h3>
+				<p>Configure and run OpenStack services.</p>
+				<p>&nbsp;</p>
+			</div>
+			<div class="searchArea span-10 last">
+				<div id="cse" style="width: 100%;"> Loading </div>
+				<script src="http://www.google.com/jsapi" type="text/javascript">
+		</script>
+				<script type="text/javascript">
+//<![CDATA[
+                    google.load('search', '1', {
+                        language: 'en'
+                    });
+                    var _gaq = _gaq ||[];
+                    _gaq.push([ "_setAccount", "UA-17511903-6"]);
+                    function _trackQuery(control, searcher, query) {
+                        var gaQueryParamName = "q";
+                        var loc = document.location;
+                        var url =[
+                        loc.pathname,
+                        loc.search,
+                        loc.search ? '&': '?',
+                        gaQueryParamName == '' ? 'q': encodeURIComponent(gaQueryParamName),
+                        '=',
+                        encodeURIComponent(query)].join('');
+                        _gaq.push([ "_trackPageview", url]);
+                    }
+                    google.setOnLoadCallback(function () {
+                        var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
+                        customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+                        customSearchControl.setSearchStartingCallback(null, _trackQuery);
+                        customSearchControl.draw('cse');
+                    },
+                    true);//]]>
+		</script>
+			</div>
+		</div>
+		<div class="container">
+			<div class="span-12">
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-block-storage/admin/content/"
+						>OpenStack Block Storage Service
+						Administration Guide</a>
+				</h2>
+				<p>Configure and run the OpenStack Block Storage
+					service. </p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-compute/admin/content/"
+						>OpenStack Compute Administration Guide</a>
+				</h2>
+				<p>Configure and run the OpenStack Compute, Image, and
+					Identity services. </p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-network/admin/content/"
+						>OpenStack Networking Administration Guide
+					</a>
+				</h2>
+				<p>Configure and run the OpenStack Networking service. </p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-object-storage/admin/content/"
+						>OpenStack Object Storage Administration
+						Guide</a>
+				</h2>
+				<p>Configure and run Openstack Object Storage and
+					Identity services. </p>
 			</div>
 			<div class="span-12 last">
-			<h2><a href="http://docs.openstack.org/folsom/openstack-ops/content/">OpenStack Operations Guide</a></h2>
-			<p>Describes architecture decisions and day-to-day operations for running OpenStack. Written in a five-day book sprint in February 2013, targeting the Folsom release for stability.</p>
-<h2><a href="http://docs.openstack.org/trunk/openstack-ha/content/index.html">OpenStack High Availability Guide</a></h2>
-                        <p>Provides some guidance on minimizing system downtime and data loss in a production OpenStack environment.</p>		
-	</div>
-		</div>
+				<h2><a
+						href="http://docs.openstack.org/folsom/openstack-ops/content/"
+						>OpenStack Operations Guide</a></h2>
+				<p>Make architecture decisions and perform day-to-day
+					operations for OpenStack. This guide was written
+					in a five-day book sprint in February 2013. For
+					stability, it targets the Folsom release.</p>
+				<p>&nbsp;</p>
+				<h2><a
+						href="http://docs.openstack.org/trunk/openstack-ha/content/index.html"
+						>OpenStack High Availability Guide</a></h2>
+				<p>Minimize system downtime and data loss in an
+					OpenStack production environment.</p>
+			</div>
 		</div>
+
 		<div class="container">
 			<div id="footer">
 				<hr />
-				<p>Documentation treated like code, powered by the community - interested? Here's <a href="http://wiki.openstack.org/Documentation/HowTo">how to contribute</a>. </p>
-				<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>
+				<p>Documentation treated like code, powered by the
+					community - interested? Here's <a
+						href="http://wiki.openstack.org/Documentation/HowTo"
+						>how to contribute</a>. </p>
+				<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 src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
+		<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>
-			
-			
-			<script type="text/javascript" charset="utf-8">
+
+
+		<script type="text/javascript" charset="utf-8">
 //<![CDATA[
-    $(document).ready(function() {
-      
-      function addMenu(){
-        $(".dropDown").addClass("menuHover");
-        }
-
-      function removeMenu(){
-        $(".dropDown").removeClass("menuHover");
-        }
-
-    var menuConfig = {
-         interval: 500,
-         sensitivity: 4,
-         over: addMenu,
-         timeout: 500,
-         out: removeMenu
-    };
-
-    $(".dropDownTrigger").hoverIntent(menuConfig);    
-    
-    
-      
-    });
-    
-
-
-    //]]>
+            $(document).ready(function () {
+                
+                function addMenu() {
+                    $(".dropDown").addClass("menuHover");
+                }
+                
+                function removeMenu() {
+                    $(".dropDown").removeClass("menuHover");
+                }
+                
+                var menuConfig = {
+                    interval: 500,
+                    sensitivity: 4,
+                    over: addMenu,
+                    timeout: 500,
+                    out: removeMenu
+                };
+                
+                $(".dropDownTrigger").hoverIntent(menuConfig);
+            });//]]>
 </script>
-			
+
 	</body>
 </html>