From 1041ce07681430b29ab1def6505d6e9bce6b0ff0 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 15 Feb 2018 09:14:23 -0600
Subject: [PATCH] Update openstacksdk links to be accurate

python-openstacksdk publishes to the normal doc location. Update the
links to point to it, and add a redirect for anyone with a link pointing
to the old location that was in developer.openstack.org. Also update the
link to the shade docs.

Change-Id: I6d3eb2e23fbb6c35a19113ec1c00ffd07360feed
---
 firstapp/source/getting_started.rst | 12 ++++++------
 www/.htaccess                       |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/firstapp/source/getting_started.rst b/firstapp/source/getting_started.rst
index 592e40082..b1014e8d4 100644
--- a/firstapp/source/getting_started.rst
+++ b/firstapp/source/getting_started.rst
@@ -57,15 +57,15 @@ and toolkits with the OpenStack cloud:
      - Name
      - Description
      - URL
+   * - Python
+     - OpenStack SDK
+     - Official Python-based library for OpenStack.
+     - https://docs.openstack.org/python-openstacksdk/latest/
    * - Python
      - `Libcloud <https://libcloud.apache.org>`_
      - A Python-based library that the Apache Foundation manages.
        Use it to work with multiple cloud types.
      - https://libcloud.readthedocs.org/en/latest/compute/drivers/openstack.html
-   * - Python
-     - OpenStack SDK
-     - A Python-based library for OpenStack.
-     - https://developer.openstack.org/sdks/python/openstacksdk/
    * - Python
      - Shade
      - A Python-based library developed by OpenStack Infra team.
@@ -213,7 +213,7 @@ To interact with the cloud, you must also have
 
 .. only:: openstacksdk
 
-     a recent version of `openstacksdk <http://python-openstacksdk.readthedocs.org/en/latest/users/index.html>`_
+     a recent version of `OpenStackSDK <https://docs.openstack.org/python-openstacksdk/latest/install/index.html>`_
      installed.
 
 .. only:: phpopencloud
@@ -226,7 +226,7 @@ To interact with the cloud, you must also have
 
 .. only:: shade
 
-     `a recent version of shade library installed <https://docs.openstack.org/infra/shade/installation.html>`_.
+     `a recent version of shade installed <https://docs.openstack.org/shade/latest/install/index.html>`_.
 
      .. note:: Before proceeding, install the latest version of shade.
 
diff --git a/www/.htaccess b/www/.htaccess
index 3a0d33be8..50c23ebd7 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -66,3 +66,4 @@ redirect 301 /api-ref-telemetry-v2.html https://docs.openstack.org/ceilometer/la
 redirectmatch 301 /api-ref/{{ alias }}/(.*) /api-ref/{{ service_type }}/$1
 {% endfor %}
 
+redirect 301 /sdks/python/openstacksdk https://docs.openstack.org/python-openstacksdk/latest/