From e534af645d4ff051e97e552e98271810b5588cfe Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Fri, 13 Nov 2015 12:38:56 -0800
Subject: [PATCH] Remove references to now-missing havana docs

Change-Id: I3c708bacd468e923e574bdd5afc7acc58b072159
---
 doc/source/api/form_post_middleware.rst     |  4 +---
 doc/source/api/temporary_url_middleware.rst |  4 +---
 doc/source/howto_installmultinode.rst       | 15 +++++++--------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/doc/source/api/form_post_middleware.rst b/doc/source/api/form_post_middleware.rst
index 1e62086a57..1d83484780 100644
--- a/doc/source/api/form_post_middleware.rst
+++ b/doc/source/api/form_post_middleware.rst
@@ -17,9 +17,7 @@ URL middleware uses. For information about how to set these keys, see
 :ref:`secret_keys`.
 
 For information about the form **POST** middleware configuration
-options, see `Form
-post <http://docs.openstack.org/havana/config-reference/content/object-storage-form-post.html>`__
-in the *OpenStack Configuration Reference*.
+options, see :ref:`formpost` in the *Source Documentation*.
 
 Form POST format
 ~~~~~~~~~~~~~~~~
diff --git a/doc/source/api/temporary_url_middleware.rst b/doc/source/api/temporary_url_middleware.rst
index 51b2634cbb..093bd528ec 100644
--- a/doc/source/api/temporary_url_middleware.rst
+++ b/doc/source/api/temporary_url_middleware.rst
@@ -15,9 +15,7 @@ downloads the object directly from Object Storage, eliminating the need
 for the website to act as a proxy for the request.
 
 Ask your cloud administrator to enable the temporary URL feature. For
-information, see `Temporary
-URL <http://docs.openstack.org/havana/config-reference/content/object-storage-tempurl.html>`__
-in the *OpenStack Configuration Reference*.
+information, see :ref:`tempurl` in the *Source Documentation*.
 
 Note
 ~~~~
diff --git a/doc/source/howto_installmultinode.rst b/doc/source/howto_installmultinode.rst
index 1d6b0589c9..bd46561acd 100644
--- a/doc/source/howto_installmultinode.rst
+++ b/doc/source/howto_installmultinode.rst
@@ -6,6 +6,13 @@ Please refer to the latest official
 `Openstack Installation Guides <http://docs.openstack.org/#install-guides>`_
 for the most up-to-date documentation.
 
+Object Storage installation guide for Openstack Liberty
+----------------------------------------------------
+
+ * `openSUSE 13.2 and SUSE Linux Enterprise Server 12 <http://docs.openstack.org/liberty/install-guide-obs/swift.html>`_
+ * `RHEL 7, CentOS 7 <http://docs.openstack.org/liberty/install-guide-rdo/swift.html>`_
+ * `Ubuntu 14.04 <http://docs.openstack.org/liberty/install-guide-ubuntu/swift.html>`_
+
 Object Storage installation guide for Openstack Kilo
 ----------------------------------------------------
 
@@ -26,11 +33,3 @@ Object Storage installation guide for Openstack Icehouse
  * `openSUSE and SUSE Linux Enterprise Server <http://docs.openstack.org/icehouse/install-guide/install/zypper/content/ch_swift.html>`_
  * `Red Hat Enterprise Linux, CentOS, and Fedora <http://docs.openstack.org/icehouse/install-guide/install/yum/content/ch_swift.html>`_
  * `Ubuntu 12.04/14.04 (LTS) <http://docs.openstack.org/icehouse/install-guide/install/apt/content/ch_swift.html>`_
-
-Object Storage installation guide for Openstack Havana
-------------------------------------------------------
-
- * `Debian 7.0 <http://docs.openstack.org/havana/install-guide/install/apt-debian/content/ch_swift.html>`_
- * `openSUSE and SUSE Linux Enterprise Server <http://docs.openstack.org/havana/install-guide/install/zypper/content/ch_swift.html>`_
- * `Red Hat Enterprise Linux, CentOS, and Fedora <http://docs.openstack.org/havana/install-guide/install/yum/content/ch_swift.html>`_
- * `Ubuntu 12.04 (LTS) <http://docs.openstack.org/havana/install-guide/install/apt/content/ch_swift.html>`_