diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
index c3ae17875e..8d3c0bce5b 100644
--- a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
@@ -83,7 +83,7 @@ address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181"</programlisting>
                 <systemitem>memcached</systemitem> is often used for both OpenStack Object Storage
             and OpenStack dashboard, it might already be installed. If
                 <systemitem>memcached</systemitem> is not installed, refer to the <link
-                xlink:href="http://docs.openstack.org/havana/install-guide/contents"
+                xlink:href="http://docs.openstack.org/icehouse"
                     ><citetitle>OpenStack Installation Guide</citetitle></link> for more
             information.</para>
         <para>The following values in the <filename>/etc/nova/nova.conf</filename> file (on every
diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
index 525501d12c..dcf6dd8ec8 100644
--- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
@@ -606,7 +606,7 @@ enabled = True</programlisting>
         <section xml:id="section_plugin-config">
             <title>Plug-in configurations</title>
             <para>For configurations options, see <link
-                    xlink:href="http://docs.openstack.org/havana/config-reference/content/section_networking-options-reference.html"
+                    xlink:href="http://docs.openstack.org/icehouse/config-reference/content/section_networking-options-reference.html"
                     >Networking configuration options</link> in
                     <citetitle>Configuration Reference</citetitle>.
                 These sections explain how to configure specific
@@ -630,7 +630,7 @@ enabled = True</programlisting>
                             pairs:</para>
                         <programlisting language="ini">server = &lt;controller-ip&gt;:&lt;port&gt;</programlisting>
                         <para>For database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                             the <citetitle>Installation
                                 Guide</citetitle> in the <link
@@ -682,7 +682,7 @@ password = <replaceable>password</replaceable>
 address  = <replaceable>switch mgmt ip address</replaceable>
 ostype   = NOS</programlisting>
                         <para>For database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                             any of the <citetitle>Installation
                                 Guides</citetitle> in the <link
@@ -717,7 +717,7 @@ ostype   = NOS</programlisting>
                                 <filename>/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
                             </filename> to specify these values (for
                             database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                                 <citetitle>Installation
                                 Guide</citetitle>):</para>
@@ -782,7 +782,7 @@ allow_overlapping_ips = True</programlisting>
                                 <filename>/etc/neutron/plugins/vmware/nsx.ini</filename>
                             file, and add the following entries (for
                             database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                                 <citetitle>Installation
                                 Guide</citetitle>):</para>
@@ -998,7 +998,7 @@ director_server_port = "PLUMgrid-director-port"
 username = "PLUMgrid-director-admin-username"
 password = "PLUMgrid-director-admin-password"</programlisting>
                         <para>For database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                             the <citetitle>Installation
                                 Guide</citetitle>.</para>
@@ -1070,7 +1070,7 @@ password = "PLUMgrid-director-admin-password"</programlisting>
                             </listitem>
                         </itemizedlist>
                         <para>For database configuration, see <link
-                                xlink:href="http://docs.openstack.org/havana/install-guide/install/apt/content/neutron-install-network-node.html"
+                                xlink:href="http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-install-network-node.html"
                                 >Install Networking Services</link> in
                                 <citetitle>Installation
                                 Guide</citetitle>.</para>
diff --git a/doc/admin-guide-cloud/section_object-storage-admin.xml b/doc/admin-guide-cloud/section_object-storage-admin.xml
index e97771a472..15b6077570 100644
--- a/doc/admin-guide-cloud/section_object-storage-admin.xml
+++ b/doc/admin-guide-cloud/section_object-storage-admin.xml
@@ -11,7 +11,7 @@
             xlink:href="http://docs.openstack.org/developer/swift/"
             >docs.openstack.org/developer/swift/</link>.</para>
     <para>See the <link
-        xlink:href="http://docs.openstack.org/havana/config-reference/content/"
+        xlink:href="http://docs.openstack.org/icehouse/config-reference/content/"
                 ><citetitle>OpenStack Configuration
                 Reference</citetitle></link> for a list of
         configuration options for Object Storage.</para>
diff --git a/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml b/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml
index 814bebec3f..736e4ae7d3 100644
--- a/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml
+++ b/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml
@@ -12,7 +12,7 @@
         <para>On the KVM host run, <code>cat /proc/cpuinfo</code>. Make sure the <code>vme</code>
             and <code>svm</code> flags are set.</para>
         <para>Follow the instructions in the
-            <link xlink:href="http://docs.openstack.org/havana/config-reference/content/kvm.html#section_kvm_enable">
+            <link xlink:href="http://docs.openstack.org/icehouse/config-reference/content/kvm.html#section_kvm_enable">
         enabling KVM section</link> of the <citetitle>Configuration
         Reference</citetitle> to enable hardware virtualization
         support in your BIOS.</para>
diff --git a/doc/admin-guide-cloud/section_volume-migration.xml b/doc/admin-guide-cloud/section_volume-migration.xml
index 5012976e58..5e559eabe4 100644
--- a/doc/admin-guide-cloud/section_volume-migration.xml
+++ b/doc/admin-guide-cloud/section_volume-migration.xml
@@ -28,7 +28,7 @@
             <note>
                 <para>While most back-ends support this function, not all do.
                     See the driver documentation in the <link
-                        xlink:href="http://docs.openstack.org/havana/config-reference/content/"
+                        xlink:href="http://docs.openstack.org/icehouse/config-reference/content/"
                         ><citetitle>OpenStack Configuration
                             Reference</citetitle></link> for more
                     details.</para>
diff --git a/doc/common/section_cli_nova_evacuate.xml b/doc/common/section_cli_nova_evacuate.xml
index 6da91f4e73..c52caa94bc 100644
--- a/doc/common/section_cli_nova_evacuate.xml
+++ b/doc/common/section_cli_nova_evacuate.xml
@@ -33,7 +33,7 @@
         <step>
             <para>To preserve the user disk data on the evacuated server, deploy OpenStack Compute
                 with a shared file system. To configure your system, see <link
-                    xlink:href="http://docs.openstack.org/havana/config-reference/content/configuring-openstack-compute-basics.html#section_configuring-compute-migrations"
+                    xlink:href="http://docs.openstack.org/icehouse/config-reference/content/configuring-openstack-compute-basics.html#section_configuring-compute-migrations"
                     >Configure migrations</link> in <citetitle>OpenStack Configuration
                     Reference</citetitle>. In the following example, the password remains
                 unchanged:</para>
diff --git a/doc/install-guide/ch_overview.xml b/doc/install-guide/ch_overview.xml
index fb03b6d168..617cab8a28 100644
--- a/doc/install-guide/ch_overview.xml
+++ b/doc/install-guide/ch_overview.xml
@@ -4,10 +4,6 @@
   xml:id="ch_overview">
   <?dbhtml stop-chunking?>
   <title>Architecture</title>
-  <warning>
-    <para>We are updating this material for Icehouse. You may find structure
-      and/or content issues during this process.</para>
-  </warning>
   <section xml:id="architecture_overview">
     <title>Overview</title>
     <para>The <glossterm>OpenStack</glossterm> project is an open source cloud
diff --git a/doc/training-guides/lab001-control-node.xml b/doc/training-guides/lab001-control-node.xml
index 8e73ce5d4e..4abb8d6795 100644
--- a/doc/training-guides/lab001-control-node.xml
+++ b/doc/training-guides/lab001-control-node.xml
@@ -38,7 +38,7 @@
       <listitem>
         <para>Add Havana repositories:</para>
         <screen><prompt>#</prompt> <userinput>apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring</userinput></screen>
-<screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list</userinput></screen>
+<screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list</userinput></screen>
       </listitem>
       <listitem>
         <para>Update your system:</para>
diff --git a/doc/training-guides/lab002-network-node.xml b/doc/training-guides/lab002-network-node.xml
index 57c1ef1357..dbe32aa92b 100644
--- a/doc/training-guides/lab002-network-node.xml
+++ b/doc/training-guides/lab002-network-node.xml
@@ -37,7 +37,7 @@
       <para>Add Havana repositories:</para>
       <para>
         <screen><prompt>#</prompt> <userinput>apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring</userinput></screen>
-        <screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list</userinput></screen>
+        <screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list</userinput></screen>
       </para>
     </listitem>
     <listitem>
diff --git a/doc/training-guides/lab003-compute-node.xml b/doc/training-guides/lab003-compute-node.xml
index 7ab07eb3ff..cd403b9220 100644
--- a/doc/training-guides/lab003-compute-node.xml
+++ b/doc/training-guides/lab003-compute-node.xml
@@ -43,7 +43,7 @@
       <para>Add Havana repositories:</para>
       <para>
         <screen><prompt>#</prompt> <userinput>apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring</userinput></screen>
-        <screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list</userinput></screen>
+        <screen><prompt>#</prompt> <userinput>echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list</userinput></screen>
       </para>
     </listitem>
     <listitem>