From a6a810f2337be858a543401e6f57e2c6460e8f3d Mon Sep 17 00:00:00 2001
From: annegentle <anne@openstack.org>
Date: Mon, 23 Apr 2012 10:48:24 -0500
Subject: [PATCH] Adds links to docs.openstack.org

In the side bar, links to past versions and docs.openstack.org

On the index.rst, links to wiki and docs.openstack.org

Change-Id: Icf33c6f396e1ab016fd86a56e61df3e063a1bae2
---
 doc/source/_theme/layout.html | 2 +-
 doc/source/index.rst          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/_theme/layout.html b/doc/source/_theme/layout.html
index 75d970baa8..fae4d6764d 100644
--- a/doc/source/_theme/layout.html
+++ b/doc/source/_theme/layout.html
@@ -58,7 +58,7 @@
           </div>
           <script type="text/javascript">$('#searchbox').show(0);</script>
           <p class="triangle-border right">
-				Psst... hey. Did you know you can read <a href="http://swift.openstack.org/1.3">Swift 1.3 docs</a> or <a href="http://swift.openstack.org/1.2">Swift 1.2 docs</a> also?
+				Psst... hey. Did you know you can read about Swift at <a href="http://docs.openstack.org/">docs.openstack.org</a> also? Plus you can get to past versions at<a href="http://swift.openstack.org/1.3">Swift 1.3 docs</a> and <a href="http://swift.openstack.org/1.2">Swift 1.2 docs</a>.
 			</p>
           {%- endif %}
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 8133cfda0f..ed26beee4c 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010-2011 OpenStack LLC 
+      Copyright 2010-2012 OpenStack LLC 
       All Rights Reserved.
 
       Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,7 +22,7 @@ store. Organizations can use Swift to store lots of data efficiently, safely, an
 
 This documentation is generated by the Sphinx toolkit and lives in the source
 tree.  Additional documentation on Swift and other components of OpenStack can
-be found on the `OpenStack wiki`_.  
+be found on the `OpenStack wiki`_ and at http://docs.openstack.org.  
 
 .. _`OpenStack wiki`: http://wiki.openstack.org