diff --git a/doc/openstack-ops/acknowledgements.xml b/doc/openstack-ops/acknowledgements.xml
index 07a9ea55..60561a11 100644
--- a/doc/openstack-ops/acknowledgements.xml
+++ b/doc/openstack-ops/acknowledgements.xml
@@ -69,8 +69,5 @@ xml:id="acknowledgments">
         </itemizedlist></para>
     <para>We couldn't have pulled it off without so much
         supportive help and encouragement.</para>
-    <!--  <phrase>The cover designer, Chris Duncan, turned the design around
-            from a Friday inquiry email (you want to do what by when?)
-            to a Friday delivery email, including source files and
-            open source fonts.</phrase> -->
 </acknowledgements>
+<!-- STATUS: OK for Havana -->
diff --git a/doc/openstack-ops/app_crypt.xml b/doc/openstack-ops/app_crypt.xml
index 2219e76a..18e77db8 100644
--- a/doc/openstack-ops/app_crypt.xml
+++ b/doc/openstack-ops/app_crypt.xml
@@ -152,8 +152,9 @@
             occurrence.</para>
         <para>A few nights later, it happened again.</para>
         <para>We reviewed both sets of logs. The one thing that stood
-            out the most was DHCP. OpenStack, by default, sets DHCP
-            leases for one minute. This means that every instance
+            out the most was DHCP. At the time, OpenStack, by default,
+            set DHCP leases for one minute (it's now two minutes). 
+            This means that every instance
             contacts the cloud controller (DHCP server) to renew its
             fixed IP. For some reason, this instance could not renew
             its IP. We correlated the instance's logs with the logs on
@@ -511,3 +512,5 @@ adm@cc12:/var/lib/nova/instances/instance-00000e05# ls -sh console.log
             discussion at the next summit.</para>
     </section>
 </appendix>
+<!-- FIXME: Add more stories, especially more up-to-date ones -->
+<!-- STAUS: OK for Havana -->
diff --git a/doc/openstack-ops/app_usecases.xml b/doc/openstack-ops/app_usecases.xml
index bf3e364f..cf6d26b8 100644
--- a/doc/openstack-ops/app_usecases.xml
+++ b/doc/openstack-ops/app_usecases.xml
@@ -82,6 +82,7 @@
             and Artificial Intelligence Lab.</para>
         <section xml:id="mit_csail_deploy">
             <title>Deployment</title>
+            <!--FIXME - update numbers and release information for 2013 -->
             <para>The CSAIL cloud is currently 64 physical nodes with
                 a total of 768 physical cores and 3,456 GB of RAM.
                 Persistent data storage is largely outside of the
@@ -180,8 +181,11 @@
                 Directory and imported into the Identity Service using
                 LDAP. CLIs are available for Nova and Euca2ools to do
                 this.</para>
-            <para>CERN is currently running around 250 Nova Compute
-                nodes with approximately 1,000 instances.</para>
+            <para>There are 3 clouds currently running at CERN, totaling
+            around 3400 Nova Compute nodes, with approximately 60,000 cores.
+            The CERN IT cloud aims to expand to 300,000 cores by 2015.
+             </para>
+            <!--FIXME - update numbers and release information for 2014 -->
         </section>
         <section xml:id="cern_resources">
             <title>Resources</title>
@@ -189,9 +193,9 @@
                 <listitem>
                     <para>
                         <link
-                            xlink:href="http://www.slideshare.net/noggin143/20121017-openstack-accelerating-science"
-                            >San Diego 2012 Summit presentation</link>
-                        (http://www.slideshare.net/noggin143/20121017-openstack-accelerating-science)
+                            xlink:href="http://openstack-in-production.blogspot.com/2013/09/a-tale-of-3-openstack-clouds-50000.html"
+                            >OpenStack in Production: A tale of 3 OpenStack Clouds</link>
+                        (openstack-in-production.blogspot.com/2013/09/a-tale-of-3-openstack-clouds-50000.html)
                     </para>
                 </listitem>
                 <listitem>
diff --git a/doc/openstack-ops/ch_arch_compute_nodes.xml b/doc/openstack-ops/ch_arch_compute_nodes.xml
index 10afeeae..f99912a4 100644
--- a/doc/openstack-ops/ch_arch_compute_nodes.xml
+++ b/doc/openstack-ops/ch_arch_compute_nodes.xml
@@ -38,6 +38,7 @@
     <?hard-pagebreak?>
     <section xml:id="hypervisor_choice">
         <title>Hypervisor Choice</title>
+        <!-- FIXME: Needs updating for Havana-->
         <para>OpenStack Compute supports many hypervisors to various
             degrees, including <link xlink:title="reference manual"
                 xlink:href="http://www.linux-kvm.org/page/Main_Page"
@@ -73,10 +74,10 @@
                 xlink:href="https://wiki.openstack.org/wiki/HypervisorSupportMatrix"
                 >Hypervisor Support Matrix</link>
             (https://wiki.openstack.org/wiki/HypervisorSupportMatrix),
-            and in the <link xlink:title="reference manual"
-                xlink:href="http://docs.openstack.org/folsom/openstack-compute/admin/content/ch_hypervisors.html"
-                >reference manual</link>
-            (http://docs.openstack.org/folsom/openstack-compute/admin/content/ch_hypervisors.html).</para>
+            and in the <link xlink:title="configuration reference"
+                xlink:href="http://docs.openstack.org/trunk/config-reference/content/section_compute-hypervisors.html"
+                >configuration reference</link>
+            (http://docs.openstack.org/trunk/config-reference/content/section_compute-hypervisors.html).</para>
         <note>
             <para>It is also possible to run multiple hypervisors in a
                 single deployment using Host Aggregates or Cells.
diff --git a/doc/openstack-ops/ch_arch_example.xml b/doc/openstack-ops/ch_arch_example.xml
index 47177b44..fab01cdb 100644
--- a/doc/openstack-ops/ch_arch_example.xml
+++ b/doc/openstack-ops/ch_arch_example.xml
@@ -207,9 +207,9 @@
             want to bind with existing directory services, and caution
             careful understanding of the <link
                 xlink:title="LDAP config options"
-                xlink:href="http://docs.openstack.org/folsom/openstack-compute/admin/content/reference-for-ldap-config-options.html"
+                xlink:href="http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-identity.html#configuring-keystone-for-ldap-backend"
                 >array of options available</link>
-            (http://docs.openstack.org/folsom/openstack-compute/admin/content/reference-for-ldap-config-options.html)</para>
+            (http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-identity.html#configuring-keystone-for-ldap-backend)</para>
         <para>The Block Storage service (cinder) is installed natively
             on external storage nodes and uses the <emphasis
                 role="bold">LVM/iSCSI plugin</emphasis>. Most Block
@@ -247,6 +247,7 @@
                 become a bottleneck if excessive network traffic comes
                 in and goes out of the cloud.</para>
             <para>
+                <!-- FIXME - need to find the place for multu-host in havana -->
                 <link xlink:title="Multi-host"
                     xlink:href="http://docs.openstack.org/folsom/openstack-compute/admin/content/existing-ha-networking-options.html#d6e8906"
                     >Multi-host</link>
@@ -327,7 +328,7 @@
             </listitem>
             <listitem>
                 <para>Add an OpenStack Storage service
-                    (http://docs.openstack.org/folsom/openstack-object-storage/admin/)</para>
+                    (http://docs.openstack.org/havana/install-guide/install/apt/content/ch_swift.html)</para>
             </listitem>
             <listitem>
                 <para>Add additional OpenStack Block Storage hosts
@@ -338,9 +339,9 @@
             <para>Congratulations! By now, you should have a solid design for
                 your cloud. We now recommend that you turn to the <link
                     xlink:title="OpenStack Install and Deploy Manual - Ubuntu"
-                    xlink:href="http://docs.openstack.org/folsom/openstack-compute/install/apt/content/"
+                    xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/"
                     >OpenStack Install and Deploy Manual - Ubuntu</link>
-                (http://docs.openstack.org/folsom/openstack-compute/install/apt/content/),
+                (http://docs.openstack.org/havana/install-guide/install/apt/),
                 which contains a step-by-step guide on how to manually install
                 the OpenStack packages and dependencies on your cloud. </para>
             <para>While it is important for an operator to be familiar with
diff --git a/doc/openstack-ops/ch_ops_customize.xml b/doc/openstack-ops/ch_ops_customize.xml
index 39376d0f..d6f7f27f 100644
--- a/doc/openstack-ops/ch_ops_customize.xml
+++ b/doc/openstack-ops/ch_ops_customize.xml
@@ -54,6 +54,7 @@
             install with the Object Store enabled.</para>
 
         <procedure>
+           <!-- FIXME - needs to be updated and tested for Havana -->
             <title>To run DevStack for the stable Folsom branch on an
                 instance:</title>
 
@@ -260,7 +261,7 @@ SWIFT_REPLICAS=1
 # unified auth system (manages accounts/tokens)
 KEYSTONE_BRANCH=stable/folsom
 # object storage
-SWIFT_BRANCH=stable/folsom 
+SWIFT_BRANCH=stable/folsom
             
 disable_all_services
 enable_service key swift mysql</programlisting>
@@ -282,16 +283,16 @@ VOLUME_BACKING_FILE_SIZE=20480M
 # For stable versions, look for branches named stable/[milestone]. 
             
 # compute service
-NOVA_BRANCH=stable/folsom 
+NOVA_BRANCH=stable/folsom
             
 # volume service
-CINDER_BRANCH=stable/folsom 
+CINDER_BRANCH=stable/folsom
             
 # image catalog service
-GLANCE_BRANCH=stable/folsom 
+GLANCE_BRANCH=stable/folsom
             
 # unified auth system (manages accounts/tokens)
-KEYSTONE_BRANCH=stable/folsom 
+KEYSTONE_BRANCH=stable/folsom
             
 # django powered web control panel for openstack
 HORIZON_BRANCH=stable/folsom</programlisting>
@@ -663,9 +664,9 @@ proxy-server IP 198.51.100.12 denied access to Account=AUTH_... Container=None.
             easily plug in a new scheduler for nova. The existing
             schedulers for nova are feature full and well documented
             at <link
-                xlink:href="http://docs.openstack.org/folsom/openstack-compute/admin/content/ch_scheduling.html"
+                xlink:href="http://docs.openstack.org/trunk/config-reference/content/section_compute-scheduler.html"
                 >Scheduling</link>
-            (http://docs.openstack.org/folsom/openstack-compute/admin/content/ch_scheduling.html).
+            (http://docs.openstack.org/trunk/config-reference/content/section_compute-scheduler.html).
             However, depending on your user's use cases, the existing
             schedulers might not meet your requirements. You might
             need to create a new scheduler.</para>
diff --git a/doc/openstack-ops/ch_ops_lay_of_land.xml b/doc/openstack-ops/ch_ops_lay_of_land.xml
index a372ebfc..78a0b379 100644
--- a/doc/openstack-ops/ch_ops_lay_of_land.xml
+++ b/doc/openstack-ops/ch_ops_lay_of_land.xml
@@ -367,10 +367,6 @@ nova-scheduler   cloud.example.com nova enabled  :-)  2013-02-25 19:32:33</progr
                 longer available, the <code>:-)</code> changes to an
                     <code>XXX</code>. This is an indication that you
                 should troubleshoot why the service is down.</para>
-            <para>If you are still using <code>nova-volume</code>
-                (this service is deprecated after the Folsom release),
-                you might also see entries for the nova-volume
-                service.</para>
             <para>If you are using Cinder, run the following command
                 to see a similar listing:</para>
 
diff --git a/doc/openstack-ops/ch_ops_resources.xml b/doc/openstack-ops/ch_ops_resources.xml
index a8f38ca1..69e598bd 100644
--- a/doc/openstack-ops/ch_ops_resources.xml
+++ b/doc/openstack-ops/ch_ops_resources.xml
@@ -17,20 +17,29 @@
     </para>
     <para>
         <link
-            xlink:href="http://docs.openstack.org/folsom/openstack-compute/admin/content/"
-            >OpenStack Compute Administration Manual</link>
-        (http://docs.openstack.org/folsom/openstack-compute/admin/content/)</para>
+            xlink:href="http://docs.openstack.org/trunk/config-reference/content/"
+            >OpenStack Configuration Reference</link>
+        (http://docs.openstack.org/trunk/config-reference/content/section_compute-hypervisors.html)</para>
     <para>
         <link
-            xlink:href="http://docs.openstack.org/folsom/openstack-compute/install/apt/content/"
-            >OpenStack Compute Install and Deploy Manual -
-            Ubuntu</link>
-        (http://docs.openstack.org/folsom/openstack-compute/install/apt/content/)</para>
+            xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/"
+            >OpenStack Install Guide - Ubuntu</link>
+        (http://docs.openstack.org/havana/install-guide/install/apt/content/)</para>
     <para>
         <link
-            xlink:href="http://www.packtpub.com/openstack-cloud-computing-cookbook/book"
+            xlink:href="http://docs.openstack.org/admin-guide-cloud/content/"
+            >OpenStack Cloud Administrator Guide</link>
+        (http://docs.openstack.org/admin-guide-cloud/content/)</para>
+    <para>
+        <link
+            xlink:href="http://docs.openstack.org/security-guide/content/"
+            >OpenStack Security Guide</link>
+        (http://docs.openstack.org/security-guide/content/)</para>
+    <para>
+        <link
+            xlink:href="http://www.packtpub.com/openstack-cloud-computing-cookbook-second-edition/book"
             >OpenStack Cloud Computing Cookbook</link>
-        (http://www.packtpub.com/openstack-cloud-computing-cookbook/book)</para>
+        (http://www.packtpub.com/openstack-cloud-computing-cookbook-second-edition/book)</para>
     <para>
         <emphasis role="bold">Cloud (general)</emphasis>
     </para>