Merge "Adds links to docs.openstack.org"

Author: Jenkins

doc/source/_theme/layout.html

@@ -58,7 +58,7 @@ <h3>{{ _('Quick search') }}</h3>
           </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 %}
 

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